Changeset 3944

Timestamp:

05/27/05 03:27:56 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* various callconv fix.

Location:

src

Files:

• Pugs/Run/Perl5.hs (modified) (1 diff)
• perl5/perl5.c (modified) (3 diffs)
• perl5/pugsembed.c (modified) (2 diffs)

src/Pugs/Run/Perl5.hs

@@ -62 +62 @@
 pugs_apply :: PugsVal -> PugsVal -> Ptr PugsVal -> IO PugsVal
 pugs_apply subPtr invPtr argsPtr = do
-    print "DEREF #0"
+    -- print "DEREF #0"
     env     <- askPerl5Env
-    print "DEREF #1"
+    -- print "DEREF #1"
     sub     <- deVal subPtr
-    print "DEREF #2"
+    -- print "DEREF #2"
     inv     <- deValMaybe invPtr
-    print "DEREF #3"
+    -- print ("DEREF #3", inv)
     args    <- mapM deVal =<< peekArray0 nullPtr argsPtr
+    -- print ("DEREF #4", args)
     let subExp = case sub of
             VStr name   -> Var name

src/perl5/perl5.c

@@ -41 +41 @@
         stack[i-2] = pugs_SvToVal(ST(i));
     }
-
-    fprintf(stderr, "back to pugs\n");
+    stack[i-2] = NULL;
+
+    /* fprintf(stderr, "back to pugs\n"); */
     ret = pugs_ValToSv(pugs_Apply (val, inv, stack));
 
@@ -210 +211 @@
     SAVETMPS;
 
-    pugs_setenv(env);
+    /* pugs_setenv(env); XXX*/
 
     PUSHMARK(SP);
@@ -268 +269 @@
     SAVETMPS;
 
-    pugs_setenv(env);
+    /* pugs_setenv(env); XXX */
 
     sv = newSVpv(code, 0);

src/perl5/pugsembed.c

@@ -6 +6 @@
 {
     if (!sv_isa(sv, "pugs")) {
-        fprintf(stderr, "bad cast\n");
-        sv_dump(sv);
         return (pugs_MkSvRef(sv));
     }
-    fprintf(stderr, "good cast\n");
     IV tmp = SvIV((SV*)SvRV(sv));
     return ((Val *)tmp);
@@ -37 +34 @@
 {
     SV** rv = hv_fetch(PL_modglobal, "PugsEnv", 7, 0);
-    if (*rv == NULL)
+    if (rv == NULL)
         Perl_croak(aTHX_ "hate software so much");
     IV tmp = SvIV((SV*)SvRV(*rv));