diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/UseGrammar/Parsing.hs | 6 | ||||
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/Today.hs | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/GF/UseGrammar/Parsing.hs b/src/GF/UseGrammar/Parsing.hs index 6cafb8c69..ab379cec3 100644 --- a/src/GF/UseGrammar/Parsing.hs +++ b/src/GF/UseGrammar/Parsing.hs @@ -43,9 +43,9 @@ parseStringC opts0 sg cat s | oElem newParser opts0 = do let pm = maybe "" id $ getOptVal opts0 useParser -- -parser=pm gr = grammar sg - ps <- checkErr $ N.newParser pm gr (cfCat2Cat cat) s - checkWarn $ unlines ps - return [] + ct = cfCat2Cat cat + ts <- checkErr $ N.newParser pm gr (cfCat2Cat cat) s + mapM (checkErr . (annotate gr)) ts | otherwise = do let opts = unionOptions opts0 $ stateOptions sg diff --git a/src/Makefile b/src/Makefile index 19343de0e..ae14907c8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,11 +2,16 @@ GHMAKE=ghc GHCFLAGS=-package lang -package util GHCFUDFLAG=-package Fudgets GHCINCLUDE=-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -ifor-ghc -iparsing +GHCINCLUDENOFUD=-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -ifor-ghc-nofud -iparsing all: make today ; make ghc ghc: $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) $(GHCFUDFLAG) --make GF.hs -o gf2+ ; strip gf2+ ; mv gf2+ ../bin/ +nofud: + $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) --make GF.hs -o gf2n ; strip gf2n +nofud-links: + cd for-ghc-nofud ; rm *.hs ; ln -s ../for-ghc/Arch.hs ; ln -s ../for-hugs/ArchEdit.hs ; cd .. batch: $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) --make GF2.hs -o gf2 ; strip gf2 api: diff --git a/src/Today.hs b/src/Today.hs index 208b000f9..1fc48a713 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Mon Oct 6 10:50:56 CEST 2003" +module Today where today = "Mon Oct 6 11:34:26 CEST 2003" |