Perlito5 - js - more support for typeglob assignment

fglock · Sep 4, 2013 · a8106a1 · a8106a1
1 parent 21af3dc
commit a8106a1
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 306 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
@@ -1187,7 +1187,11 @@ package Perlito5::AST::Var;
             return '(' . $self->emit_javascript2() . ' = ' . Perlito5::Javascript2::to_list([$arguments], $level+1, 'hash') . ')' 
         }
         if ( $self->sigil eq '*' ) {
-            return '(' . $self->emit_javascript2() . ' = ' . Perlito5::Javascript2::to_scalar([$arguments], $level+1) . ')'
+            return 'p5typeglob_set(' 
+            .   '"' . ($self->{namespace} || $Perlito5::PKG_NAME) . '", ' 
+            .   '"' . $self->{name} . '", ' 
+            .   Perlito5::Javascript2::to_scalar([$arguments], $level+1)
+            . ')'
         }
 
         die "don't know how to assign to variable ", $self->sigil, $self->name;
@@ -2725,7 +2729,7 @@ package Perlito5::AST::Sub;
         . Perlito5::Javascript2::tab($level) . '}';
 
         if ( $self->{name} ) {
-            return 'p5make_sub("' . $self->{namespace} . '", "' . $self->{name} . '", ' . $s . ')'
+            return 'p5typeglob_set("' . $self->{namespace} . '", "' . $self->{name} . '", ' . $s . ')'
         }
         else {
             return $s;

diff --git a/src5/lib/Perlito5/Javascript2/IO.pm b/src5/lib/Perlito5/Javascript2/IO.pm
@@ -29,7 +29,7 @@ if (isNode) {
 
     var fs = require("fs");
 
-    p5make_sub("Perlito5::IO", "print", function (List__, p5want) {
+    p5typeglob_set("Perlito5::IO", "print", function (List__, p5want) {
         var i;
         List__.shift(); // TODO - use IO::FILE
         for (i = 0; i < List__.length; i++) {
@@ -141,21 +141,21 @@ if (isNode) {
         }
     };
 
-    p5make_sub("Perlito5::IO", "slurp", function(List__) {
+    p5typeglob_set("Perlito5::IO", "slurp", function(List__) {
         return fs.readFileSync(List__[0],"utf8");
     });
 
 } else {
     // not running in node.js
-    p5make_sub("Perlito5::IO", "print", function (List__, p5want) {
+    p5typeglob_set("Perlito5::IO", "print", function (List__, p5want) {
         var i;
         List__.shift(); // TODO - use IO::FILE
         for (i = 0; i < List__.length; i++) {
             write(p5str(List__[i]));
         }
         return 1;
     });
-    p5make_sub("Perlito5::IO", "slurp", function(List__) {
+    p5typeglob_set("Perlito5::IO", "slurp", function(List__) {
         var filename = List__[0];
         if (typeof readFile == "function") {
             return readFile(filename);

diff --git a/src5/lib/Perlito5/Javascript2/Runtime.pm b/src5/lib/Perlito5/Javascript2/Runtime.pm
@@ -313,13 +313,32 @@ p5make_package("Perlito5::IO");
 p5make_package("Perlito5::Runtime");
 p5make_package("Perlito5::Grammar");
 
-function p5make_sub(pkg_name, sub_name, func) {
-    p5make_package(pkg_name);
-    p5pkg[pkg_name][sub_name] = func;
-}
-
 var sigils = { '@' : 'List_', '%' : 'Hash_', '$' : 'v_' };
 
+function p5typeglob_set(namespace, name, obj) {
+    p5make_package(namespace);
+    if ( obj.hasOwnProperty("_ref_") ) {
+        if ( obj._ref_ == "HASH" ) {
+            p5pkg[namespace][sigils['%'] + name] = obj._hash_;
+        }
+        else if ( obj._ref_ == "ARRAY" ) {
+            p5pkg[namespace][sigils['@'] + name] = obj._array_;
+        }
+        else if ( obj._ref_ == "SCALAR" ) {
+            p5pkg[namespace][sigils['$'] + name] = obj._scalar_;
+        }
+        else if ( obj._ref_ == "GLOB" ) {
+            // TODO
+            p5pkg[namespace][name] = obj;
+        }
+    }
+    else {
+        p5pkg[namespace][name] = obj;   // CODE
+        // TODO - non-reference
+    }
+    return p5pkg[namespace][name];  // TODO - return GLOB
+}
+
 function p5set_local(namespace, name, sigil) {
     var vname = sigils[sigil] + name;
     p5LOCAL.push([namespace, vname, namespace[vname]]);

diff --git a/src5/lib/Perlito5/Javascript3/Emitter.pm b/src5/lib/Perlito5/Javascript3/Emitter.pm
@@ -2251,7 +2251,7 @@ package Perlito5::AST::Sub;
         . Perlito5::Javascript3::tab($level) . '}';
 
         if ( $self->{name} ) {
-            return 'p5make_sub("' . $self->{namespace} . '", "' . $self->{name} . '", ' . $s . ')'
+            return 'p5typeglob_set("' . $self->{namespace} . '", "' . $self->{name} . '", ' . $s . ')'
         }
         else {
             return $s;

diff --git a/src5/lib/Perlito5/Javascript3/Runtime.pm b/src5/lib/Perlito5/Javascript3/Runtime.pm
@@ -271,7 +271,7 @@ p5make_package("Perlito5::IO");
 p5make_package("Perlito5::Runtime");
 p5make_package("Perlito5::Grammar");
 
-function p5make_sub(pkg_name, sub_name, func) {
+function p5typeglob_set(pkg_name, sub_name, func) {
     p5make_package(pkg_name);
     p5pkg[pkg_name][sub_name] = func;
 }
@@ -811,12 +811,12 @@ p5a_to_h = function(a) {
 
 if (isNode) {
     var fs = require("fs");
-    p5make_sub("Perlito5::IO", "slurp", function(List__) {
+    p5typeglob_set("Perlito5::IO", "slurp", function(List__) {
         var filename = p5str(List__[0]);
         return fs.readFileSync(filename, "utf8");
     });
 } else {
-    p5make_sub("Perlito5::IO", "slurp", function(List__) {
+    p5typeglob_set("Perlito5::IO", "slurp", function(List__) {
         var filename = p5str(List__[0]);
         if (typeof readFile == "function") {
             return readFile(filename);