msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

bug fix in Compute

Browse Source
This commit is contained in:
aarne
2007-06-09 14:08:23 +00:00
parent 31cbed2d60
commit 84aafe7914
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resource-1.0/Makefile
View File

@@ -73,8 +73,8 @@ present:
$(GFCP) common/ConstructX.gf $(GFCP) common/ConstructX.gf
mv */*.gfc */*.gfr ../present mv */*.gfc */*.gfr ../present
touch api/Constructors.gf touch api/Constructors.gf
$(GFCCP) api/Constructors???.gf $(GFCCP) -path=api:present:prelude api/Constructors???.gf
mv api/Constructors*.gfc api/Constructors*.gfr ../alltenses mv api/Constructors*.gfc api/Constructors*.gfr ../present
mathematical: mathematical:
$(GFCC) mathematical/MathematicalEng.gf $(GFCC) mathematical/MathematicalEng.gf

6
src/GF/Grammar/Compute.hs
View File

@@ -134,7 +134,7 @@ computeTermOpt rec gr = comp where
ts' <- mapM (comp g . S t) vs ts' <- mapM (comp g . S t) vs
return $ variants ts' return $ variants ts'
_ -> case ti of _ -> case ti of
{-
TComp _ -> do TComp _ -> do
case term2patt v' of case term2patt v' of
Ok p' -> case lookup p' cc of Ok p' -> case lookup p' cc of
@@ -145,7 +145,7 @@ computeTermOpt rec gr = comp where
_ -> do _ -> do
t' <- comp g t t' <- comp g t
return $ S t' v' return $ S t' v'
-}
_ -> case matchPattern cc v' of _ -> case matchPattern cc v' of
Ok (c,g') -> comp (g' ++ g) c Ok (c,g') -> comp (g' ++ g) c
_ | isCan v' -> prtBad ("missing case" +++ prt v' +++ "in") t _ | isCan v' -> prtBad ("missing case" +++ prt v' +++ "in") t
@@ -158,7 +158,7 @@ computeTermOpt rec gr = comp where
t' <- case t of t' <- case t of
-- T _ _ -> return t -- T _ _ -> return t
V _ _ -> return t -- V _ _ -> return t
_ -> comp g t _ -> comp g t
v' <- comp g v v' <- comp g v