Changeset 3945

Timestamp:

05/27/05 03:36:00 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* env is nor marshalled.

Location:

src

Files:

• Pugs/AST/Internals.hs (modified) (1 diff)
• Pugs/Embed/Perl5.hs (modified) (1 diff)
• Pugs/Eval.hs (modified) (1 diff)
• Pugs/Prim.hs (modified) (1 diff)
• Pugs/Run/Perl5.hs (modified) (1 diff)
• perl5/perl5.c (modified) (2 diffs)

src/Pugs/AST/Internals.hs

@@ -315 +315 @@
             env     <- ask
             rv      <- liftIO $ do
-                envSV   <- mkValRef (VControl $ ControlEnv env)
+                envSV   <- mkVal (VControl $ ControlEnv env)
                 callPerl5 sv nullSV svs envSV (enumCxt $ envContext env)
             return $ PerlSV rv

src/Pugs/Embed/Perl5.hs

@@ -125 +125 @@
             interp <- perl5_init 3 argv
             case env of
-                Just val -> do
-                    ptr <- fmap castStablePtrToPtr $ newStablePtr val
-                    pugs_setenv ptr
+                Just val -> pugs_setenv =<< mkVal val
                 Nothing -> return ()
             return interp
+
+mkVal :: (Show a) => a -> IO PugsVal
+mkVal val = fmap castStablePtrToPtr $ newStablePtr val
 
 svToVStr :: PerlSV -> IO String

src/Pugs/Eval.hs

@@ -867 +867 @@
                 env     <- ask
                 rv      <- liftIO $ do
-                    envSV   <- mkValRef (VControl $ ControlEnv env)
+                    envSV   <- mkVal (VControl $ ControlEnv env)
                     subSV   <- vstrToSV $ tail name
                     callPerl5 subSV sv svs envSV (enumCxt $ envContext env)

src/Pugs/Prim.hs

@@ -245 +245 @@
     env <- ask
     tryIO undef $ do
-        envSV <- mkValRef (VControl $ ControlEnv env)
+        envSV <- mkVal (VControl $ ControlEnv env)
         sv <- evalPerl5 str envSV $ enumCxt (envContext env)
         return $ PerlSV sv

src/Pugs/Run/Perl5.hs

@@ -77 +77 @@
     mkVal val
 
-mkVal :: Val -> IO PugsVal
-mkVal val = fmap castStablePtrToPtr $ newStablePtr val
-
 deVal :: PugsVal -> IO Val
 deVal ptr = do

src/perl5/perl5.c

@@ -211 +211 @@
     SAVETMPS;
 
-    /* pugs_setenv(env); XXX*/
+    pugs_setenv(env);
 
     PUSHMARK(SP);
@@ -269 +269 @@
     SAVETMPS;
 
-    /* pugs_setenv(env); XXX */
+    pugs_setenv(env);
 
     sv = newSVpv(code, 0);