move the definitions of _B and _V to PGF.Macros

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)

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"

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 =