Changeset 11289 for src/Pugs/Eval

Timestamp:

07/08/06 07:02:06 (2 years ago)

Author:

audreyt

Message:

* Massive overhaul of Perl 5 embed system on invokePerl5.

• non-reference errors from perl5 land like "die 'foo'" becomes Str error objects in perl6 land.
• reference-type errors from perl5 land like "die foo?" becomes PerlSV error objects in perl6 land.
• newSVsv(ERRSV) now protects the ERRSV from being GC'ed away. this makes szbalint's desired behaviour work.

Files:

• src/Pugs/Eval/Var.hs (modified) (1 diff)

src/Pugs/Eval/Var.hs

@@ -209 +209 @@
                     then return found
                     else canPerl5 sv "AUTOLOAD"
-                if not found' then evalExp (App (Var name) Nothing (map (Val . PerlSV) (sv:svs))) else do
-                env     <- ask
-                rv      <- guardIO $ do
-                    envSV   <- mkVal (VControl $ ControlEnv env)
-                    subSV   <- vstrToSV $ tail name
-                    invokePerl5 subSV sv svs envSV (enumCxt $ envContext env)
-                case rv of
-                    Right [x]   -> return $ PerlSV x
-                    Right xs    -> return $ VList (map PerlSV xs)
-                    Left err    -> throwError $ PerlSV err
+                if not found'
+                    then evalExp (App (Var name) Nothing (map (Val . PerlSV) (sv:svs)))
+                    else do
+                        subSV   <- liftIO . vstrToSV $ tail name
+                        runInvokePerl5 subSV sv svs
             }
     possiblyBuildMetaopVCode :: String -> Eval (Maybe VCode)