CFGtoPGF is now extended to support context-free grammars with primitive parameters

3 files changed, 16 insertions, 16 deletions

diff --git a/src/compiler/GF/Speech/CFGToFA.hs b/src/compiler/GF/Speech/CFGToFA.hs
index 5319c0bbe..0a530e594 100644
--- a/src/compiler/GF/Speech/CFGToFA.hs
+++ b/src/compiler/GF/Speech/CFGToFA.hs
@@ -75,14 +75,14 @@ make_fa c@(g,ns) q0 alpha q1 fa =
                   case mrRec n of
                     -- the set Ni is right-recursive or cyclic
                     RightR ->
-                        let new = [(getState c, xs, q1) | CFRule c xs _ <- nrs]
-                                  ++ [(getState c, xs, getState d) | CFRule c ss _ <- rs, 
+                        let new = [(getState c, xs, q1) | Rule c xs _ <- nrs]
+                                  ++ [(getState c, xs, getState d) | Rule c ss _ <- rs, 
                                        let (xs,NonTerminal d) = (init ss,last ss)]
                          in make_fas new $ newTransition q0 (getState a) Nothing fa'
                     -- the set Ni is left-recursive                         
                     LeftR ->
-                        let new = [(q0, xs, getState c) | CFRule c xs _ <- nrs]
-                                  ++ [(getState d, xs, getState c) | CFRule c (NonTerminal d:xs) _ <- rs]
+                        let new = [(q0, xs, getState c) | Rule c xs _ <- nrs]
+                                  ++ [(getState d, xs, getState c) | Rule c (NonTerminal d:xs) _ <- rs]
                          in make_fas new $ newTransition (getState a) q1 Nothing fa'
                 where
                   (fa',stateMap) = addStatesForCats ni fa
@@ -91,7 +91,7 @@ make_fa c@(g,ns) q0 alpha q1 fa =
                                x stateMap
               -- a is not recursive
               Nothing -> let rs = catRules g a
-                          in foldl' (\f (CFRule _ b _) -> make_fa_ q0 b q1 f) fa rs
+                          in foldl' (\f (Rule _ b _) -> make_fa_ q0 b q1 f) fa rs
         (x:beta) -> let (fa',q) = newState () fa
                      in make_fa_ q beta q1 $ make_fa_ q0 [x] q fa'
   where
@@ -190,15 +190,15 @@ make_fa1 mr q0 alpha q1 fa =
             case mrRec mr of
                 NotR -> -- the set is a non-recursive (always singleton) set of categories
                         -- so the set of category rules is the set of rules for the whole set
-                    make_fas [(q0, b, q1) | CFRule _ b _ <- mrNonRecRules mr] fa
+                    make_fas [(q0, b, q1) | Rule _ b _ <- mrNonRecRules mr] fa
                 RightR -> -- the set is right-recursive or cyclic
-                    let new = [(getState c, xs, q1) | CFRule c xs _ <- mrNonRecRules mr]
-                              ++ [(getState c, xs, getState d) | CFRule c ss _ <- mrRecRules mr, 
+                    let new = [(getState c, xs, q1) | Rule c xs _ <- mrNonRecRules mr]
+                              ++ [(getState c, xs, getState d) | Rule c ss _ <- mrRecRules mr, 
                                                                  let (xs,NonTerminal d) = (init ss,last ss)]
                      in make_fas new $ newTransition q0 (getState a) Nothing fa'
                 LeftR -> -- the set is left-recursive
-                    let new = [(q0, xs, getState c) | CFRule c xs _ <- mrNonRecRules mr]
-                              ++ [(getState d, xs, getState c) | CFRule c (NonTerminal d:xs) _ <- mrRecRules mr]
+                    let new = [(q0, xs, getState c) | Rule c xs _ <- mrNonRecRules mr]
+                              ++ [(getState d, xs, getState c) | Rule c (NonTerminal d:xs) _ <- mrRecRules mr]
                      in make_fas new $ newTransition (getState a) q1 Nothing fa'
              where
              (fa',stateMap) = addStatesForCats (mrCats mr) fa
diff --git a/src/compiler/GF/Speech/PGFToCFG.hs b/src/compiler/GF/Speech/PGFToCFG.hs
index 49c679aea..8cb01f3a9 100644
--- a/src/compiler/GF/Speech/PGFToCFG.hs
+++ b/src/compiler/GF/Speech/PGFToCFG.hs
@@ -64,17 +64,17 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co
 
 
     extCats :: Set Cat
-    extCats = Set.fromList $ map lhsCat startRules
+    extCats = Set.fromList $ map ruleLhs startRules
 
     startRules :: [CFRule]
-    startRules = [CFRule (showCId c) [NonTerminal (fcatToCat fc r)] (CFRes 0) 
+    startRules = [Rule (showCId c) [NonTerminal (fcatToCat fc r)] (CFRes 0) 
                       | (c,CncCat s e lbls) <- Map.toList (cnccats cnc), 
                         fc <- range (s,e), not (isPredefFId fc),
                         r <- [0..catLinArity fc-1]]
 
     ruleToCFRule :: (FId,Production) -> [CFRule]
     ruleToCFRule (c,PApply funid args) = 
-        [CFRule (fcatToCat c l) (mkRhs row) (profilesToTerm [fixProfile row n | n <- [0..length args-1]])
+        [Rule (fcatToCat c l) (mkRhs row) (profilesToTerm [fixProfile row n | n <- [0..length args-1]])
            | (l,seqid) <- Array.assocs rhs
            , let row = sequences cnc ! seqid
            , not (containsLiterals row)]
@@ -119,5 +119,5 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co
         profileToTerm t [] = CFMeta t
         profileToTerm _ xs = CFRes (last xs) -- FIXME: unify
     ruleToCFRule (c,PCoerce c') =
-        [CFRule (fcatToCat c l) [NonTerminal (fcatToCat c' l)] (CFRes 0)
+        [Rule (fcatToCat c l) [NonTerminal (fcatToCat c' l)] (CFRes 0)
            | l <- [0..catLinArity c-1]]
diff --git a/src/compiler/GF/Speech/SRG.hs b/src/compiler/GF/Speech/SRG.hs
index a0a616561..9d51e52e9 100644
--- a/src/compiler/GF/Speech/SRG.hs
+++ b/src/compiler/GF/Speech/SRG.hs
@@ -129,9 +129,9 @@ renameCats prefix cfg = mapCFGCats renameCat cfg
         badCat c = error ("GF.Speech.SRG.renameCats: " ++ c ++ "\n" ++ prCFG cfg)
 
 cfRulesToSRGRule :: [CFRule] -> SRGRule
-cfRulesToSRGRule rs@(r:_) = SRGRule (lhsCat r) rhs
+cfRulesToSRGRule rs@(r:_) = SRGRule (ruleLhs r) rhs
     where 
-      alts = [((n,Nothing),mkSRGSymbols 0 ss) | CFRule c ss n <- rs]
+      alts = [((n,Nothing),mkSRGSymbols 0 ss) | Rule c ss n <- rs]
       rhs = [SRGAlt p n (srgItem sss) | ((n,p),sss) <- buildMultiMap alts ]
 
       mkSRGSymbols _ [] = []