msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

show "error" in run interruptibly mode in GFI

Browse Source
This commit is contained in:
aarne
2008-09-09 06:58:38 +00:00
parent 63a706b109
commit 033da07c39
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/GF/Compile/GrammarToGFCC.hs
View File

@@ -450,7 +450,11 @@ term2term fun cgr env@(labels,untyps,typs) tr = case tr of
let v = comp v0 let v = comp v0
let mv1 = Map.lookup v untyps let mv1 = Map.lookup v untyps
case mv1 of case mv1 of
Just v1 -> return $ (comp . (ts !!) . fromInteger) v1 Just v0 ->
let v1 = fromInteger v0
v2 = v1 --if length ts > v1 then v1
--else trace ("DEBUG" +++ show v1 +++ "of" +++ show ts) 0
in return $ (comp . (ts !!)) v2
_ -> return (S (comp tb) v) _ -> return (S (comp tb) v)
R r -> R [(l,(ty,comp t)) | (l,(ty,t)) <- r] R r -> R [(l,(ty,comp t)) | (l,(ty,t)) <- r]

3
src/GFI.hs
View File

@@ -119,7 +119,8 @@ loop opts gfenv0 = do
_ -> do _ -> do
interpretCommandLine enc env s interpretCommandLine enc env s
loopNewCPU gfenv loopNewCPU gfenv
gfenv' <- return $ either (const gfenv) id r -- gfenv' <- return $ either (const gfenv) id r
gfenv' <- either (\e -> (print e >> return gfenv)) return r
loop opts gfenv' loop opts gfenv'
importInEnv :: GFEnv -> Options -> [FilePath] -> IO GFEnv importInEnv :: GFEnv -> Options -> [FilePath] -> IO GFEnv