1
0
forked from GitHub/gf-core

restored readline

This commit is contained in:
aarne
2008-05-22 07:38:41 +00:00
parent b7ff446966
commit 3a27dd455e
2 changed files with 8 additions and 5 deletions

View File

@@ -7,6 +7,7 @@ import GF.GFCC.API
import GF.Devel.UseIO
import GF.Devel.Arch
import GF.System.Arch (fetchCommand)
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
@@ -68,7 +68,10 @@ welcome = unlines [
"Some things may work. "
]
prompt env = abstractName (multigrammar env) ++ "> "
prompt env = absname ++ "> " where
absname = case abstractName (multigrammar env) of
"_" -> "" --- created by new Ident handling 22/5/2008
n -> n
data GFEnv = GFEnv {
commandenv :: CommandEnv,

View File

@@ -4,7 +4,7 @@ include config.mk
GHMAKE=$(GHC) --make
GHCXMAKE=ghcxmake
GHCFLAGS+= -fglasgow-exts
GHCOPTFLAGS=-O2
GHCOPTFLAGS=-O2 -prof
GHCFUDFLAG=
JAVAFLAGS=-target 1.4 -source 1.4
GFEDITOR=JavaGUI2
@@ -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/