GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-12 22:39:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

testing precompiled libraries

Browse Source
This commit is contained in:
aarne
2006-02-22 11:13:42 +00:00
parent 13672549f8
commit c2636ea968
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/tram/TramEng.gf
View File

@@ -1,4 +1,5 @@
--# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/english:prelude:resource-1.0/mathematical
--# -path=.:compiled
-- --# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/english:prelude:resource-1.0/mathematical
concrete TramEng of Tram = TramI with
(Multimodal = MultimodalEng),

4
examples/tram/TramI.gf
View File

@@ -31,8 +31,8 @@ lin
DestClick = here7to_MAdv ;
DepHere = DemAdv here7from_Adv ;
DestHere = DemAdv here7to_Adv ;
DepNamed s = MPrepNP from_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
DestNamed s = MPrepNP to_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
--- DepNamed s = MPrepNP from_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
--- DestNamed s = MPrepNP to_Prep (DemNP (UsePN (SymbPN (MkSymb s)))) ;
CCoord x y = {point = "(" ++ x.s ++ "," ++ y.s ++ ")" ; lock_Point = <>} ;

4
examples/tram/TramSwe.gf
View File

@@ -1,4 +1,6 @@
--# -path=.:resource-1.0/abstract:resource-1.0/swedish:resource-1.0/common:resource-1.0/multimodal:resource-1.0/scandinavian:prelude:resource-1.0/mathematical
--# -path=.:compiled
-- --# -path=.:resource-1.0/abstract:resource-1.0/swedish:resource-1.0/common:resource-1.0/multimodal:resource-1.0/scandinavian:prelude:resource-1.0/mathematical
concrete TramSwe of Tram = TramI with
(Multimodal = MultimodalSwe),

12
src/GF/Compile/CheckGrammar.hs
View File

@@ -758,16 +758,16 @@ checkEqLType :: LTEnv -> Type -> Type -> Term -> Check Type
checkEqLType env t u trm = do
t' <- comp t
u' <- comp u
case alpha [] t' u' of
case t' == u' || alpha [] t' u' of
True -> return t'
-- forgive missing lock fields by only generating a warning.
--- better: use a flag to forgive (AR 31/1/2006)
_ -> case missingLock [] t' u' of
Just lo -> do
Ok lo -> do
checkWarn $ "missing lock field" +++ unwords (map prt lo)
return t'
_ -> raise ("type of" +++ prt trm +++
": expected" +++ prt t' ++ ", inferred" +++ prt u')
Bad s -> raise (s ++ "type of" +++ prt trm +++
": expected" ++++ prt t' ++++ "inferred" ++++ prt u')
where
-- t is a subtype of u
@@ -818,9 +818,9 @@ checkEqLType env t u trm = do
not (any (\ (k,b) -> alpha g a b && l == k) ts)]
(locks,others) = partition isLockLabel ls
in case others of
_:_ -> Nothing
_:_ -> Bad $ "missing record fieds" +++ unwords (map prt others)
_ -> return locks
_ -> Nothing
_ -> Bad ""
sTypes = [typeStr, typeTok, typeString]
comp = computeLType env