Changeset 4184 for src/perl5

Timestamp:

05/31/05 03:47:07 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5706

Message:

* handle multiple return values. It segfaults still --

clkao, please take a look.

Location:

src/perl5

Files:

• perl5.c (modified) (3 diffs)
• perl5.h (modified) (1 diff)

src/perl5/perl5.c

@@ -209 +209 @@
 }
 
-SV *
+SV **
 perl5_apply(SV *sub, SV *inv, SV** args, void *env, int cxt)
 {
     SV **arg;
+    SV **out;
     SV *rv;
     SV *sv;
@@ -243 +244 @@
     SPAGAIN;
 
-    if (count == 1) {
-        rv = newSVsv(POPs);
-    }
-    else {
-        rv = (SV *)newAV();
-        for (i=0; i<count; ++i) {
-            av_push ((AV *)rv, POPs);
-        }
+    /* fprintf(stderr, "%d is count\n", count); */
+    Newz(42, out, count+1, SV*);
+
+    for (i=0; i<count; ++i) {
+        out[i] = newSVsv(POPs);
     }
 
@@ -258 +256 @@
 
     pugs_setenv(old_env);
-    return rv;
+    return out;
 }
 

src/perl5/perl5.h

@@ -11 +11 @@
 SV * perl5_newSViv ( int iv );
 SV * perl5_newSVnv ( double iv );
-SV * perl5_apply(SV *sub, SV *inv, SV** args, void *env, int cxt);
+SV ** perl5_apply(SV *sub, SV *inv, SV** args, void *env, int cxt);
 bool perl5_can(SV *inv, char *subname);
 SV * perl5_eval(char *code, void *env, int cxt);