From 03f3baeba3e4921446846828a2974e81e766f934 Mon Sep 17 00:00:00 2001 From: hallgren Date: Fri, 24 Feb 2012 17:12:38 +0000 Subject: gfse: text mode editing: accept grammars with printname judgements But printname judgements are ignored for now. Also fixed an UTF-8 encoding bug when parsing uploaded grammars in gf -server mode. --- src/compiler/SimpleEditor/Convert.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/compiler/SimpleEditor/Convert.hs') diff --git a/src/compiler/SimpleEditor/Convert.hs b/src/compiler/SimpleEditor/Convert.hs index 037b04986..4a2e0daa9 100644 --- a/src/compiler/SimpleEditor/Convert.hs +++ b/src/compiler/SimpleEditor/Convert.hs @@ -103,7 +103,7 @@ convOpen o = _ -> fail "unsupported module open" -data CncJment = Pa S.Param | LC Lincat | Op Oper | Li Lin +data CncJment = Pa S.Param | LC Lincat | Op Oper | Li Lin | Ignored convCncJments = mapM convCncJment . Map.toList @@ -111,13 +111,14 @@ convCncJment (name,jment) = case jment of ResParam ops _ -> return $ Pa $ Param i (maybe "" (render . ppParams q . unLoc) ops) - CncCat (Just (L _ typ)) Nothing Nothing _ -> + ResValue _ -> return Ignored + CncCat (Just (L _ typ)) Nothing pprn _ -> -- ignores printname !! return $ LC $ Lincat i (render $ ppTerm q 0 typ) ResOper oltyp (Just lterm) -> return $ Op $ Oper lhs rhs where lhs = i++maybe "" ((" : "++) . render . ppTerm q 0 . unLoc) oltyp rhs = " = "++render (ppTerm q 0 (unLoc lterm)) - CncFun _ (Just ldef) Nothing _ -> + CncFun _ (Just ldef) pprn _ -> -- ignores printname !! do let (xs,e') = getAbs (unLoc ldef) lin = render $ ppTerm q 0 e' args <- mapM convBind xs -- cgit v1.2.3