diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Compile/PrOld.hs | 2 | ||||
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/Today.hs | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/GF/Compile/PrOld.hs b/src/GF/Compile/PrOld.hs index 4462fb95d..683dbe419 100644 --- a/src/GF/Compile/PrOld.hs +++ b/src/GF/Compile/PrOld.hs @@ -57,7 +57,7 @@ stripTerm t = case t of TWild ty -> TWild $ stripTerm ty _ -> ti R [] -> EInt 8 --- GF 1.2 parser doesn't accept empty records - RecType [] -> Cn "Int" --- + RecType [] -> Cn (zIdent "Int") --- _ -> composSafeOp stripTerm t stripPattern p = case p of diff --git a/src/Makefile b/src/Makefile index 83216117d..ea5dabebd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,6 @@ GHMAKE=ghc GHCFLAGS=-package lang -package util -fglasgow-exts +GHCOPTFLAGS=-O -package lang -package util -fglasgow-exts GHCFUDFLAG=-package Fudgets GHCINCLUDE=-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -ifor-ghc -iparsing -iparsers GHCINCLUDENOFUD=-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -ifor-ghc-nofud -iparsing -iparsers @@ -9,11 +10,14 @@ WINDOWSINCLUDE=-ifor-windows -iapi -icompile -igrammar -iinfra -ishell -isource all: make today ; make ghc unix: - make nofud-links ; make ghc + make nofud-links ; make opt windows: make nofud-links ; make justwindows install-java: make javac ; cd ../bin ; ln -s ../src/java ; echo "PLEASE edit GFHOME in bin/jgf2" +opt: + $(GHMAKE) $(GHCOPTFLAGS) $(GHCINCLUDENOFUD) --make GF.hs -o gf2 ; strip gf2 ; mv gf2 ../bin/ + ghc: make nofud fud: @@ -23,7 +27,7 @@ gft: nofud: $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) --make GF.hs -o gf2 ; strip gf2 ; mv gf2 ../bin/ justwindows: - $(GHMAKE) $(GHCFLAGS) $(WINDOWSINCLUDE) --make GF.hs -o gf2.exe ; strip gf2.exe ; mv gf2.exe ../bin/ + $(GHMAKE) $(GHCOPTFLAGS) $(WINDOWSINCLUDE) --make GF.hs -o gf2.exe ; strip gf2.exe ; mv gf2.exe ../bin/ nofud-links: cd for-ghc-nofud ; rm -f *.hs ; ln -s ../for-ghc/Arch.hs ; ln -s ../for-hugs/ArchEdit.hs ; cd .. batch: diff --git a/src/Today.hs b/src/Today.hs index c3c1617c6..c74a9df8b 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Wed Apr 21 17:20:17 CEST 2004" +module Today where today = "Tue Apr 27 22:17:25 CEST 2004" |