opal 0.9.0.beta2 → 0.9.0.rc1

data/lib/opal/parser/grammar.y

@@ -5,22 +5,22 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       kREDO kRETRY kIN kDO kDO_COND kDO_BLOCK kDO_LAMBDA kRETURN kYIELD kSUPER
       kSELF kNIL kTRUE kFALSE kAND kOR kNOT kIF_MOD kUNLESS_MOD kWHILE_MOD
       kUNTIL_MOD kRESCUE_MOD kALIAS kDEFINED klBEGIN klEND k__LINE__
-      k__FILE__ k__ENCODING__ tIDENTIFIER tFID tGVAR tIVAR tCONSTANT
+      k__FILE__ tIDENTIFIER tFID tGVAR tIVAR tCONSTANT
       tLABEL tCVAR tNTH_REF tBACK_REF tSTRING_CONTENT tINTEGER tFLOAT
-      tREGEXP_END tUPLUS tUMINUS tUMINUS_NUM tPOW tCMP tEQ tEQQ tNEQ tGEQ tLEQ tANDOP
+      tREGEXP_END tUPLUS tUMINUS tPOW tCMP tEQ tEQQ tNEQ tGEQ tLEQ tANDOP
       tOROP tMATCH tNMATCH tJSDOT tDOT tDOT2 tDOT3 tAREF tASET tLSHFT tRSHFT
       tCOLON2 tCOLON3 tOP_ASGN tASSOC tLPAREN tLPAREN2 tRPAREN tLPAREN_ARG
-      ARRAY_BEG tRBRACK tLBRACE tLBRACE_ARG tSTAR tSTAR2 tAMPER tAMPER2
+      tRBRACK tLBRACE tLBRACE_ARG tSTAR tSTAR2 tAMPER tAMPER2
       tTILDE tPERCENT tDIVIDE tPLUS tMINUS tLT tGT tPIPE tBANG tCARET
       tLCURLY tRCURLY tBACK_REF2 tSYMBEG tSTRING_BEG tXSTRING_BEG tREGEXP_BEG
       tWORDS_BEG tAWORDS_BEG tSTRING_DBEG tSTRING_DVAR tSTRING_END tSTRING
       tSYMBOL tNL tEH tCOLON tCOMMA tSPACE tSEMI tLAMBDA tLAMBEG
-      tLBRACK2 tLBRACK tJSLBRACK tDSTAR
+      tLBRACK2 tLBRACK tJSLBRACK tDSTAR tLABEL_END tEQL
 
 prechigh
   right    tBANG tTILDE tUPLUS
   right    tPOW
-  right    tUMINUS_NUM tUMINUS
+  right    tUMINUS
   left     tSTAR2 tDIVIDE tPERCENT
   left     tPLUS tMINUS
   left     tLSHFT tRSHFT
@@ -275,20 +275,33 @@ rule
                       result = val[0] << s(:splat, val[2])
                     }
                 | mlhs_head tSTAR mlhs_node tCOMMA mlhs_post
+                   {
+                     result = (val[0] << s(:splat, val[2])).concat(val[4].children)
+                   }
                 | mlhs_head tSTAR
                     {
                       result = val[0] << s(:splat)
                     }
                 | mlhs_head tSTAR tCOMMA mlhs_post
+                    {
+                      result = (val[0] << s(:splat)).concat(val[3].children)
+                    }
                 | tSTAR mlhs_node
                     {
                       result = s(:array, s(:splat, val[1]))
                     }
+                | tSTAR mlhs_node tCOMMA mlhs_post
+                    {
+                      result = s(:array, s(:splat, val[1])).concat(val[3].children)
+                    }
                 | tSTAR
                     {
                       result = s(:array, s(:splat))
                     }
                 | tSTAR tCOMMA mlhs_post
+                    {
+                      result = s(:array, s(:splat)).concat(val[2].children)
+                    }
 
        mlhs_item: mlhs_node
                     {
@@ -309,7 +322,13 @@ rule
                     }
 
        mlhs_post: mlhs_item
+                    {
+                      result = s(:array, val[0])
+                    }
                 | mlhs_post tCOMMA mlhs_item
