Changeset 3936 for src/perl5

Timestamp:

05/27/05 01:59:21 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* obj invocation now carries env around too

Location:

src/perl5

Files:

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

src/perl5/perl5.c

@@ -159 +159 @@
 perl5_SvTRUE ( SV * sv )
 {
-    bool *rv;
+    bool rv;
     rv = SvTRUE(sv);
     return rv;
@@ -183 +183 @@
 
 SV *
-perl5_call(char *subname, int argc, SV** args, int cxt)
+perl5_call(char *subname, int argc, SV** args, SV *env, int cxt)
 {
     int i;
-    SV *rv;
+    SV *rv, *sv;
 
     dSP;
@@ -192 +192 @@
     ENTER;
     SAVETMPS;
-
-    PUSHMARK(SP);
-    for (i = 0; i < argc; i++) {
-        XPUSHs(args[i]);
-    }
-    PUTBACK;
-
-    call_method(subname, cxt);
-
-    SPAGAIN;
-
-    rv = newSVsv(POPs);
-
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-
-    return rv;
-}
-
-SV *
-perl5_get_sv(const char *name)
-{
-    SV *sv = get_sv(name, 1);
-    /* sv_dump(sv); */
-    return sv;
-}
-
-void * perl5_set_svref (const char *name, void *val)
-{
-    /* fprintf(stderr, "setsvref: name: %s, mkvalref: %p\n", name, val); */
-
-    SV *container = get_sv("pugs::env", TRUE);
-
-    SV *sv = newSV(0);
-    sv_setref_pv(sv, "pugs", val);
-
-    sv_setsv(container, sv);
-}
-
-SV *
-perl5_eval(char *code, SV *env, int cxt)
-{
-    dSP;
-    SV* sv;
-
-    ENTER;
 
     if (env != NULL) {
@@ -246 +199 @@
     }
 
+    PUSHMARK(SP);
+    for (i = 0; i < argc; i++) {
+        XPUSHs(args[i]);
+    }
+    PUTBACK;
+
+    call_method(subname, cxt);
+
+    SPAGAIN;
+
+    rv = newSVsv(POPs);
+
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+
+    return rv;
+}
+
+SV *
+perl5_get_sv(const char *name)
+{
+    SV *sv = get_sv(name, 1);
+    /* sv_dump(sv); */
+    return sv;
+}
+
+void * perl5_set_svref (const char *name, void *val)
+{
+    /* fprintf(stderr, "setsvref: name: %s, mkvalref: %p\n", name, val); */
+
+    SV *container = get_sv("pugs::env", TRUE);
+
+    SV *sv = newSV(0);
+    sv_setref_pv(sv, "pugs", val);
+
+    sv_setsv(container, sv);
+}
+
+SV *
+perl5_eval(char *code, SV *env, int cxt)
+{
+    dSP;
+    SV* sv;
+
+    ENTER;
+    SAVETMPS;
+
+    if (env != NULL) {
+        sv = get_sv("pugs::env", 1);
+        save_item(sv);
+        sv_setsv(sv, env);
+    }
+
     sv = newSVpv(code, 0);
     eval_sv(sv, cxt);

src/perl5/perl5.h

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