Perlito5 - js - code cleanup

fglock · Sep 11, 2013 · 50054f4 · 50054f4
1 parent a332ffa
commit 50054f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/html/perlito5.js b/html/perlito5.js
@@ -13238,10 +13238,7 @@ var p5100 = p5pkg['main'];
 }, p5list_to_a(p5call(v_parameters, "arguments", [], p5want)._array_)), ('return ' + p5str(v_tmp2)))], 0) + String.fromCharCode(10) + p5str(p5pkg["Perlito5::Javascript2"].tab([v_level], 0)) + '})()')], p5want));
 									})();
 								};
-								if ( (((((p5bool(p5call(v_parameters, "isa", ['Perlito5::AST::Index'], 0)) || p5bool(p5call(v_parameters, "isa", ['Perlito5::AST::Lookup'], 0))) || p5bool(p5call(v_parameters, "isa", ['Perlito5::AST::Call'], 0))) || p5bool(p5call(v_parameters, "isa", ['Perlito5::AST::Var'], 0))) || p5bool(p5call(v_parameters, "isa", ['Perlito5::AST::Decl'], 0))) || p5bool(p5call(v_parameters, "isa", ['Perlito5::AST::Apply'], 0))) ) {
-									throw(p5call(v_parameters, "emit_javascript2_set", [v_arguments, (p5num(v_level) + 1)], p5want));
-								};
-								return (p5context([('(' + p5str(p5call(v_parameters, "emit_javascript2", [v_level], 0)) + ' = ' + p5str(p5call(v_arguments, "emit_javascript2", [(p5num(v_level) + 1)], 0)) + ')')], p5want));
+								return (p5call(v_parameters, "emit_javascript2_set", [v_arguments, (p5num(v_level) + 1)], p5want));
 							}
 							catch(err) {
 								if ( err instanceof Error ) {

diff --git a/perlito5.pl b/perlito5.pl
@@ -9719,10 +9719,7 @@ package Perlito5::AST::Apply;
                     my $tmp2 = ('tmp' . Perlito5::Javascript2::get_label());
                     return ('(function () {' . chr(10) . Perlito5::Javascript2::tab(($level + 1)) . 'var ' . $tmp . ' = ' . Perlito5::Javascript2::to_list([$arguments], ($level + 1)) . ';' . chr(10) . Perlito5::Javascript2::tab(($level + 1)) . 'var ' . $tmp2 . ' = ' . $tmp . '.slice(0);' . chr(10) . Perlito5::Javascript2::tab(($level + 1)) . join((';' . chr(10) . Perlito5::Javascript2::tab(($level + 1))), (map($_->emit_javascript2_set_list(($level + 1), $tmp), @{$parameters->arguments()})), ('return ' . $tmp2)) . chr(10) . Perlito5::Javascript2::tab($level) . '})()')
                 };
-                if (((((($parameters->isa('Perlito5::AST::Index') || $parameters->isa('Perlito5::AST::Lookup')) || $parameters->isa('Perlito5::AST::Call')) || $parameters->isa('Perlito5::AST::Var')) || $parameters->isa('Perlito5::AST::Decl')) || $parameters->isa('Perlito5::AST::Apply'))) {
-                    return $parameters->emit_javascript2_set($arguments, ($level + 1))
-                };
-                ('(' . $parameters->emit_javascript2($level) . ' = ' . $arguments->emit_javascript2(($level + 1)) . ')')
+                return $parameters->emit_javascript2_set($arguments, ($level + 1))
             }, 'break', sub {
                 my $self = shift();
                 my $level = shift();

diff --git a/src5/lib/Perlito5/Javascript2/Emitter.pm b/src5/lib/Perlito5/Javascript2/Emitter.pm
@@ -1904,20 +1904,7 @@ package Perlito5::AST::Apply;
                   ) . "\n"
                 . Perlito5::Javascript2::tab($level) .      "})()";
             }
-
-            if  (   $parameters->isa( 'Perlito5::AST::Index')
-                ||  $parameters->isa( 'Perlito5::AST::Lookup') 
-                ||  $parameters->isa( 'Perlito5::AST::Call') 
-                ||  $parameters->isa( 'Perlito5::AST::Var') 
-                ||  $parameters->isa( 'Perlito5::AST::Decl') 
-                ||  $parameters->isa( 'Perlito5::AST::Apply') 
-                )
-            {
-                return $parameters->emit_javascript2_set($arguments, $level+1);
-            }
-
-            '(' . $parameters->emit_javascript2( $level ) . ' = ' . $arguments->emit_javascript2( $level+1 ) . ')';
-
+            return $parameters->emit_javascript2_set($arguments, $level+1);
         },
 
         'break' => sub {