+                    {
+                      result = val[0] << val[2]
+                    }
 
        mlhs_node: variable
                     {
@@ -590,9 +609,9 @@ rule
                     {
                       result = s(:defined, val[2])
                     }
-                | arg tEH arg tCOLON arg
+                | arg tEH { lexer.cond_push 1 } arg tCOLON { lexer.cond_pop } arg
                     {
-                      result = new_if(val[1], val[0], val[2], val[4])
+                      result = new_if(val[1], val[0], val[3], val[6])
                     }
                 | primary
 
@@ -619,6 +638,11 @@ rule
                     {
                       result = [s(:hash, *val[0])]
                     }
+                | args tCOMMA block_arg
+                    {
+                      result = val[0] << val[2]
+                    }
+
 
       paren_args: tLPAREN2 opt_call_args rparen
                     {
@@ -1397,19 +1421,19 @@ xstring_contents: none
                     {
                       result = new_float(val[0])
                     }
-                | '-@NUM' tINTEGER =tLOWEST
+                | '-@NUM' tINTEGER =tUMINUS
                   {
                     result = negate_num(new_int(val[1]))
                   }
-                | '-@NUM' tFLOAT   =tLOWEST
+                | '-@NUM' tFLOAT   =tUMINUS
                   {
                     result = negate_num(new_float(val[1]))
                   }
-                | '+@NUM' tINTEGER =tLOWEST
+                | '+@NUM' tINTEGER
                   {
                     result = new_int(val[1])
                   }
-                | '+@NUM' tFLOAT   =tLOWEST
+                | '+@NUM' tFLOAT
                   {
                     result = new_float(val[1])
                   }
@@ -1745,6 +1769,10 @@ xstring_contents: none
                     {
                       result = [new_sym(val[0]), val[1]]
                     }
+                | tSTRING_BEG string_contents tLABEL_END arg_value
+                    {
+                      result = [s(:sym, source(val[1]).to_sym), val[3]]
+                    }
 
        operation: tIDENTIFIER
                 | tCONSTANT

data/lib/opal/parser/lexer.rb

@@ -206,6 +206,7 @@ module Opal
 
     def new_op_asgn(value)
       self.yylval = value
+      @lex_state = :expr_beg
       :tOP_ASGN
     end
 
@@ -360,7 +361,7 @@ module Opal
               self.yylval = scan(/\w+/)
               return :tREGEXP_END
             end
-            return :tSTRING_END
+            return !cond? && scan(/:[^:]/) ? :tLABEL_END : :tSTRING_END
           else
             str_buffer << scanner.matched
             str_parse[:nesting] -= 1
@@ -376,7 +377,7 @@ module Opal
             @scanner = str_parse[:scanner]
           end
 
-          return :tSTRING_END
+          return !cond? && scan(/:[^:]/) ? :tLABEL_END : :tSTRING_END
         end
       end
 
@@ -645,7 +646,7 @@ module Opal
           token = parse_string
         end
 
-        if token == :tSTRING_END or token == :tREGEXP_END
+        if token == :tSTRING_END or token == :tREGEXP_END or token == :tLABEL_END
           self.strterm = nil
           @lex_state = :expr_end
         end
@@ -692,13 +693,11 @@ module Opal
 
         elsif check(/\*/)
           if scan(/\*\*\=/)
-            @lex_state = :expr_beg
             return new_op_asgn('**')
           elsif scan(/\*\*/)
             self.set_arg_state
             return :tPOW
           elsif scan(/\*\=/)
-            @lex_state = :expr_beg
             return new_op_asgn('*')
           else
             scan(/\*/)
@@ -803,7 +802,6 @@ module Opal
             return :tANDOP
 
           elsif scan(/\=/)
-            @lex_state = :expr_beg
             return new_op_asgn('&')
           end
 
@@ -823,6 +821,7 @@ module Opal
         elsif scan(/\|/)
           if scan(/\|/)
             @lex_state = :expr_beg
+
             if scan(/\=/)
               return new_op_asgn('||')
             end
@@ -875,7 +874,6 @@ module Opal
             self.strterm = new_strterm(STR_REGEXP, '/', '/')
             return :tREGEXP_BEG
           elsif scan(/\=/)
-            @lex_state = :expr_beg
             return new_op_asgn('/')
           end
 
@@ -896,10 +894,11 @@ module Opal
 
         elsif scan(/\%/)
           if scan(/\=/)
-            @lex_state = :expr_beg
             return new_op_asgn('%')
           elsif check(/[^\s]/)
-            if @lex_state == :expr_beg or (@lex_state == :expr_arg && @space_seen)
+            if @lex_state == :expr_beg or
+               (@lex_state == :expr_arg && @space_seen) or
+               @lex_state == :expr_mid
               start_word  = scan(/./)
               end_word    = { '(' => ')', '[' => ']', '{' => '}' }[start_word] || start_word
               self.strterm = new_strterm2(STR_DQUOTE, end_word, start_word)
@@ -1034,7 +1033,6 @@ module Opal
           return :tSYMBEG
 
         elsif scan(/\^\=/)
-          @lex_state = :expr_beg
           return new_op_asgn('^')
 
         elsif scan(/\^/)
@@ -1043,7 +1041,6 @@ module Opal
 
         elsif check(/</)
           if scan(/<<\=/)
-            @lex_state = :expr_beg
             return new_op_asgn('<<')
 
           elsif scan(/<</)
@@ -1132,14 +1129,17 @@ module Opal
           end
 
           if scan(/\=/)
-            @lex_state = :expr_beg
             return new_op_asgn(matched)
           end
 
           if spcarg?
             @lex_state = :expr_mid
             self.yylval = matched
-            return utype
+            if scanner.peek(1) =~ /\d/ and
+              return utype == :tUMINUS ? '-@NUM' : '+@NUM'
+            else
+              return utype
+            end
           end
 
           @lex_state = :expr_beg
@@ -1209,6 +1209,8 @@ module Opal
           if @start_of_lambda
             @start_of_lambda = false
             @lex_state = :expr_beg
+            cond_push 0
+            cmdarg_push 0
             return :tLAMBEG
 
           elsif arg? or @lex_state == :expr_end

data/lib/opal/parser/sexp.rb

@@ -42,6 +42,11 @@ module Opal
       self
     end
 
+    def concat(children)
+      @array.concat(children)
+      self
+    end
+
     def to_ary
       @array
     end

data/lib/opal/version.rb

@@ -1,5 +1,5 @@
 module Opal
   # WHEN RELEASING:
   # Remember to update RUBY_ENGINE_VERSION in opal/corelib/constants.rb too!
-  VERSION = '0.9.0.beta2'
+  VERSION = '0.9.0.rc1'
 end

data/opal/corelib/array.rb

@@ -220,6 +220,9 @@ class Array < `Array`
       function _eqeq(array, other) {
         var i, length, a, b;
 
+        if (array === other)
+          return true;
+
         if (!other.$$is_array) {
           if (#{Opal.respond_to? `other`, :to_ary}) {
             return #{`other` == `array`};
@@ -228,7 +231,10 @@ class Array < `Array`
           }
         }
 
-        other = #{other.to_a};
+        if (array.constructor !== Array)
+          array = array.literal;
+        if (other.constructor !== Array)
+          other = other.literal;
 
         if (array.length !== other.length) {
           return false;
@@ -2099,12 +2105,21 @@ class Array < `Array`
 
       for (j = 0, jj = others.length; j < jj; j++) {
         o = others[j];
-        if (!o.$$is_array) {
-          others[j] = #{(
-            Opal.coerce_to?(`o`, Array, :to_ary) ||
-            Opal.coerce_to!(`o`, Enumerator, :each)
-          ).to_a};
+        if (o.$$is_array) {
+          continue;
+        }
+        if (o.$$is_enumerator) {
+          if (o.$size() === Infinity) {
+            others[j] = o.$take(size);
+          } else {
+            others[j] = o.$to_a();
+          }
+          continue;
         }
+        others[j] = #{(
+          Opal.coerce_to?(`o`, Array, :to_ary) ||
+          Opal.coerce_to!(`o`, Enumerator, :each)
+        ).to_a};
       }
 
       for (i = 0; i < size; i++) {

data/opal/corelib/basic_object.rb

@@ -10,6 +10,8 @@ class BasicObject
     self == other
   end
 
+  alias equal? ==
+
   def __id__
     `self.$$id || (self.$$id = Opal.uid())`
   end
@@ -44,8 +46,18 @@ class BasicObject
 
   alias equal? ==
 
-  def instance_eval(&block)
-    Kernel.raise ArgumentError, "no block given" unless block
+  def instance_eval(*args, &block)
+    if block.nil? && `!!Opal.compile`
+      Kernel.raise ArgumentError, "wrong number of arguments (0 for 1..3)" unless (1..3).cover? args.size
+
+      string, file, _lineno = *args
+      compiled = Opal.compile string, file: (file || '(eval)'), eval: true
+      wrapper  = `function() {return eval(compiled)}`
+
+      block = Kernel.lambda { `wrapper.call(#{self})` }
+    elsif args.size > 0
+      Kernel.raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"
+    end
 
     %x{
       var old = block.$$s,
@@ -53,8 +65,9 @@ class BasicObject
 
       block.$$s = null;
 
-      // need to pass $$eval so that method definitions know if this is being done on a class/module. Cannot be compiler driven since
-      // send(:instance_eval) needs to work
+      // Need to pass $$eval so that method definitions know if this is
+      // being done on a class/module. Cannot be compiler driven since
+      // send(:instance_eval) needs to work.
       if (self.$$is_class || self.$$is_module) {
         self.$$eval = true;
         try {

data/opal/corelib/class.rb

@@ -8,7 +8,7 @@ class Class
       }
 
       function AnonClass(){};
-      var klass        = Opal.boot(sup, AnonClass)
+      var klass        = Opal.boot_class(sup, AnonClass)
       klass.$$name     = nil;
       klass.$$parent   = sup;
       klass.$$is_class = true;

data/opal/corelib/constants.rb

@@ -1,7 +1,7 @@
 RUBY_PLATFORM       = 'opal'
 RUBY_ENGINE         = 'opal'
-RUBY_VERSION        = '2.1.5'
-RUBY_ENGINE_VERSION = '0.9.0.beta2'
+RUBY_VERSION        = '2.2.3'
+RUBY_ENGINE_VERSION = '0.9.0.rc1'
 RUBY_RELEASE_DATE   = '2015-11-06'
 RUBY_PATCHLEVEL     = 0
 RUBY_REVISION       = 0

data/opal/corelib/enumerator.rb

@@ -3,6 +3,8 @@ require 'corelib/enumerable'
 class Enumerator
   include Enumerable
 
+  `def.$$is_enumerator = true`
+
   def self.for(object, method = :each, *args, &block)
     %x{
       var obj = #{allocate};

data/opal/corelib/hash.rb

@@ -93,16 +93,16 @@ class Hash
         return false;
       }
 
-      if (self.keys.length !== other.keys.length) {
+      if (self.$$keys.length !== other.$$keys.length) {
         return false;
       }
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, other_value; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, other_value; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
-          other_value = other.smap[key];
+          value = self.$$smap[key];
+          other_value = other.$$smap[key];
         } else {
           value = key.value;
           other_value = Opal.hash_get(other, key.key);
@@ -138,12 +138,12 @@ class Hash
 
   def assoc(object)
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
           if (#{`key` == object}) {
-            return [key, self.smap[key]];
+            return [key, self.$$smap[key]];
           }
         } else {
           if (#{`key.key` == object}) {
@@ -233,11 +233,11 @@ class Hash
     return enum_for(:delete_if){self.size} unless block
 
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -267,11 +267,11 @@ class Hash
     return enum_for(:each){self.size} unless block
 
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -292,7 +292,7 @@ class Hash
     return enum_for(:each_key){self.size} unless block
 
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
         if (block(key.$$is_string ? key : key.key) === $breaker) {
@@ -310,10 +310,10 @@ class Hash
     return enum_for(:each_value){self.size} unless block
 
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
-        if (block(key.$$is_string ? self.smap[key] : key.value) === $breaker) {
+        if (block(key.$$is_string ? self.$$smap[key] : key.value) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -323,7 +323,7 @@ class Hash
   end
 
   def empty?
-    `self.keys.length === 0`
+    `self.$$keys.length === 0`
   end
 
   alias eql? ==
@@ -360,11 +360,11 @@ class Hash
     %x{
       var result = [];
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -395,10 +395,10 @@ class Hash
 
   def has_value?(value)
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
-        if (#{`(key.$$is_string ? self.smap[key] : key.value)` == value}) {
+        if (#{`(key.$$is_string ? self.$$smap[key] : key.value)` == value}) {
           return true;
         }
       }
@@ -434,11 +434,11 @@ class Hash
 
         Opal.hash_ids[hash_id] = self;
 
-        for (var i = 0, keys = self.keys, length = keys.length; i < length; i++) {
+        for (var i = 0, keys = self.$$keys, length = keys.length; i < length; i++) {
           key = keys[i];
 
           if (key.$$is_string) {
-            result.push([key, self.smap[key].$hash()]);
+            result.push([key, self.$$smap[key].$hash()]);
           } else {
             result.push([key.key_hash, key.value.$hash()]);
           }
@@ -458,11 +458,11 @@ class Hash
 
   def index(object)
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key, value; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -518,11 +518,11 @@ class Hash
 
         inspect_ids[hash_id] = true;
 
-        for (var i = 0, keys = self.keys, length = keys.length, key, value; i < length; i++) {
+        for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
           key = keys[i];
 
           if (key.$$is_string) {
-            value = self.smap[key];
+            value = self.$$smap[key];
           } else {
             value = key.value;
             key = key.key;
@@ -545,11 +545,11 @@ class Hash
     %x{
       var hash = Opal.hash();
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -566,11 +566,11 @@ class Hash
     return enum_for(:keep_if){self.size} unless block
 
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -602,7 +602,7 @@ class Hash
     %x{
       var result = [];
 
-      for (var i = 0, keys = self.keys, length = keys.length, key; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
@@ -617,7 +617,7 @@ class Hash
   end
 
   def length
-    `self.keys.length`
+    `self.$$keys.length`
   end
 
   alias member? has_key?
@@ -632,14 +632,14 @@ class Hash
         other = #{Opal.coerce_to!(other, Hash, :to_hash)};
       }
 
-      var i, other_keys = other.keys, length = other_keys.length, key, value, other_value;
+      var i, other_keys = other.$$keys, length = other_keys.length, key, value, other_value;
 
       if (block === nil) {
         for (i = 0; i < length; i++) {
           key = other_keys[i];
 
           if (key.$$is_string) {
-            other_value = other.smap[key];
+            other_value = other.$$smap[key];
           } else {
             other_value = key.value;
             key = key.key;
@@ -655,7 +655,7 @@ class Hash
         key = other_keys[i];
 
         if (key.$$is_string) {
-          other_value = other.smap[key];
+          other_value = other.$$smap[key];
         } else {
           other_value = key.value;
           key = key.key;
@@ -677,11 +677,11 @@ class Hash
 
   def rassoc(object)
     %x{
-      for (var i = 0, keys = self.keys, length = keys.length, key, value; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -709,11 +709,11 @@ class Hash
     %x{
       var hash = Opal.hash();
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -740,11 +740,11 @@ class Hash
     %x{
       var changes_were_made = false;
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -775,11 +775,11 @@ class Hash
     %x{
       Opal.hash_init(self);
 
-      for (var i = 0, other_keys = other.keys, length = other_keys.length, key, value, other_value; i < length; i++) {
+      for (var i = 0, other_keys = other.$$keys, length = other_keys.length, key, value, other_value; i < length; i++) {
         key = other_keys[i];
 
         if (key.$$is_string) {
-          other_value = other.smap[key];
+          other_value = other.$$smap[key];
         } else {
           other_value = key.value;
           key = key.key;
@@ -804,11 +804,11 @@ class Hash
     %x{
       var hash = Opal.hash();
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -835,11 +835,11 @@ class Hash
     %x{
       var result = nil;
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -866,7 +866,7 @@ class Hash
 
   def shift
     %x{
-      var keys = self.keys,
+      var keys = self.$$keys,
           key;
 
       if (keys.length > 0) {
@@ -889,11 +889,11 @@ class Hash
     %x{
       var result = [];
 
-      for (var i = 0, keys = self.keys, length = keys.length, key, value; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          value = self.smap[key];
+          value = self.$$smap[key];
         } else {
           value = key.value;
           key = key.key;
@@ -937,11 +937,11 @@ class Hash
     %x{
       var result = [];
 
-      for (var i = 0, keys = self.keys, length = keys.length, key; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
-          result.push(self.smap[key]);
+          result.push(self.$$smap[key]);
         } else {
           result.push(key.value);
         }