added translation and mophology quizzes

src-3.0/GF/Command/Commands.hs

@@ -15,6 +15,7 @@ import PGF.ShowLinearize
 import PGF.Macros
 import PGF.Data ----
 import PGF.Morphology
+import PGF.Quiz
 import GF.Compile.Export
 import GF.Infra.UseIO
 import GF.Data.ErrM ----
@@ -167,6 +168,17 @@ allCommands pgf = Map.fromList [
                concatMap words . toStrings
      }),
 
+  ("mq", emptyCommandInfo {
+     longname = "morpho_quiz",
+     synopsis = "start a morphology quiz",
+     exec = \opts _ -> do
+         let lang = optLang opts
+         let cat  = optCat opts
+         morphologyQuiz pgf lang cat
+         return void,
+     flags = ["lang","cat","number"] 
+     }),
+
   ("p", emptyCommandInfo {
      longname = "parse",
      synopsis = "parse a string to abstract syntax expression",
@@ -245,6 +257,17 @@ allCommands pgf = Map.fromList [
          _ -> fromString s,
      flags = ["file"] 
      }),
+  ("tq", emptyCommandInfo {
+     longname = "translation_quiz",
+     synopsis = "start a translation quiz",
+     exec = \opts _ -> do
+         let from = valIdOpts "from" (optLang opts) opts
+         let to   = valIdOpts "to"   (optLang opts) opts
+         let cat  = optCat opts
+         translationQuiz pgf from to cat
+         return void,
+     flags = ["from","to","cat","number"] 
+     }),
   ("wf", emptyCommandInfo {
      longname = "write_file",
      synopsis = "send string or tree to a file",
@@ -276,7 +299,8 @@ allCommands pgf = Map.fromList [
 
    optLangs opts = case valIdOpts "lang" "" opts of
      "" -> languages pgf
-     lang -> [lang] 
+     lang -> [lang]
+   optLang opts = head $ optLangs opts ++ ["#NOLANG"] 
    optCat opts = valIdOpts "cat" (lookStartCat pgf) opts
    optNum opts = valIntOpts "number" 1 opts
    optNumInf opts = valIntOpts "number" 1000000000 opts ---- 10^9

src-3.0/GF/Compile/GrammarToGFCC.hs

@@ -279,7 +279,7 @@ canon2canon abs =
         (c, M.ModMod $ M.replaceJudgements mo $ mapTree f2 (M.jments mo))
       _ -> (c,m)    
   j2j cg (f,j) = case j of
-      CncFun x (Yes tr) z -> (f,CncFun x (Yes (trace ("+ " ++ prt f) (t2t tr))) z)
+      CncFun x (Yes tr) z -> (f,CncFun x (Yes ({-trace ("+ " ++ prt f)-} (t2t tr))) z)
       CncCat (Yes ty) (Yes x) y -> (f,CncCat (Yes (ty2ty ty)) (Yes (t2t x)) y)
       _ -> (f,j)
    where