diff options
| author | bringert <unknown> | 2005-06-17 13:15:16 +0000 |
|---|---|---|
| committer | bringert <unknown> | 2005-06-17 13:15:16 +0000 |
| commit | 2c48a10236bb19d8b04382cb1e957ce18b9d29fd (patch) | |
| tree | 1194fc1981b5cd2a144b72f4fff261edfeb1af2e /src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs | |
| parent | 05b5ffe5bf03a870f6fe0728ace6c0d8de69b89e (diff) | |
Changed name of Con constructor in GFC.cf to avoid errors on Windows when generating Java code with BNFC for the GFC grammar. CON is a reserved filename on Windows. Con was changed to Par, and all the code using was changed too.
Diffstat (limited to 'src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs')
| -rw-r--r-- | src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs index d1e5c5b20..d088bdebc 100644 --- a/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs +++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:22:56 $ +-- > CVS $Date: 2005/06/17 14:15:18 $ -- > CVS $Author: bringert $ --- > CVS $Revision: 1.2 $ +-- > CVS $Revision: 1.3 $ -- -- Converting GFC grammars to MCFG grammars, nondeterministically. -- @@ -106,7 +106,7 @@ enumerateArg env (A cat nr) = let ctype = lookupCType env cat -- Substitute each instantiated parameter path for its instantiation substitutePaths :: Env -> [STerm] -> Term -> STerm substitutePaths env arguments trm = subst trm - where subst (con `Con` terms) = con `SCon` map subst terms + where subst (con `Par` terms) = con `SCon` map subst terms subst (R record) = SRec [ (lbl, subst term) | lbl `Ass` term <- record ] subst (term `P` lbl) = subst term +. lbl subst (T ptype table) = STbl [ (pattern2sterm pat, subst term) | @@ -180,7 +180,7 @@ groundTerms env ctype = err error (map term2spattern) $ allParamValues (fst env) ctype term2spattern (R rec) = SRec [ (lbl, term2spattern term) | Ass lbl term <- rec ] -term2spattern (Con con terms) = SCon con $ map term2spattern terms +term2spattern (Par con terms) = SCon con $ map term2spattern terms pattern2sterm :: Patt -> STerm pattern2sterm (con `PC` patterns) = con `SCon` map pattern2sterm patterns |