Perlito5 - js3 - fix local(), more tests

Author: fglock

perlito5.pl

@@ -1355,7 +1355,7 @@ package Perlito5::AST::Apply;
         'prefix:<$>' => sub {
             my $self = $_[0];
             my $arg  = $self->{arguments}->[0];
-            Perlito5::Javascript3::emit_javascript3_autovivify( $arg, $level, 'scalar' ) . '.._scalar_';
+            Perlito5::Javascript3::emit_javascript3_autovivify( $arg, $level, 'scalar' ) . '.sderef()';
         },
         'prefix:<@>' => sub {
             my $self  = $_[0];

src5/lib/Perlito5/Javascript3/Emitter.pm

@@ -226,12 +226,22 @@ function p5set_glob(name, data) {
     return data;
 }
 
+var sigils = { '@' : 'List_', '%' : 'Hash_', '$' : 'v_' };
+
 function p5set_local(namespace, name, sigil) {
-    var v = name;
-    if (sigil == "$") {
-        v = "v_"+name;
+    var vname = sigils[sigil] + name;
+    p5LOCAL.push([namespace, vname, namespace[vname]]);
+
+    if (sigil == '$') {
+        namespace[vname] = new p5Scalar(null);
+    }
+    else if (sigil == '@') {
+        namespace[vname] = new p5Array([]);
+    }
+    else if (sigil == '%') {
+        namespace[vname] = new p5Hash({});
     }
-    p5LOCAL.push([namespace, v, namespace[v]]);
+    return namespace[vname];
 }
 
 function p5cleanup_local(idx, value) {
@@ -242,23 +252,23 @@ function p5cleanup_local(idx, value) {
     return value;
 }
 
-var sigils = { '@' : 'List_', '%' : 'Hash_', '$' : 'v_' };
 function p5global(sigil, namespace, name) {
     // TODO - autovivify namespace
-    v = p5pkg[namespace][sigils[sigil] + name ];
+    var vname = sigils[sigil] + name;
+    var v = p5pkg[namespace][vname];
     if (v != null) {
         return v;
     }
     if (sigil == '$') {
-        p5pkg[namespace][sigils[sigil] + name ] = new p5Scalar(null);
+        p5pkg[namespace][vname] = new p5Scalar(null);
     }
     else if (sigil == '@') {
-        p5pkg[namespace][sigils[sigil] + name ] = new p5Array([]);
+        p5pkg[namespace][vname] = new p5Array([]);
     }
     else if (sigil == '%') {
-        p5pkg[namespace][sigils[sigil] + name ] = new p5Hash({});
+        p5pkg[namespace][vname] = new p5Hash({});
     }
-    return p5pkg[namespace][sigils[sigil] + name ];
+    return p5pkg[namespace][vname];
 }
 
 function p5HashRef(o) {
@@ -306,7 +316,7 @@ function p5ScalarRef(o) {
     this.p5string = function() {
         return "SCALAR(0x0000)";  // TODO
     };
-    this.sderef = function(i) {
+    this.sderef = function() {
         return this._scalar_;
     };
 }
@@ -435,7 +445,8 @@ function p5Scalar(o) {
 
     // be a scalar ref
     this.sderef = function(i) {
-        return this._v_.sderef;
+        // TODO - autovivify scalar (with proxy object?)
+        return this._v_.sderef();
     };
 
     // be an array ref

src5/lib/Perlito5/Javascript3/Runtime.pm

@@ -6,10 +6,12 @@ package X; # XXX javascript bug - we don't autovivify packages yet
 
 package main;
 
-say '1..4';
+say '1..7';
 
 $X::v = 10;
 
+my $vv = \$X::v;
+
 if (1) {
     print "not " if $X::v != 10;
     say "ok 1";
@@ -18,11 +20,21 @@ if (1) {
     print "not " if defined $X::v;
     say "ok 2";
 
+    print "not " if $$vv != 10;
+    say "ok 3 # $$vv";
+
     $X::v = 15;
     print "not " if $X::v != 15;
-    say "ok 3";
+    say "ok 4";
+
+    print "not " if $$vv != 10;
+    say "ok 5 # $$vv";
+
 }
 
 print "not " if $X::v != 10;
-say "ok 4";
+say "ok 6";
+
+print "not " if $$vv != 10;
+say "ok 7";