summaryrefslogtreecommitdiff
path: root/src/GF/Command
diff options
context:
space:
mode:
authorbjorn <bjorn@bringert.net>2008-10-20 11:35:05 +0000
committerbjorn <bjorn@bringert.net>2008-10-20 11:35:05 +0000
commita26290659d2d7799f920d0aae64383e17004abdb (patch)
treefdb009690775fe0fd92936a406af315e62005fc3 /src/GF/Command
parent3d92897a944fef8f201b3ced837156b50c415106 (diff)
Replace Category with Type in the PGF API. Added readLanguage and showLanguage.
Diffstat (limited to 'src/GF/Command')
-rw-r--r--src/GF/Command/Commands.hs4
1 files changed, 2 insertions, 2 deletions
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 ->