Perlito5 - js - fix context in chained method calls

fglock · Nov 23, 2012 · 574d226 · 574d226
1 parent faef513
commit 574d226
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 36 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
@@ -1203,7 +1203,7 @@ package Perlito5::AST::Call;
                 . ')';
         }
 
-        my $invocant = $self->{invocant}->emit_javascript2;
+        my $invocant = $self->{invocant}->emit_javascript2($level, 'scalar');
         if  ($meth eq 'postcircumfix:<( )>')  {
             return '(' . $invocant . ')(' . Perlito5::Javascript2::to_list($self->{arguments}) . ', '
                          .   ($wantarray eq 'list'   ? '1' 
@@ -1214,7 +1214,7 @@ package Perlito5::AST::Call;
                     . ')';
         }
         if ( ref($meth) eq 'Perlito5::AST::Var' ) {
-            $meth = $meth->emit_javascript2();
+            $meth = $meth->emit_javascript2($level, 'scalar');
         }
         else {
             $meth = '"' . $meth . '"';

diff --git a/src5/lib/Perlito5/Javascript2/Runtime.pm b/src5/lib/Perlito5/Javascript2/Runtime.pm
@@ -139,8 +139,6 @@ function p5method_lookup(method, class_name, seen) {
 function p5call(invocant, method, list, p5want) {
     list.unshift(invocant);
 
-    p5want = 0;  // TODO BUG - workaround for broken bootstrap
-
     if (typeof invocant === "string") {
         invocant = p5make_package(invocant);
     }

diff --git a/src5/lib/Perlito5/Javascript3/Emitter.pm b/src5/lib/Perlito5/Javascript3/Emitter.pm
@@ -1176,7 +1176,7 @@ package Perlito5::AST::Call;
                 . '.hget(' . Perlito5::Javascript3::autoquote($self->{arguments}, $level, 'list') . ', ' . $type . ')';
         }
 
-        my $invocant = $self->{invocant}->emit_javascript3;
+        my $invocant = $self->{invocant}->emit_javascript3($level, 'scalar');
         if  ($meth eq 'postcircumfix:<( )>')  {
             return 'p5code(' . $invocant . ')(' . Perlito5::Javascript3::to_list($self->{arguments}) . ', '
                          .   ($wantarray eq 'list'   ? '1' 
@@ -1187,7 +1187,7 @@ package Perlito5::AST::Call;
                     . ')';
         }
         if ( ref($meth) eq 'Perlito5::AST::Var' ) {
-            $meth = $meth->emit_javascript3();
+            $meth = $meth->emit_javascript3($level, 'scalar');
         }
         else {
             $meth = '"' . $meth . '"';

diff --git a/src5/lib/Perlito5/Javascript3/Runtime.pm b/src5/lib/Perlito5/Javascript3/Runtime.pm
@@ -147,8 +147,6 @@ function p5method_lookup(method, class_name, seen) {
 function p5call(invocant, method, list, p5want) {
     list.unshift(invocant);
 
-    p5want = 0;  // TODO BUG - workaround for broken bootstrap
-
     if (invocant instanceof p5Scalar) {
         // TODO - move p5call() to p5Scalar method
         invocant = invocant.FETCH();