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

preperations for Val of params

Browse Source
This commit is contained in:
aarne
2008-12-08 12:49:03 +00:00
parent ca4c63c58f
commit 72346d6aca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,7 +356,7 @@ computeTermOpt rec gr = comput True where
ptyp <- comp g pty0 ptyp <- comp g pty0
case allParamValues gr ptyp of case allParamValues gr ptyp of
Ok vs0 -> do Ok vs0 -> do
let vs = [Val v ptyp i | (v,i) <- zip vs0 [0..]] let vs = vs0 ---- [Val v ptyp i | (v,i) <- zip vs0 [0..]]
ps0 <- mapM (compPatternMacro . fst) cs ps0 <- mapM (compPatternMacro . fst) cs
cs' <- mapM (compBranchOpt g) (zip ps0 (map snd cs)) cs' <- mapM (compBranchOpt g) (zip ps0 (map snd cs))
sts <- mapM (matchPattern cs') vs sts <- mapM (matchPattern cs') vs

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

@@ -492,7 +492,7 @@ term2term fun cgr env@(labels,untyps,typs) tr = case tr of
_ | tr == x -> t _ | tr == x -> t
_ -> GM.composSafeOp (mkBranch x t) tr _ -> GM.composSafeOp (mkBranch x t) tr
valNum (Val _ _ i) = EInt $ toInteger i valNum (Val _ _ i) = traceD (show i) $ EInt $ toInteger i ----Val
valNum tr = maybe (valNumFV $ tryFV tr) EInt $ Map.lookup tr untyps valNum tr = maybe (valNumFV $ tryFV tr) EInt $ Map.lookup tr untyps
where where
tryFV tr = case GM.appForm tr of tryFV tr = case GM.appForm tr of