printing option -api in the eb command

2 files changed, 19 insertions, 8 deletions

diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs
index c9f4b4945..fbcefcba8 100644
--- a/src/compiler/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
@@ -296,6 +296,9 @@ allCommands env@(pgf, mos) = Map.fromList [
        "gr and rt. Notice that the command doesn't change the environment,",
        "but the resulting .gf file must be imported separately."
        ],
+     options = [
+       ("api","convert trees to overloaded API expressions (using Syntax not Lang)")
+       ],
      flags = [
        ("file","the file to be converted (suffix .gfe must be given)"),
        ("lang","the language in which to parse"),
@@ -304,7 +307,8 @@ allCommands env@(pgf, mos) = Map.fromList [
      exec = \opts _ -> do
        let file = optFile opts
        pgf <- optProbs opts pgf
-       let conf = configureExBased pgf (optMorpho opts) (optLang opts)
+       let printer = if (isOpt "api" opts) then exprToAPI else (showExpr []) 
+       let conf = configureExBased pgf (optMorpho opts) (optLang opts) printer
        (file',ws) <- parseExamplesInGrammar conf file
        if null ws then return () else putStrLn ("unknown words: " ++ unwords ws)
        return (fromString ("wrote " ++ file')),
diff --git a/src/compiler/GF/Compile/ExampleBased.hs b/src/compiler/GF/Compile/ExampleBased.hs
index 24944d9b6..b4c0caf75 100644
--- a/src/compiler/GF/Compile/ExampleBased.hs
+++ b/src/compiler/GF/Compile/ExampleBased.hs
@@ -6,6 +6,7 @@ module GF.Compile.ExampleBased (
 import PGF
 import PGF.Probabilistic
 import PGF.Morphology
+import PGF.ToAPI
 
 import Data.List
 
@@ -55,11 +56,16 @@ convertFile conf src file = do
         return []
       ParseOk ts ->
         case rank ts of
-          (t:tt) -> appv ("WARNING: ambiguous example " ++ ex) >>
-                    appn t >> mapM_ (appn . ("  --- " ++)) tt >> return []
-    appn ")"
+          (t:tt) -> do
+            if null tt 
+              then return ()
+              else appv ("WARNING: ambiguous example " ++ ex) 
+            appn t 
+            mapM_ (appn . ("  --- " ++)) tt
+            appn ")" 
+            return [] 
     return ws
-  rank ts = [showExpr [] t ++ "  -- " ++ show p | (t,p) <- rankTreesByProbs pgf ts]
+  rank ts = [printExp conf t ++ "  -- " ++ show p | (t,p) <- rankTreesByProbs pgf ts]
   appf = appendFile file
   appn s = appf s >> appf "\n"
   appv s = appn ("--- " ++ s) >> putStrLn s
@@ -68,9 +74,10 @@ data ExConfiguration = ExConf {
   resource_pgf    :: PGF,
   resource_morpho :: Morpho,
   verbose  :: Bool,
-  language :: Language
+  language :: Language,
+  printExp :: Tree -> String
   }
 
-configureExBased :: PGF -> Morpho -> Language -> ExConfiguration
-configureExBased pgf morpho lang = ExConf pgf morpho False lang
+configureExBased :: PGF -> Morpho -> Language -> (Tree -> String) -> ExConfiguration
+configureExBased pgf morpho lang pr = ExConf pgf morpho False lang pr