Perlito5 - js - save more compile-time information

fglock · Oct 1, 2013 · 9fca914 · 9fca914
1 parent b95d306
commit 9fca914
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 29 deletions.
diff --git a/html/perlito5.js b/html/perlito5.js
diff --git a/perlito5.pl b/perlito5.pl
diff --git a/src5/lib/Perlito5/Javascript2/Emitter.pm b/src5/lib/Perlito5/Javascript2/Emitter.pm
@@ -1558,13 +1558,15 @@ package Perlito5::AST::Apply;
         if ($code eq 'prefix:<$>') {
             return 'p5scalar_deref_set(' 
                 . Perlito5::Javascript2::emit_javascript2_autovivify( $self->{arguments}->[0], $level+1, 'scalar' ) . ', '
-                . Perlito5::Javascript2::to_scalar([$arguments], $level+1)
+                . Perlito5::Javascript2::to_scalar([$arguments], $level+1)  . ', '
+                . Perlito5::Javascript2::escape_string($Perlito5::PKG_NAME)
                 . ')';
         }
         if ($code eq 'prefix:<*>') {
             return 'p5typeglob_deref_set(' 
                 . Perlito5::Javascript2::to_scalar($self->{arguments}, $level+1) . ', '
-                . Perlito5::Javascript2::to_scalar([$arguments], $level+1)
+                . Perlito5::Javascript2::to_scalar([$arguments], $level+1)       . ', '
+                . Perlito5::Javascript2::escape_string($Perlito5::PKG_NAME)
                 . ')';
         }
 
@@ -1673,7 +1675,10 @@ package Perlito5::AST::Apply;
             my $self = $_[0];
             my $level = $_[1];
             my $arg  = $self->{arguments}->[0];
-            return 'p5scalar_deref(' . Perlito5::Javascript2::emit_javascript2_autovivify( $arg, $level, 'scalar' ) . ')';
+            return 'p5scalar_deref(' 
+                    . Perlito5::Javascript2::emit_javascript2_autovivify( $arg, $level, 'scalar' ) . ', '
+                    . Perlito5::Javascript2::escape_string($Perlito5::PKG_NAME)
+                    . ')';
         },
         'prefix:<@>' => sub {
             my $self  = $_[0];

diff --git a/src5/lib/Perlito5/Javascript2/Runtime.pm b/src5/lib/Perlito5/Javascript2/Runtime.pm
@@ -279,15 +279,15 @@ function p5sub_prototype(name, current_pkg_name) {
     return p5pkg["Perlito5"].v_PROTO._hash_[name] || p5pkg["Perlito5"].v_CORE_PROTO._hash_[name]
 }
 
-function p5scalar_deref(v) {
+function p5scalar_deref(v, current_pkg_name) {
     if (typeof v === "string") {
         var pkg_name = v.split(/::/);
         if (pkg_name.length > 1) {
             v = pkg_name.pop();
             pkg_name = pkg_name.join("::");
         }
         else {
-            pkg_name = p5pkg["Perlito5"].v_PKG_NAME;
+            pkg_name = current_pkg_name;
         }
         var c = v.charCodeAt(0);
         if (c < 27) {
@@ -299,15 +299,15 @@ function p5scalar_deref(v) {
     return v._scalar_;
 }
 
-function p5scalar_deref_set(v, n) {
+function p5scalar_deref_set(v, n, current_pkg_name) {
     if (typeof v === "string") {
         var pkg_name = v.split(/::/);
         if (pkg_name.length > 1) {
             v = pkg_name.pop();
             pkg_name = pkg_name.join("::");
         }
         else {
-            pkg_name = p5pkg["Perlito5"].v_PKG_NAME;
+            pkg_name = current_pkg_name;
         }
         var c = v.charCodeAt(0);
         if (c < 27) {
@@ -394,15 +394,15 @@ function p5typeglob_set(namespace, name, obj) {
     return p5pkg[namespace][name];  // TODO - return GLOB
 }
 
-function p5typeglob_deref_set(v, obj) {
+function p5typeglob_deref_set(v, obj, current_pkg_name) {
     if (typeof v === "string") {
         var pkg_name = v.split(/::/);
         if (pkg_name.length > 1) {
             v = pkg_name.pop();
             pkg_name = pkg_name.join("::");
         }
         else {
-            pkg_name = p5pkg["Perlito5"].v_PKG_NAME;
+            pkg_name = current_pkg_name;
         }
         return p5typeglob_set(pkg_name, v, obj);
     }