msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Workaround for a problem with lock fields

Browse Source 
This problem showed up after delaing eta expansion until just before partial
evaluation
This commit is contained in:
hallgren
2013-09-10 13:43:59 +00:00
parent b93f817058
commit aa9280b287
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/GF/Compile/GeneratePMCFG.hs
View File

@@ -20,6 +20,7 @@ import GF.Infra.Option
import GF.Grammar hiding (Env, mkRecord, mkTable) import GF.Grammar hiding (Env, mkRecord, mkTable)
import GF.Grammar.Lookup import GF.Grammar.Lookup
import GF.Grammar.Predef import GF.Grammar.Predef
import GF.Grammar.Lockfield (isLockLabel)
import GF.Data.BacktrackM import GF.Data.BacktrackM
import GF.Data.Operations import GF.Data.Operations
import GF.Infra.UseIO (IOE) import GF.Infra.UseIO (IOE)
@@ -438,7 +439,8 @@ convertArg opts ty nr path = do
return (CPar value) return (CPar value)
convertRec opts CNil (RecType rs) record = convertRec opts CNil (RecType rs) record =
mkRecord (map (\(lbl,ctype) -> (lbl,convertTerm opts CNil ctype (projectRec lbl record))) rs) mkRecord [(lbl,convertTerm opts CNil ctype (proj lbl))|(lbl,ctype)<-rs]
where proj lbl = if isLockLabel lbl then R [] else projectRec lbl record
convertRec opts (CProj lbl path) ctype record = convertRec opts (CProj lbl path) ctype record =
convertTerm opts path ctype (projectRec lbl record) convertTerm opts path ctype (projectRec lbl record)
convertRec opts _ ctype _ = bug ("convertRec: "++show ctype) convertRec opts _ ctype _ = bug ("convertRec: "++show ctype)