GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

move the definitions of _B and _V to PGF.Macros

Browse Source
This commit is contained in:
krasimir
2010-01-12 14:36:41 +00:00
parent ee3ce9694c
commit cf22bd094f
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/GF/Compile/GeneratePMCFG.hs
View File

@@ -431,9 +431,6 @@ expandHOAS abs_defs cnc_defs lincats lindefs env =
Nothing -> error $ "No lincat for " ++ showCId cat Nothing -> error $ "No lincat for " ++ showCId cat
Just ctype -> ctype Just ctype -> ctype
_B = mkCId "_B"
_V = mkCId "_V"
addProduction :: GrammarEnv -> FCat -> Production -> GrammarEnv addProduction :: GrammarEnv -> FCat -> Production -> GrammarEnv
addProduction (GrammarEnv last_id catSet seqSet funSet crcSet prodSet) cat p = addProduction (GrammarEnv last_id catSet seqSet funSet crcSet prodSet) cat p =
GrammarEnv last_id catSet seqSet funSet crcSet (IntMap.insertWith Set.union cat (Set.singleton p) prodSet) GrammarEnv last_id catSet seqSet funSet crcSet (IntMap.insertWith Set.union cat (Set.singleton p) prodSet)

3
src/runtime/haskell/PGF/Macros.hs
View File

@@ -148,3 +148,6 @@ cidString = mkCId "String"
cidInt = mkCId "Int" cidInt = mkCId "Int"
cidFloat = mkCId "Float" cidFloat = mkCId "Float"
cidVar = mkCId "__gfVar" cidVar = mkCId "__gfVar"
_B = mkCId "__gfB"
_V = mkCId "__gfV"

3
src/runtime/haskell/PGF/Parse.hs
View File

@@ -192,9 +192,6 @@ extractTrees (PState pgf pinfo chart items) ty@(DTyp _ start _) =
freeVar (EFun v) = Set.singleton v freeVar (EFun v) = Set.singleton v
freeVar _ = Set.empty freeVar _ = Set.empty
_B = mkCId "_B"
_V = mkCId "_V"
process mbt fn !seqs !funs [] acc chart = (acc,chart) process mbt fn !seqs !funs [] acc chart = (acc,chart)
process mbt fn !seqs !funs (item@(Active j ppos funid seqid args key0):items) acc chart process mbt fn !seqs !funs (item@(Active j ppos funid seqid args key0):items) acc chart
| inRange (bounds lin) ppos = | inRange (bounds lin) ppos =