diff options
| author | aarne <aarne@chalmers.se> | 2011-08-25 15:58:38 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2011-08-25 15:58:38 +0000 |
| commit | 6757ab2b41a9dc6c74f6184b8d0846970753e9fc (patch) | |
| tree | 3d242e56536986c3cd8b0fb9ddf9c5282c7bebb2 /src/compiler/GF | |
| parent | 1fccece30c6da8a872499cf8bf0eaa9c7af2522a (diff) | |
reload command in shell
Diffstat (limited to 'src/compiler/GF')
| -rw-r--r-- | src/compiler/GF/Command/Commands.hs | 4 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Compute/Concrete.hs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs index e7beec23e..543c05cb2 100644 --- a/src/compiler/GF/Command/Commands.hs +++ b/src/compiler/GF/Command/Commands.hs @@ -665,6 +665,10 @@ allCommands env@(pgf, mos) = Map.fromList [ longname = "quit", synopsis = "exit GF interpreter" }), + ("r", emptyCommandInfo { + longname = "reload", + synopsis = "repeat the latest import command" + }), ("rf", emptyCommandInfo { longname = "read_file", synopsis = "read string or tree input from a file", diff --git a/src/compiler/GF/Compile/Compute/Concrete.hs b/src/compiler/GF/Compile/Compute/Concrete.hs index adcb61ece..29ba8969d 100644 --- a/src/compiler/GF/Compile/Compute/Concrete.hs +++ b/src/compiler/GF/Compile/Compute/Concrete.hs @@ -65,7 +65,7 @@ computeTermOpt rec gr = comput True where return $ lookup x g case t' of _ | t == t' -> return t - _ -> comp g t' + _ -> comp g t' --- why compute again? AR 25/8/2011 -- Abs x@(IA _) b -> do Abs _ _ _ | full -> do -- \xs -> b @@ -391,7 +391,7 @@ computeTermOpt rec gr = comput True where ps0 <- mapM (compPatternMacro . fst) cs cs' <- mapM (compBranch g) (zip ps0 (map snd cs)) ------ cs' <- return (zip ps0 (map snd cs)) --- probably right AR 22/8/2011 +----- cs' <- return (zip ps0 (map snd cs)) --- probably right AR 22/8/2011 but can leave uninstantiated variables :-( ---- cs' <- mapM (compBranch g) cs return $ T i cs' -- happens with variable types |