diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-03-06 21:27:14 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-03-06 21:27:14 +0000 |
| commit | 27508654c01c5ebad3c495629ccbd49c067429ab (patch) | |
| tree | 440e4ec729664e71a29e8d33d8fdcb7af3757a15 /src/GF/Devel/Compile | |
| parent | fe863958533cd905939241e6fa50af439058cf5a (diff) | |
option -mac to vt command (uses open with ps)
Diffstat (limited to 'src/GF/Devel/Compile')
| -rw-r--r-- | src/GF/Devel/Compile/CheckGrammar.hs | 3 | ||||
| -rw-r--r-- | src/GF/Devel/Compile/SourceToGF.hs | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/GF/Devel/Compile/CheckGrammar.hs b/src/GF/Devel/Compile/CheckGrammar.hs index e9daa1f64..30ea0a70e 100644 --- a/src/GF/Devel/Compile/CheckGrammar.hs +++ b/src/GF/Devel/Compile/CheckGrammar.hs @@ -68,7 +68,7 @@ showCheckModule mos m = do checkModule :: GF -> SourceModule -> Check SourceModule checkModule gf0 (name,mo) = checkIn ("checking module" +++ prt name) $ do let gr = gf0 {gfmodules = Map.insert name mo (gfmodules gf0)} ----- checkRestrictedInheritance gr (name, mo) + ---- checkRestrictedInheritance gr (name, mo) mo1 <- case mtype mo of MTAbstract -> judgementOpModule (checkAbsInfo gr name) mo MTGrammar -> entryOpModule (checkResInfo gr name) mo @@ -83,7 +83,6 @@ checkModule gf0 (name,mo) = checkIn ("checking module" +++ prt name) $ do MTInstance iname -> do intf <- checkErr $ lookupModule gr iname - -- checkCompleteInstance abs mo -- this is done in Rebuild entryOpModule (checkResInfo gr name) mo return $ (name, mo1) diff --git a/src/GF/Devel/Compile/SourceToGF.hs b/src/GF/Devel/Compile/SourceToGF.hs index 7e3228dc1..a62179c18 100644 --- a/src/GF/Devel/Compile/SourceToGF.hs +++ b/src/GF/Devel/Compile/SourceToGF.hs @@ -266,7 +266,8 @@ transResDef x = case x of returnl [(f, resOper pt pe) | (f,(pt,pe)) <- defs'] DefFlag defs -> liftM (Right . concat) $ mapM transFlagDef defs - _ -> Bad $ "illegal definition form in resource" +++ printTree x + _ -> return $ Left [] ---- +---- _ -> Bad $ "illegal definition form in resource" +++ printTree x where mkParamDefs (p,pars) = @@ -317,7 +318,8 @@ transCncDef x = case x of let defs2 = [(f, termInPattern t) | (f,(_,Yes t)) <- defs'] returnl [(f, G.CncFun Nothing (yes t) nope) | (f,t) <- defs2] -} - _ -> errIn ("illegal definition in concrete syntax:") $ transResDef x + _ -> return $ Left [] ---- +---- _ -> errIn ("illegal definition in concrete syntax:") $ transResDef x transPrintDef :: Def -> Err [(Ident,G.Term)] transPrintDef x = case x of |