diff options
Diffstat (limited to 'src/GF/Compile')
| -rw-r--r-- | src/GF/Compile/CheckGrammar.hs | 24 | ||||
| -rw-r--r-- | src/GF/Compile/Compute.hs | 6 |
2 files changed, 27 insertions, 3 deletions
diff --git a/src/GF/Compile/CheckGrammar.hs b/src/GF/Compile/CheckGrammar.hs index 8fa5d25b6..43abffa02 100644 --- a/src/GF/Compile/CheckGrammar.hs +++ b/src/GF/Compile/CheckGrammar.hs @@ -38,7 +38,7 @@ import GF.Grammar.Predef import GF.Grammar.Macros import GF.Grammar.PatternMatch import GF.Grammar.AppPredefined -import GF.Grammar.Lockfield (isLockLabel) +import GF.Grammar.Lockfield (isLockLabel, lockRecType, unlockRecord) import GF.Data.Operations import GF.Infra.CheckM @@ -396,6 +396,10 @@ computeLType gr t = do let fs' = sortRec fs liftM RecType $ mapPairsM comp fs' + ELincat c t -> do + t' <- comp t + checkErr $ lockRecType c t' ---- locking to be removed AR 20/6/2009 + _ | ty == typeTok -> return typeStr _ | isPredefConstant ty -> return ty @@ -599,6 +603,11 @@ inferLType gr trm = case trm of ty <- inferPatt p return (trm, EPattType ty) + ELin c trm -> do + (trm',ty) <- infer trm + ty' <- checkErr $ lockRecType c ty ---- lookup c; remove lock AR 20/6/2009 + return $ (ELin c trm', ty') + _ -> prtFail "cannot infer lintype of" trm where @@ -861,6 +870,10 @@ checkLType env trm typ0 = do (def',ty) <- infer def -- tries to infer type of local constant check (Let (x,(Just ty,def')) body) typ + ELin c tr -> do + tr1 <- checkErr $ unlockRecord c tr + check tr1 typ + _ -> do (trm',ty') <- infer trm termWith trm' $ checkEq typ ty' trm' @@ -886,7 +899,14 @@ checkLType env trm typ0 = do Just (_,t) -> do (t',ty') <- check t ty return (l,(Just ty',t')) - _ -> raise $ "cannot find value for label" +++ prt l +++ "in" +++ prt_ (R rms) + _ -> raise $ + if isLockLabel l + then + let cat = drop 5 (prt l) in + prt_ (R rms) +++ "is not in the lincat of" +++ cat ++ + "; try wrapping it with lin " ++ cat + else + "cannot find value for label" +++ prt l +++ "in" +++ prt_ (R rms) checkCase arg val (p,t) = do cont <- pattContext env arg p diff --git a/src/GF/Compile/Compute.hs b/src/GF/Compile/Compute.hs index cf0803d98..062b6251c 100644 --- a/src/GF/Compile/Compute.hs +++ b/src/GF/Compile/Compute.hs @@ -26,7 +26,7 @@ import GF.Grammar.Macros import GF.Grammar.Lookup import GF.Compile.Refresh import GF.Grammar.PatternMatch -import GF.Grammar.Lockfield (isLockLabel) ---- +import GF.Grammar.Lockfield (isLockLabel,unlockRecord) ---- import GF.Grammar.AppPredefined @@ -219,6 +219,10 @@ computeTermOpt rec gr = comput True where (RecType rs, RecType ss) -> plusRecType r' s' _ -> return $ ExtR r' s' + ELin c r -> do + r' <- comp g r + unlockRecord c r' + T _ _ -> compTable g t V _ _ -> compTable g t |