diff options
| author | krasimir <krasimir@chalmers.se> | 2010-01-12 14:36:41 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-01-12 14:36:41 +0000 |
| commit | cf22bd094f2cdbd18de166d9d24b8cf9a30c87b9 (patch) | |
| tree | e7451bfad9bdb9e9d59301a9bd3e3d418a430b49 | |
| parent | ee3ce9694c134d697bf3fa6b8910c7d863f84dab (diff) | |
move the definitions of _B and _V to PGF.Macros
| -rw-r--r-- | src/compiler/GF/Compile/GeneratePMCFG.hs | 3 | ||||
| -rw-r--r-- | src/runtime/haskell/PGF/Macros.hs | 3 | ||||
| -rw-r--r-- | src/runtime/haskell/PGF/Parse.hs | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/GF/Compile/GeneratePMCFG.hs b/src/compiler/GF/Compile/GeneratePMCFG.hs index 8b815008e..bad72f469 100644 --- a/src/compiler/GF/Compile/GeneratePMCFG.hs +++ b/src/compiler/GF/Compile/GeneratePMCFG.hs @@ -431,9 +431,6 @@ expandHOAS abs_defs cnc_defs lincats lindefs env = Nothing -> error $ "No lincat for " ++ showCId cat Just ctype -> ctype - _B = mkCId "_B" - _V = mkCId "_V" - addProduction :: GrammarEnv -> FCat -> Production -> GrammarEnv 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) diff --git a/src/runtime/haskell/PGF/Macros.hs b/src/runtime/haskell/PGF/Macros.hs index 2f6282aa3..81f946211 100644 --- a/src/runtime/haskell/PGF/Macros.hs +++ b/src/runtime/haskell/PGF/Macros.hs @@ -148,3 +148,6 @@ cidString = mkCId "String" cidInt = mkCId "Int" cidFloat = mkCId "Float" cidVar = mkCId "__gfVar" + +_B = mkCId "__gfB" +_V = mkCId "__gfV" diff --git a/src/runtime/haskell/PGF/Parse.hs b/src/runtime/haskell/PGF/Parse.hs index 6de7f29a8..e9936233c 100644 --- a/src/runtime/haskell/PGF/Parse.hs +++ b/src/runtime/haskell/PGF/Parse.hs @@ -192,9 +192,6 @@ extractTrees (PState pgf pinfo chart items) ty@(DTyp _ start _) = freeVar (EFun v) = Set.singleton v
freeVar _ = Set.empty
-_B = mkCId "_B"
-_V = mkCId "_V"
-
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
| inRange (bounds lin) ppos =
|