Changeset 32 for src/Eval.hs

Timestamp:

02/16/05 18:48:28 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

1041

Message:

* Code literals -- "sub", "pointy" and "bare" variants all works
* Lexical subroutine declarations via "my sub"
* Global subroutine and variables work again, via the envGlobal pad
* The "say", "exit", "die" primitives
* Bool.perl now prints correct literals (lwall)
* Blocks under void contexts now evaluates automatically
* The "..." (dotdotdot) literal

Files:

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

src/Eval.hs

@@ -29 +29 @@
     uniq <- liftIO $ newUnique
     return $ Env
-        { envContext = "List"
+        { envContext = "Void"
         , envLexical = []
         , envGlobal  = initSyms
@@ -57 +57 @@
 evaluate :: Exp -> Eval Val
 evaluate (Val (VSub sub)) = do
-    pad <- asks envLexical
-    return $ VSub sub{ subPad = pad } -- closure!
+    cxt <- asks envContext
+    if cxt == "Void" && subType sub == SubBlock
+        then do
+            exp <- apply sub [] []
+            evalExp exp
+        else do
+            pad <- asks envLexical
+            return $ VSub sub{ subPad = pad } -- closure!
 evaluate (Val val) = return val
 evaluate exp = do
@@ -149 +155 @@
         let [Sym (Symbol _ _ exp)] = exps
         val     <- evalExp exp
-        retVal val
+        retVal VUndef
     ":=" -> do
         let [Var var, exp] = exps
-        val     <- evalExp exp
+        val     <- enterEvalContext (cxtOfSigil $ head var) exp
         retVal val
     "::=" -> do -- XXX wrong