Changeset 11862 for src/Pugs/Eval

Timestamp:

08/02/06 02:33:36 (2 years ago)

Author:

audreyt

Message:

* Perl 5 SVs used to infinitely regress with "$sv.meth" calls

when .meth was not defined in Perl5 land.
Reported by TimToady?++.

Files:

• src/Pugs/Eval/Var.hs (modified) (2 diffs)

src/Pugs/Eval/Var.hs

@@ -154 +154 @@
         Just exp | not (':' `elem` drop 2 name) -> do
             typ     <- evalInvType $ unwrap exp
-            if typ == mkType "Scalar::Perl5" then fmap (err $ NoSuchMethod $ show typ) (runPerl5Sub name) else do
-            findTypedSub typ name
+            if typ == mkType "Scalar::Perl5"
+                then do
+                    fmap (err $ NoSuchMethod $ show typ) (runPerl5Sub name)
+                else do
+                    findTypedSub typ name
         _ -> findBuiltinSub NoSuchSub name
     where
@@ -207 +210 @@
                     else canPerl5 sv "AUTOLOAD"
                 if not found'
-                    then evalExp (App (Var name) Nothing (map (Val . PerlSV) (sv:svs)))
+                    then do
+                        -- XXX - when svs is empty, this could call back here infinitely
+                        --       add an extra '&' to force no-reinterpretation.
+                        evalExp (App (Var ('&':name)) Nothing (map (Val . PerlSV) (sv:svs)))
                     else do
                         subSV   <- liftIO . vstrToSV $ tail name