From 3a27dd455ee22b9b6eb9e9ec9656b344bd8741a0 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 22 May 2008 07:38:41 +0000
Subject: [PATCH] restored readline

---
 src-3.0/GF/Devel/GFI.hs | 9 ++++++---
 src-3.0/Makefile        | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src-3.0/GF/Devel/GFI.hs b/src-3.0/GF/Devel/GFI.hs
index f59bd15e6..04c567aa3 100644
--- a/src-3.0/GF/Devel/GFI.hs
+++ b/src-3.0/GF/Devel/GFI.hs
@@ -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,
diff --git a/src-3.0/Makefile b/src-3.0/Makefile
index 421409280..df6ec072a 100644
--- a/src-3.0/Makefile
+++ b/src-3.0/Makefile
@@ -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/