diff options
| author | bringert <bringert@cs.chalmers.se> | 2008-04-07 15:57:04 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2008-04-07 15:57:04 +0000 |
| commit | f439895ef9b008cf0e3e7224b0ee3f95215fee79 (patch) | |
| tree | bc1be6a66b56e9da45b8b58672695e01930bf136 /src/GF/GFCC | |
| parent | 898c079d8444109e08ed2eed1e218d5f5ed427a6 (diff) | |
Added GF.GFCC.Macros.lookStartCat. Changed GF.GFCC:API to use it (before, startCat always returned "S"!). GFCCtoJS has not been changed, Moises will do that.
Diffstat (limited to 'src/GF/GFCC')
| -rw-r--r-- | src/GF/GFCC/API.hs | 2 | ||||
| -rw-r--r-- | src/GF/GFCC/Macros.hs | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/GF/GFCC/API.hs b/src/GF/GFCC/API.hs index 9bfe98b95..c266a5553 100644 --- a/src/GF/GFCC/API.hs +++ b/src/GF/GFCC/API.hs @@ -122,7 +122,7 @@ languages mgr = [l | CId l <- cncnames (gfcc mgr)] categories mgr = [c | CId c <- Map.keys (cats (abstract (gfcc mgr)))] -startCat mgr = "S" ---- +startCat mgr = lookStartCat (gfcc mgr) emptyMultiGrammar = MultiGrammar emptyGFCC diff --git a/src/GF/GFCC/Macros.hs b/src/GF/GFCC/Macros.hs index b9acd9fc5..4897aa667 100644 --- a/src/GF/GFCC/Macros.hs +++ b/src/GF/GFCC/Macros.hs @@ -5,7 +5,9 @@ import GF.GFCC.DataGFCC import GF.Formalism.FCFG (FGrammar) import GF.Parsing.FCFG.PInfo (FCFPInfo, fcfPInfoToFGrammar) ----import GF.GFCC.PrintGFCC +import Control.Monad import Data.Map +import Data.Maybe import Data.List -- operations for manipulating GFCC grammars and objects @@ -36,6 +38,10 @@ lookParser gfcc lang = parser $ lookMap (error "no lang") lang $ concretes gfcc lookFCFG :: GFCC -> CId -> Maybe FGrammar lookFCFG gfcc lang = fmap fcfPInfoToFGrammar $ lookParser gfcc lang +lookStartCat :: GFCC -> String +lookStartCat gfcc = fromMaybe "S" $ msum $ Data.List.map (Data.Map.lookup (CId "startcat")) + [gflags gfcc, aflags (abstract gfcc)] + lookGlobalFlag :: GFCC -> CId -> String lookGlobalFlag gfcc f = lookMap "?" f (gflags gfcc) |