diff options
| author | kr.angelov <kr.angelov@chalmers.se> | 2008-05-21 13:10:54 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@chalmers.se> | 2008-05-21 13:10:54 +0000 |
| commit | c544ef31823c7d2c28c28cae408cca5d71e6978d (patch) | |
| tree | b9693bc684d1737062e45438cedf7536cf5513d5 /src-3.0/GF/Compile/Optimize.hs | |
| parent | 529374caaa6d451400f57f1ff82106d89d603944 (diff) | |
use ByteString internally in Ident, CId and Label
Diffstat (limited to 'src-3.0/GF/Compile/Optimize.hs')
| -rw-r--r-- | src-3.0/GF/Compile/Optimize.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src-3.0/GF/Compile/Optimize.hs b/src-3.0/GF/Compile/Optimize.hs index a540ee715..8931cb6a2 100644 --- a/src-3.0/GF/Compile/Optimize.hs +++ b/src-3.0/GF/Compile/Optimize.hs @@ -130,9 +130,9 @@ evalCncInfo opts gr cnc abs (c,info) = do CncCat ptyp pde ppr -> do pde' <- case (ptyp,pde) of (Yes typ, Yes de) -> - liftM yes $ pEval ([(strVar, typeStr)], typ) de + liftM yes $ pEval ([(varStr, typeStr)], typ) de (Yes typ, Nope) -> - liftM yes $ mkLinDefault gr typ >>= partEval noOptions gr ([(strVar, typeStr)],typ) + liftM yes $ mkLinDefault gr typ >>= partEval noOptions gr ([(varStr, typeStr)],typ) (May b, Nope) -> return $ May b _ -> return pde -- indirection @@ -248,7 +248,7 @@ recordExpand typ trm = case unComputed typ of mkLinDefault :: SourceGrammar -> Type -> Err Term mkLinDefault gr typ = do case unComputed typ of - RecType lts -> mapPairsM mkDefField lts >>= (return . Abs strVar . R . mkAssign) + RecType lts -> mapPairsM mkDefField lts >>= (return . Abs varStr . R . mkAssign) _ -> prtBad "linearization type must be a record type, not" typ where mkDefField typ = case unComputed typ of @@ -256,7 +256,7 @@ mkLinDefault gr typ = do t' <- mkDefField t let T _ cs = mkWildCases t' return $ T (TWild p) cs - Sort "Str" -> return $ Vr strVar + Sort "Str" -> return $ Vr varStr QC q p -> lookupFirstTag gr q p RecType r -> do let (ls,ts) = unzip r |