diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 14 | ||||
| -rw-r--r-- | src/GF/Grammar/LookAbs.hs | 2 | ||||
| -rw-r--r-- | src/Makefile | 8 |
3 files changed, 10 insertions, 14 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index acf87494f..2b602ecca 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -36,7 +36,7 @@ data ShellState = ShSt { canModules :: CanonGrammar , -- compiled abstracts and concretes srcModules :: G.SourceGrammar , -- saved resource modules cfs :: [(Ident,CF)] , -- context-free grammars - pInfos :: Cnv.PInfo, -- peb 8/6 + pInfos :: [(Ident,Cnv.PInfo)], -- peb 18/6 morphos :: [(Ident,Morpho)], -- morphologies gloptions :: Options, -- global options readFiles :: [(FilePath,ModTime)],-- files read @@ -59,7 +59,7 @@ emptyShellState = ShSt { canModules = M.emptyMGrammar, srcModules = M.emptyMGrammar, cfs = [], - pInfos = Cnv.pInfo M.emptyMGrammar, -- peb 8/6 + pInfos = [], -- peb 18/6 morphos = [], gloptions = noOptions, readFiles = [], @@ -88,7 +88,7 @@ emptyStateGrammar = StGr { cncId = identC "#EMPTY", --- grammar = M.emptyMGrammar, cf = emptyCF, - pInfo = Cnv.pInfo M.emptyMGrammar, -- peb 8/6 + pInfo = Cnv.emptyPInfo, -- peb 18/6 morpho = emptyMorpho, loptions = noOptions } @@ -129,7 +129,7 @@ updateShellState opts sh ((_,sgr,gr),rts) = do notInrts f = notElem f $ map fst rts cfs <- mapM (canon2cf opts cgr) concrs --- would not need to update all... - let pinfos = Cnv.pInfo gr -- peb 8/6 + let pinfos = map (Cnv.pInfo cgr) concrs -- peb 18/6 let funs = funRulesOf cgr let cats = allCatsOf cgr @@ -148,7 +148,7 @@ updateShellState opts sh ((_,sgr,gr),rts) = do canModules = cgr, srcModules = src, cfs = zip concrs cfs, - pInfos = pinfos, -- peb 8/6 + pInfos = zip concrs pinfos, -- peb 8/6 morphos = zip concrs (map (mkMorpho cgr) concrs), gloptions = gloptions sh, --- opts, -- this would be command-line options readFiles = [ft | ft@(f,_) <- readFiles sh, notInrts f] ++ rts, @@ -250,7 +250,7 @@ stateGrammarOfLang st l = StGr { cncId = l, grammar = can, cf = maybe emptyCF id (lookup l (cfs st)), - pInfo = pInfos st, -- peb 8/6 + pInfo = maybe Cnv.emptyPInfo id (lookup l (pInfos st)), -- peb 18/6 morpho = maybe emptyMorpho id (lookup l (morphos st)), loptions = errVal noOptions $ lookupOptionsCan can } @@ -280,7 +280,7 @@ stateAbstractGrammar st = StGr { cncId = identC "#Cnc", --- grammar = canModules st, ---- only abstarct ones cf = emptyCF, - pInfo = Cnv.pInfo (canModules st), -- peb 8/6 + pInfo = Cnv.emptyPInfo, -- peb 18/6 morpho = emptyMorpho, loptions = gloptions st ---- } diff --git a/src/GF/Grammar/LookAbs.hs b/src/GF/Grammar/LookAbs.hs index 462a77ea8..cc414596f 100644 --- a/src/GF/Grammar/LookAbs.hs +++ b/src/GF/Grammar/LookAbs.hs @@ -25,7 +25,7 @@ lookupAbsDef gr m c = errIn ("looking up absdef of" +++ prt c) $ do _ -> Bad $ prt m +++ "is not an abstract module" lookupFunType :: GFCGrammar -> Ident -> Ident -> Err Type -lookupFunType gr m c = errIn ("looking up funtype of" +++ prt c) $ do +lookupFunType gr m c = errIn ("looking up funtype of" +++ prt c +++ "in module" +++ prt m) $ do mi <- lookupModule gr m case mi of ModMod mo -> do diff --git a/src/Makefile b/src/Makefile index 844e188b8..e44173676 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,8 +5,8 @@ GHCFLAGS=-package lang -package util -fglasgow-exts GHCOPTFLAGS=-O -package lang -package util -fglasgow-exts GHCFUDFLAG=-package Fudgets -HUGSINCLUDE =.:for-hugs:api:source:canonical:cf:grammar:infra:shell:useGrammar:compile:parsing:conversions:trace: -BASICINCLUDE =-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -iparsing -iparsers -iconversions -inotrace +HUGSINCLUDE =.:for-hugs:api:source:canonical:cf:grammar:infra:shell:useGrammar:compile:newparsing:trace: +BASICINCLUDE =-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -inewparsing -iparsers -inotrace GHCINCLUDE =-ifor-ghc $(BASICINCLUDE) GHCINCLUDENOFUD=-ifor-ghc-nofud $(BASICINCLUDE) GHCINCLUDEGFT =-ifor-gft $(BASICINCLUDE) @@ -60,8 +60,4 @@ help: # added by peb: tracing: $(GHMAKE) $(GHCFLAGS) -itrace $(GHCINCLUDENOFUD) --make GF.hs -o gf2 ; strip gf2 ; mv gf2 ../bin/ -newparser: - $(GHMAKE) $(GHCFLAGS) -itrace -ifor-ghc-nofud -iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -inewparsing -iparsers --make GF.hs -o gf2 ; strip gf2 ; mv gf2 ../bin/ -newhugs: - hugs -h10M -P.:for-hugs:api:source:canonical:cf:grammar:infra:shell:useGrammar:compile:newparsing:trace: |