summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2008-05-21 09:46:30 +0000
committeraarne <aarne@cs.chalmers.se>2008-05-21 09:46:30 +0000
commit529374caaa6d451400f57f1ff82106d89d603944 (patch)
tree663cdd773d420d5582bc083b877b754e3470227e
parent055c0d0d5a5bb0dc75904fe53df7f2e4f5732a8f (diff)
added Readline to GF3 shell (in the same way as GF2, using GFCFLAGS in Makefile)
-rw-r--r--src-3.0/GF/Devel/GFI.hs4
-rw-r--r--src-3.0/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/src-3.0/GF/Devel/GFI.hs b/src-3.0/GF/Devel/GFI.hs
index f59bd15e6..e68bbb077 100644
--- a/src-3.0/GF/Devel/GFI.hs
+++ b/src-3.0/GF/Devel/GFI.hs
@@ -5,6 +5,7 @@ import GF.Command.Importing
import GF.Command.Commands
import GF.GFCC.API
+import GF.System.Arch (fetchCommand)
import GF.Devel.UseIO
import GF.Devel.Arch
import GF.Infra.Option ---- Haskell's option lib
@@ -20,8 +21,7 @@ mainGFI xx = do
loop :: GFEnv -> IO GFEnv
loop gfenv0 = do
let env = commandenv gfenv0
- putStrFlush (prompt env)
- s <- getLine
+ s <- fetchCommand (prompt env)
let gfenv = gfenv0 {history = s : history gfenv0}
case words s of
diff --git a/src-3.0/Makefile b/src-3.0/Makefile
index 421409280..53c648908 100644
--- a/src-3.0/Makefile
+++ b/src-3.0/Makefile
@@ -207,7 +207,7 @@ gfc: gf3
gfi: gf3
gf3:
- $(GHMAKE) $(GHCOPTFLAGS) -o gf3 GF/Devel/GF.hs
+ $(GHMAKE) $(GHCOPTFLAGS) $(GHCFLAGS) -o gf3 GF/Devel/GF.hs
strip $(GF3_EXE)
mv $(GF3_EXE) ../bin/