format .gfm for multiple modules in the same file; includes lines with ;-separated words

6 files changed, 60 insertions, 24 deletions

diff --git a/examples/SUMO/RGLExt/Extension.gf b/examples/SUMO/RGLExt/Extension.gf
index 56367ef72..72a4dd332 100644
--- a/examples/SUMO/RGLExt/Extension.gf
+++ b/examples/SUMO/RGLExt/Extension.gf
@@ -30,4 +30,4 @@ O4 : NP ;
 O5 : NP ;

 

 

-};
\ No newline at end of file
+};

diff --git a/examples/tutorial/food/FoodIta.gf b/examples/tutorial/food/FoodIta.gf
index 913e335ff..e2e0dfd85 100644
--- a/examples/tutorial/food/FoodIta.gf
+++ b/examples/tutorial/food/FoodIta.gf
@@ -4,7 +4,7 @@ concrete FoodIta of Food = {
     Phrase, Item, Kind, Quality = {s : Str} ;
 
   lin
-    Is item quality = {s = item.s ++ "è" ++ quality.s} ;
+    Is item quality = {s = item.s ++ "è" ++ quality.s} ;
     This kind = {s = "questo" ++ kind.s} ;
     That kind = {s = "quel" ++ kind.s} ;
     QKind quality kind = {s = kind.s ++ quality.s} ;
diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs
index 48f9b4f49..d320396d5 100644
--- a/src/compiler/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
@@ -407,6 +407,9 @@ allCommands env@(pgf, mos) = Map.fromList [
        "If a grammar with the same concrete name is already in the state",
        "it is overwritten - but only if compilation succeeds.",
        "The grammar parser depends on the file name suffix:",
+       "  .cf    context-free (labelled BNF) source",
+       "  .ebnf  extended BNF source",
+       "  .gfm   multi-module GF source",
        "  .gf    normal GF source",
        "  .gfo   compiled GF source",
        "  .pgf   precompiled grammar in Portable Grammar Format"
diff --git a/src/compiler/GF/Command/Importing.hs b/src/compiler/GF/Command/Importing.hs
index 80f3833ee..3d05868b1 100644
--- a/src/compiler/GF/Command/Importing.hs
+++ b/src/compiler/GF/Command/Importing.hs
@@ -4,6 +4,7 @@ import PGF
 import PGF.Data
 
 import GF.Compile
+import GF.Compile.Multi (readMulti)
 import GF.Grammar (identC, SourceGrammar) -- for cc command
 import GF.Grammar.CF
 import GF.Grammar.EBNF
@@ -20,8 +21,12 @@ importGrammar :: PGF -> Options -> [FilePath] -> IO PGF
 importGrammar pgf0 _ [] = return pgf0
 importGrammar pgf0 opts files =
   case takeExtensions (last files) of
-    ".cf" -> importCF opts files getCF
+    ".cf"   -> importCF opts files getCF
     ".ebnf" -> importCF opts files getEBNF
+    ".gfm"  -> do
+      ascss <- mapM readMulti files
+      let cs = concatMap snd ascss
+      importGrammar pgf0 opts cs
     s | elem s [".gf",".gfo"] -> do
       res <- appIOE $ compileToPGF opts files
       case res of
diff --git a/src/tools/Multi.hs b/src/compiler/GF/Compile/Multi.hs
index c45f06b41..59e8ed34c 100644
--- a/src/tools/Multi.hs
+++ b/src/compiler/GF/Compile/Multi.hs
@@ -1,12 +1,13 @@
-module Main where
+module GF.Compile.Multi (readMulti) where
 
-import List
-import Char
-import System
+import Data.List
+import Data.Char
 
+-- AR 29 November 2010
 -- quick way of writing a multilingual lexicon and (with some more work) a grammar
+-- also several modules in one file
+-- file suffix .gfm (GF Multi)
 
-usage = "usage: runghc Multi (-pgf)? file"
 
 {-
 -- This multi-line comment is a possible file in the format.
@@ -28,29 +29,41 @@ cheers ; skål ; terveydeksi, kippis
 -- verbatim concrete rules prefixed by ">" and comma-separated language list
 > Eng,Swe lin Gin = "gin" ; 
 
--}
+-- multiple modules: modules as usual. Each module has to start from a new line.
+-- Should be UTF-8 encoded.
 
+-}
 
+{-
 main = do
- xx <- getArgs
- if null xx putStrLn usage else do
-  let (opts,file) = (init xx, last xx)
+  xx <- getArgs
+  if null xx then putStrLn usage else do 
+    let (opts,file) = (init xx, last xx)
+    (absn,cncns) <- readMulti opts file
+    if elem "-pgf" xx 
+      then do
+         system ("gf -make -s -optimize-pgf " ++ unwords (map gfFile cncns))
+         putStrLn $ "wrote " ++ absn ++ ".pgf"
+      else return ()
+-}
+
+readMulti :: FilePath -> IO (FilePath,[FilePath])
+readMulti file = do
   src <- readFile file
   let multi = getMulti (takeWhile (/='.') file) src
       absn  = absName multi
       cncns = cncNames multi
+      raws  = rawModules multi
   writeFile (gfFile absn) (absCode multi)
   mapM_ (uncurry writeFile) 
         [(gfFile cncn, cncCode absn cncn cod) | 
           cncn <- cncNames multi, let cod = [r | (la,r) <- cncRules multi, la == cncn]]
   putStrLn $ "wrote " ++ unwords (map gfFile (absn:cncns))
-  if elem "-pgf" xx 
-    then do
-       system ("gf -make -s -optimize-pgf " ++ unwords (map gfFile cncns))
-       putStrLn $ "wrote " ++ absn ++ ".pgf"
-    else return ()
+  mapM_ (uncurry writeFile) [(gfFile n,s) | (n,s) <- raws] --- overwrites those above
+  return (gfFile absn, map gfFile cncns)
 
 data Multi = Multi {
+  rawModules :: [(String,String)],
   absName  :: String,
   cncNames :: [String],
   startCat :: String,
@@ -60,6 +73,7 @@ data Multi = Multi {
 
 emptyMulti :: Multi 
 emptyMulti = Multi {
+  rawModules = [],
   absName  = "Abs",
   cncNames = [],
   startCat = "S",
@@ -78,7 +92,7 @@ cncCode ab cnc rules = unlines $ header : (reverse rules ++ ["}"]) where
   header = "concrete " ++ cnc ++ " of " ++ ab ++ " = {"
 
 getMulti :: String -> String -> Multi
-getMulti m s = foldl (flip addMulti) (emptyMulti{absName = m}) (lines s)
+getMulti m s = foldl (flip addMulti) (emptyMulti{absName = m}) (modlines (lines s))
 
 addMulti :: String -> Multi -> Multi
 addMulti line multi = case line of
@@ -97,11 +111,15 @@ addMulti line multi = case line of
      langs:ws   -> multi {
        cncRules = [(absName multi ++ la, unwords ws) | la <- chop ',' langs] ++ cncRules multi
        }
-  _ -> let (cat,fun,lins) = getRules (startCat multi) line 
-       in multi {
-         absRules = ("fun " ++ fun ++ " : " ++ cat ++ " ;") : absRules multi,
-         cncRules = zip (cncNames multi) lins ++ cncRules multi
-         }
+  _ -> case words line of
+        m:name:_ | isModule m -> multi {
+          rawModules = (name,line):rawModules multi
+          } 
+        _ -> let (cat,fun,lins) = getRules (startCat multi) line in 
+              multi {
+               absRules = ("fun " ++ fun ++ " : " ++ cat ++ " ;") : absRules multi,
+               cncRules = zip (cncNames multi) lins ++ cncRules multi
+               }
 
 getRules :: String -> String -> (String,String,[String])
 getRules cat line = (cat, fun, map lin rss) where
@@ -134,4 +152,14 @@ idChar c =
 gfFile :: FilePath -> FilePath
 gfFile f = f ++ ".gf"
 
-
+isModule :: String -> Bool
+isModule = flip elem 
+  ["abstract","concrete","incomplete","instance","interface","resource"]
+
+modlines :: [String] -> [String]
+modlines ss = case ss of
+  l:ls -> case words l of
+    w:_ | isModule w -> case break (isModule . concat . take 1 . words) ls of
+      (ms,rest) -> unlines (l:ms) : modlines rest
+    _ -> l : modlines ls
+  _ -> []
diff --git a/src/tools/Koe.multi b/src/tools/Koe.gfm
index d8fed0e53..d8fed0e53 100644
--- a/src/tools/Koe.multi
+++ b/src/tools/Koe.gfm