diff options
| author | aarne <aarne@cs.chalmers.se> | 2006-02-14 21:19:24 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2006-02-14 21:19:24 +0000 |
| commit | 4e574703de7d4389aee8c1001250539a75fee8df (patch) | |
| tree | 4fbba34119286f7b9029d7cf8dd16efea6e86bf4 /src/GF/Compile/ShellState.hs | |
| parent | b087db0871005c810a5b5e2f4d525ffd428b0fc1 (diff) | |
nocf flag ; mathematical API
Diffstat (limited to 'src/GF/Compile/ShellState.hs')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index 40e91d9ab..ab9beea36 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -215,7 +215,9 @@ updateShellState opts ign mcnc sh ((_,sgr,gr),rts) = do concr0 = ifNull Nothing (return . head) concrs notInrts f = notElem f $ map fst rts subcgr = unSubelimCanon cgr - cfs <- mapM (canon2cf opts ign subcgr) concrs --- why need to update all... + cf's <- if oElem noCF opts + then return $ map snd $ cfs sh + else mapM (canon2cf opts ign subcgr) concrs --- why need to update all... let morphos = map (mkMorpho subcgr) concrs let probss = [] ----- @@ -241,7 +243,7 @@ updateShellState opts ign mcnc sh ((_,sgr,gr),rts) = do concretes = zip (zip concrs concrs) (repeat True), canModules = cgr, srcModules = src, - cfs = zip concrs cfs, + cfs = zip concrs cf's, abstracts = abstrs, mcfgs = zip concrs mcfgs, cfgs = zip concrs cfgs, @@ -424,14 +426,6 @@ allActiveStateGrammarsWithNames st = allActiveGrammars = map snd . allActiveStateGrammarsWithNames -{- -allGrammarSTs = map stateGrammarST . allStateGrammars -allCFs = map stateCF . allStateGrammars - -firstGrammarST = stateGrammarST . firstStateGrammar -firstAbstractST = abstractOf . firstGrammarST -firstConcreteST = concreteOf . firstGrammarST --} -- command-line option -lang=foo overrides the actual grammar in state grammarOfOptState :: Options -> ShellState -> StateGrammar grammarOfOptState opts st = |