diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-12-08 12:49:03 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-12-08 12:49:03 +0000 |
| commit | 75ecc5f97b132ac9df06e898591803511e6c98bf (patch) | |
| tree | db2963f788a52113d5e7a8a8bd4807c324ab4de5 /src | |
| parent | de8bea8d692617d0028f9c2f5716f1e303490ff2 (diff) | |
preperations for Val of params
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Compile/Compute.hs | 2 | ||||
| -rw-r--r-- | src/GF/Compile/GrammarToGFCC.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/GF/Compile/Compute.hs b/src/GF/Compile/Compute.hs index a33522829..90295b697 100644 --- a/src/GF/Compile/Compute.hs +++ b/src/GF/Compile/Compute.hs @@ -356,7 +356,7 @@ computeTermOpt rec gr = comput True where ptyp <- comp g pty0 case allParamValues gr ptyp of 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 cs' <- mapM (compBranchOpt g) (zip ps0 (map snd cs)) sts <- mapM (matchPattern cs') vs diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index 27081ec94..27c732573 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -492,7 +492,7 @@ term2term fun cgr env@(labels,untyps,typs) tr = case tr of _ | tr == x -> t _ -> 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 where tryFV tr = case GM.appForm tr of |