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

checked that course of value tables (table P [...]) have the correct number of values w.r.t the type P. This was previously not checked, and caused hard-to-find run-time errors.

Browse Source
This commit is contained in:
aarne
2014-09-27 17:14:35 +00:00
parent ca1cad68d0
commit aef787aeb1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/GF/Compile/TypeCheck/Concrete.hs
View File

@@ -436,6 +436,10 @@ checkLType gr g trm typ0 = do
case typ of case typ of
Table arg1 val -> Table arg1 val ->
do arg' <- checkEqLType gr g arg0 arg1 trm do arg' <- checkEqLType gr g arg0 arg1 trm
vs1 <- allParamValues gr arg1
if length vs1 == length vs
then return ()
else checkError $ text "wrong number of values in table" <+> ppTerm Unqualified 0 trm
vs' <- map fst `fmap` sequence [checkLType gr g v val|v<-vs] vs' <- map fst `fmap` sequence [checkLType gr g v val|v<-vs]
return (V arg' vs',typ) return (V arg' vs',typ)

4
src/compiler/GF/Compile/TypeCheck/RConcrete.hs
View File

@@ -468,6 +468,10 @@ checkLType gr g trm typ0 = do
case typ of case typ of
Table arg1 val -> Table arg1 val ->
do arg' <- checkEqLType gr g arg0 arg1 trm do arg' <- checkEqLType gr g arg0 arg1 trm
vs1 <- allParamValues gr arg1
if length vs1 == length vs
then return ()
else checkError $ "wrong number of values in table" <+> ppTerm Unqualified 0 trm
vs' <- map fst `fmap` sequence [checkLType gr g v val|v<-vs] vs' <- map fst `fmap` sequence [checkLType gr g v val|v<-vs]
return (V arg' vs',typ) return (V arg' vs',typ)