GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-27 11:48:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

multimodal resource

Browse Source
This commit is contained in:
aarne
2005-11-06 21:00:36 +00:00
parent 9ee93b4dce
commit c113c20862
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/10/02 20:50:19 $ -- > CVS $Date: 2005/11/06 22:00:37 $
-- > CVS $Author: aarne $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.29 $ -- > CVS $Revision: 1.30 $
-- --
-- AR 4\/12\/1999 -- 1\/4\/2000 -- 8\/9\/2001 -- 15\/5\/2002 -- 27\/11\/2002 -- 18\/6\/2003 -- AR 4\/12\/1999 -- 1\/4\/2000 -- 8\/9\/2001 -- 15\/5\/2002 -- 27\/11\/2002 -- 18\/6\/2003
-- --
@@ -564,6 +564,7 @@ checkLType env trm typ0 = do
trm' <- comp trm trm' <- comp trm
case trm' of case trm' of
RecType _ -> termWith trm $ return typeType RecType _ -> termWith trm $ return typeType
ExtR (Vr _) (RecType _) -> termWith trm $ return typeType -- ext t = t ** ...
_ -> prtFail "invalid record type extension" trm _ -> prtFail "invalid record type extension" trm
RecType rr -> do RecType rr -> do
(r',ty,s') <- checks [ (r',ty,s') <- checks [

6
src/GF/Infra/Modules.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/05/30 21:08:14 $ -- > CVS $Date: 2005/11/06 22:00:37 $
-- > CVS $Author: aarne $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.24 $ -- > CVS $Revision: 1.25 $
-- --
-- Datastructures and functions for modules, common to GF and GFC. -- Datastructures and functions for modules, common to GF and GFC.
-- --
@@ -349,6 +349,8 @@ sameMType m n = case (m,n) of
(MTInstance _, MTInterface) -> True (MTInstance _, MTInterface) -> True
(MTResource, MTInstance _) -> True (MTResource, MTInstance _) -> True
(MTResource, MTInterface) -> True (MTResource, MTInterface) -> True
(MTAbstract, MTInterface) -> True -- for reuse
(MTConcrete _, MTResource) -> True -- for reuse
(MTInterface,MTResource) -> True (MTInterface,MTResource) -> True
_ -> m == n _ -> m == n