Changeset 26 for src/Prim.hs

Timestamp:

02/14/05 06:02:18 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

1041

Message:

* snapshot during monadic refactoring

Files:

• src/Prim.hs (modified) (3 diffs)

src/Prim.hs

@@ -27 +27 @@
 op0 s    = \x -> VError ("unimplemented listOp: " ++ s) (Val $ VList x)
 
-op1 :: Ident -> (forall a. Context a => a) -> StateEnv Val
+op1 :: Ident -> (forall a. Value a => a) -> Eval Val
 op1 "!"    = return . fmapVal not
 op1 "+"    = return . op1Numeric id
@@ -50 +50 @@
 op1 s      = return . (\x -> VError ("unimplemented unaryOp: " ++ s) (Val x))
 
-opEval :: String -> StateEnv Val
+opEval :: String -> Eval Val
 opEval str = do
-    pad <- gets envPad
-    let rv = ( runParser ruleProgram pad "" str )
+    env <- ask
+    let rv = ( runParser ruleProgram env "" str )
     return $ VUndef
     {-
     case rv of
         Left err    -> return $ VError (showErr err) (NonTerm $ errorPos err)
-        Right exp   -> gets evl >>= (($) exp)
+        Right exp   -> asks evl >>= (($) exp)
 -}
 
@@ -200 +200 @@
                       , subFun      = (Prim f)
                       }
-    f :: [Val] -> StateEnv Val
+    f :: [Val] -> Eval Val
     f    = case arity of
         0 -> \(x:_) -> return $ op0 sym (vCast x)