started source grammar API ; used it for a first implem. of cc command

2 files changed, 53 insertions, 1 deletions

diff --git a/src-3.0/GF/Grammar/API.hs b/src-3.0/GF/Grammar/API.hs
new file mode 100644
index 000000000..be8094228
--- /dev/null
+++ b/src-3.0/GF/Grammar/API.hs
@@ -0,0 +1,52 @@
+module GF.Grammar.API (
+  Grammar,
+  emptyGrammar,
+  pTerm,
+  prTerm,
+  checkTerm,
+  computeTerm
+  ) where
+
+import GF.Source.ParGF
+import GF.Source.SourceToGrammar (transExp)
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Infra.Modules (greatestResource)
+import GF.Compile.GetGrammar
+import GF.Grammar.Macros
+import GF.Grammar.PrGrammar
+
+import GF.Compile.Rename (renameSourceTerm)
+import GF.Compile.CheckGrammar (justCheckLTerm)
+import GF.Compile.Compute (computeConcreteRec)
+
+import GF.Data.Operations
+import qualified Data.ByteString.Char8 as BS
+
+type Grammar = SourceGrammar
+
+emptyGrammar :: Grammar
+emptyGrammar = emptySourceGrammar
+
+pTerm :: String -> Err Term
+pTerm s = do
+  e <- pExp $ myLexer (BS.pack s)
+  transExp e
+
+prTerm :: Term -> String
+prTerm = prt
+
+checkTerm :: Grammar -> Term -> Err Term
+checkTerm gr t = do
+  mo <- maybe (Bad "no source grammar in scope") return $ greatestResource gr
+  checkTermAny gr mo t
+
+checkTermAny :: Grammar -> Ident -> Term -> Err Term
+checkTermAny gr m t = do
+  t1 <- renameSourceTerm gr m t
+  justCheckLTerm gr t1
+
+computeTerm :: Grammar -> Term -> Err Term
+computeTerm = computeConcreteRec
+
+
diff --git a/src-3.0/GF/Infra/Modules.hs b/src-3.0/GF/Infra/Modules.hs
index fe44a5fe4..971d52054 100644
--- a/src-3.0/GF/Infra/Modules.hs
+++ b/src-3.0/GF/Infra/Modules.hs
@@ -403,7 +403,7 @@ allResources gr = [i | (i,ModMod m) <- modules gr, isModRes m]
 greatestResource :: MGrammar i a -> Maybe i
 greatestResource gr = case allResources gr of
   [] -> Nothing
-  a -> return $ head a
+  a -> return $ head a ---- why not last as in Abstract? works though AR 24/5/2008
 
 -- | all concretes for a given abstract
 allConcretes :: Eq i => MGrammar i a -> i -> [i]