diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/UseGrammar/Linear.hs | 6 | ||||
| -rw-r--r-- | src/Today.hs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/GF/UseGrammar/Linear.hs b/src/GF/UseGrammar/Linear.hs index 0bd053803..9459264ea 100644 --- a/src/GF/UseGrammar/Linear.hs +++ b/src/GF/UseGrammar/Linear.hs @@ -19,6 +19,7 @@ import Operations import Zipper import Monad +import List (intersperse) -- Linearization for canonical GF. AR 7/6/2003 @@ -143,7 +144,7 @@ allLinsOfTree gr a e = err (singleton . str) id $ do -- the value is a list of structures arranged as records of tables of terms allLinsAsRec :: CanonGrammar -> Ident -> A.Tree -> Err [[(Label,[([Patt],Term)])]] -allLinsAsRec gr c t = linearizeNoMark gr c t >>= allLinValues +allLinsAsRec gr c t = linearizeNoMark gr c t >>= expandLinTables gr >>= allLinValues -- the value is a list of structures arranged as records of tables of strings -- only taking into account string fields @@ -153,7 +154,8 @@ allLinTables gr c t = do mapM (mapM getS) r' where getS (lab,pss) = liftM (curry id lab) $ mapM gets pss - gets (ps,t) = liftM (curry id ps . concat . map str2strings) $ strsFromTerm t + gets (ps,t) = liftM (curry id ps . cc . map str2strings) $ strsFromTerm t + cc = concat . intersperse ["/"] prLinTable :: [[(Label,[([Patt],[String])])]] -> [String] prLinTable = concatMap prOne . concat where diff --git a/src/Today.hs b/src/Today.hs index 23b09ec65..f636f81fc 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Fri Dec 19 18:43:03 CET 2003" +module Today where today = "Mon Jan 5 11:31:04 CET 2004" |