From a26290659d2d7799f920d0aae64383e17004abdb Mon Sep 17 00:00:00 2001
From: bjorn <bjorn@bringert.net>
Date: Mon, 20 Oct 2008 11:35:05 +0000
Subject: Replace Category with Type in the PGF API. Added readLanguage and
 showLanguage.

---
 src/GF/Command/Commands.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/GF/Command')

diff --git a/src/GF/Command/Commands.hs b/src/GF/Command/Commands.hs
index a2850b6a2..4d6a29ce7 100644
--- a/src/GF/Command/Commands.hs
+++ b/src/GF/Command/Commands.hs
@@ -578,7 +578,7 @@ allCommands cod pgf = Map.fromList [
      lang -> map mkCId (chunks ',' lang)
    optLang opts = head $ optLangs opts ++ [wildCId]
    optType opts = 
-     let str = valStrOpts "cat" (lookStartCat pgf) opts
+     let str = valStrOpts "cat" (prCId $ lookStartCat pgf) opts
      in case readType str of
           Just ty -> ty
           Nothing -> error ("Can't parse '"++str++"' as type")
@@ -595,7 +595,7 @@ allCommands cod pgf = Map.fromList [
    toString = unwords . toStrings
 
    prGrammar opts = case opts of
-     _ | isOpt "cats" opts -> unwords $ map prCId $ categories pgf
+     _ | isOpt "cats" opts -> unwords $ map showType $ categories pgf
      _ | isOpt "fullform" opts -> concatMap 
           (prFullFormLexicon . buildMorpho pgf) $ optLangs opts
      _ | isOpt "missing" opts -> 
-- 
cgit v1.2.3