Changeset 3946 for src/perl5

Timestamp:

05/27/05 03:38:40 (4 years ago)

Author:

clkao

svk:copy_cache_prev:

5515

Message:

propogate return value from pugs

Location:

src/perl5

Files:

• perl5.c (modified) (2 diffs)
• pugsembed.c (modified) (1 diff)

src/perl5/perl5.c

@@ -37 +37 @@
     inv = pugs_SvToVal(ST(1));
 
-    stack = (Val **)malloc(sizeof(Val*)*items-2);
+    stack = (Val **)malloc(sizeof(Val*)*items-1);
     for (i = 2; i < items; ++i) {
         stack[i-2] = pugs_SvToVal(ST(i));
@@ -45 +45 @@
     /* fprintf(stderr, "back to pugs\n"); */
     ret = pugs_ValToSv(pugs_Apply (val, inv, stack));
-
     free (stack);
+
+    ST(0) = ret;
     
     XSRETURN(1);

src/perl5/pugsembed.c

@@ -23 +23 @@
     isa[0] = pugs_PvToVal("Code");
     isa[1] = NULL;
-    if (__init && pugs_ValToIv(pugs_Apply(pugs_PvToVal("&isa"), val, isa))) {
-        stack[0] = sv;
-        stack[1] = NULL;
-        sv = perl5_apply(newSVpv("code", 0), newSVpv("pugs::guts", 0), stack, NULL, G_SCALAR);
+    if (pugs_ValToIv(pugs_Apply(pugs_PvToVal("&isa"), val, isa))) {
+        if (__init) {
+            stack[0] = sv;
+            stack[1] = NULL;
+            fprintf (stderr, "isa code\n");
+            sv = perl5_apply(newSVpv("code", 0), newSVpv("pugs::guts", 0), stack, NULL, G_SCALAR);
+        }
+        else {
+            fprintf(stderr, "MkValRef called before perl_init.\n");
+        }
     }
     return (sv);