diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-01-04 15:54:40 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-01-04 15:54:40 +0000 |
| commit | d5500498736ff9cdce7d23e336357742c5799825 (patch) | |
| tree | 53d4fe137e04c79d521fc373d41f5c38eb1bb5e9 /src/GF/Source | |
| parent | 934d4dbd7c922fdc30b0bd6225c0dc44fea16ddb (diff) | |
finalizing experiments with Finnish nouns
Diffstat (limited to 'src/GF/Source')
| -rw-r--r-- | src/GF/Source/GrammarToSource.hs | 1 | ||||
| -rw-r--r-- | src/GF/Source/SourceToGrammar.hs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/GF/Source/GrammarToSource.hs b/src/GF/Source/GrammarToSource.hs index 0a2715be0..9ad8b8850 100644 --- a/src/GF/Source/GrammarToSource.hs +++ b/src/GF/Source/GrammarToSource.hs @@ -219,6 +219,7 @@ trp p = case p of PSeq p q -> P.PSeq (trp p) (trp q) PRep p -> P.PRep (trp p) PNeg p -> P.PNeg (trp p) + PChar -> P.PV (IC "C_") ---- temporary encoding trAssign (lab, (mty, t)) = maybe (P.LDDef x t') (\ty -> P.LDFull x (trt ty) t') mty diff --git a/src/GF/Source/SourceToGrammar.hs b/src/GF/Source/SourceToGrammar.hs index 8435540e4..8e4f334e3 100644 --- a/src/GF/Source/SourceToGrammar.hs +++ b/src/GF/Source/SourceToGrammar.hs @@ -539,7 +539,7 @@ trLabel :: Label -> Err G.Label trLabel x = case x of -- this case is for bward compatibiity and should be removed - LIdent (IC ('v':ds)) | all isDigit ds -> return $ G.LVar $ readIntArg ds + LIdent (IC ('v':ds@(_:_))) | all isDigit ds -> return $ G.LVar $ readIntArg ds LIdent (IC s) -> return $ G.LIdent s LVar x -> return $ G.LVar $ fromInteger x @@ -572,6 +572,7 @@ transPatts p = case p of transPatt :: Patt -> Err G.Patt transPatt x = case x of PW -> return G.wildPatt + PV (IC "C_") -> return G.PChar ---- temporary encoding PV id -> liftM G.PV $ transIdent id PC id patts -> liftM2 G.PC (transIdent id) (mapM transPatt patts) PCon id -> liftM2 G.PC (transIdent id) (return []) |