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

forced checking def definitions; accept pgf with no concretes

Browse Source
This commit is contained in:
aarne
2008-10-05 15:21:08 +00:00
parent 24207d40e9
commit 21aa3cfa17
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,8 @@ checkAbsInfo st m mo (c,info) = do
md' <- case md of md' <- case md of
Yes d -> do Yes d -> do
let d' = elimTables d let d' = elimTables d
mkCheckWarn "definition of function" $ checkEquation st (m,c) d' ---- mkCheckWarn "definition of function" $ checkEquation st (m,c) d'
mkCheck "definition of function" $ checkEquation st (m,c) d'
return $ Yes d' return $ Yes d'
_ -> return md _ -> return md
return $ (c,AbsFun (Yes typ) md') return $ (c,AbsFun (Yes typ) md')

2
src/GF/Compile/GrammarToGFCC.hs
View File

@@ -47,7 +47,7 @@ mkCanon2gfcc :: Options -> String -> SourceGrammar -> (String,D.PGF)
mkCanon2gfcc opts cnc gr = mkCanon2gfcc opts cnc gr =
(prIdent abs, (canon2gfcc opts pars . reorder abs . canon2canon abs) gr) (prIdent abs, (canon2gfcc opts pars . reorder abs . canon2canon abs) gr)
where where
abs = err error id $ M.abstractOfConcrete gr (identC (BS.pack cnc)) abs = err (const c) id $ M.abstractOfConcrete gr c where c = identC (BS.pack cnc)
pars = mkParamLincat gr pars = mkParamLincat gr
-- Adds parsers for all concretes -- Adds parsers for all concretes

10
src/GF/Compile/TypeCheck.hs
View File

@@ -85,14 +85,12 @@ cont2val = type2val . cont2exp
justTypeCheck :: Grammar -> Exp -> Val -> Err Constraints justTypeCheck :: Grammar -> Exp -> Val -> Err Constraints
justTypeCheck gr e v = do justTypeCheck gr e v = do
(_,constrs0) <- checkExp (grammar2theory gr) (initTCEnv []) e v (_,constrs0) <- checkExp (grammar2theory gr) (initTCEnv []) e v
return $ filter notJustMeta constrs0 (constrs1,_) <- unifyVal constrs0
---- return $ fst $ splitConstraintsSrc gr constrs0 return $ filter notJustMeta constrs1
---- this change was to force proper tc of abstract modules.
---- May not be quite right. AR 13/9/2005
notJustMeta (c,k) = case (c,k) of notJustMeta (c,k) = case (c,k) of
(VClos g1 (Meta m1), VClos g2 (Meta m2)) -> False (VClos g1 (Meta m1), VClos g2 (Meta m2)) -> False
_ -> True _ -> True
grammar2theory :: Grammar -> Theory grammar2theory :: Grammar -> Theory
grammar2theory gr (m,f) = case lookupFunType gr m f of grammar2theory gr (m,f) = case lookupFunType gr m f of