[js] Treat static similiar to contvars.

Author: pmurias

src/vm/js/Compiler.nqp

@@ -1522,23 +1522,26 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
                 $*BLOCK.add_js_lexical($*BLOCK.add_mangled_var($node));
             }
         }
-        elsif $node.decl eq 'var' || $node.decl eq 'contvar' {
+        elsif $node.decl eq 'var' || $node.decl eq 'contvar' || $node.decl eq 'static' {
             $*BLOCK.add_variable($node);
 
             if !self.is_dynamic_var($*BLOCK, $node) {
                 my $mangled_name := $*BLOCK.add_mangled_var($node);
                 if $node.decl eq 'contvar' {
                     $*BLOCK.add_js_lexical_with_value($mangled_name, "nqp.op.clone({self.value_as_js($node.value)})");
                 }
+                elsif $node.decl eq 'static' {
+                    $*BLOCK.add_js_lexical_with_value($mangled_name, self.value_as_js($node.value));
+                }
                 else {
                     $*BLOCK.add_js_lexical($mangled_name);
                 }
             }
         }
-        elsif $node.decl eq 'static' {
-            $*BLOCK.add_variable($node);
-            $*BLOCK.add_static_variable($node);
-        }
+#        elsif $node.decl eq 'static' {
+#            $*BLOCK.add_variable($node);
+#            $*BLOCK.add_static_variable($node);
+#        }
         elsif $node.decl eq 'param' {
             $*BLOCK.add_variable($node);
             if $node.scope eq 'local' || $node.scope eq 'lexical' {
@@ -1682,6 +1685,9 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
             elsif $var.decl eq 'contvar' {
                 self.stored_result(Chunk.new($T_OBJ, "({$*CTX}[{quote_string($var.name)}] = nqp.op.clone({self.value_as_js($var.value)}))",  []), :$want);
             }
+            elsif $var.decl eq 'static' {
+                self.stored_result(Chunk.new($T_OBJ, "({$*CTX}[{quote_string($var.name)}] = {self.value_as_js($var.value)})",  []), :$want);
+            }
             else {
                 if $*BLOCK.ctx_for_var($var) -> $ctx {
                     Chunk.new($type, "$ctx[{quote_string($var.name)}]", [], :node($var));