opal 0.3.32 → 0.3.33

data/core/class.rb

@@ -88,11 +88,44 @@ class Class
     self
   end
 
-  # handled by parser
-  def attr_accessor(*); end
+  def attr_accessor(*names)
+    attr_reader *names
+    attr_writer *names
+  end
+
+  def attr_reader(*names)
+    %x{
+      var proto = #{self}.prototype;
+      for (var i = 0, length = names.length; i < length; i++) {
+        (function(name) {
+          proto[name] = nil;
+
+          proto['$' + name] = function() {
+            return this[name];
+          };
+        })(names[i]);
+      }
+    }
+
+    nil
+  end
+
+  def attr_writer(*names)
+    %x{
+      var proto = #{self}.prototype;
+      for (var i = 0, length = names.length; i < length; i++) {
+        (function(name) {
+          proto[name] = nil;
+
+          proto['$' + name + '='] = function(value) {
+            return this[name] = value;
+          };
+        })(names[i]);
+      }
+    }
+    nil
+  end
 
-  alias attr_reader attr_accessor
-  alias attr_writer attr_accessor
   alias attr attr_accessor
 
   def define_method(name, &block)

data/core/hash.rb

@@ -28,9 +28,8 @@ class Hash
     // strings as keys. The map and keys array can be constructed at
     // compile time, so they are just added here by the constructor
     // function
-    __hash2 = Opal.hash2 = function(keys, map) {
+    __hash2 = Opal.hash2 = function(map) {
       var hash = new Hash;
-      hash.keys = keys;
       hash.map = map;
       return hash;
     }
@@ -46,10 +45,9 @@ class Hash
 
   def self.from_native(obj)
     %x{
-      var hash = __hash(), map = hash.map, keys = hash.keys;
+      var hash = __hash(), map = hash.map;
 
       for (var key in obj) {
-        keys.push(key);
         map[key] = obj[key];
       }
 
@@ -78,19 +76,15 @@ class Hash
         return true;
       }
 
-      if (!other.map || !other.keys) {
-        return false;
-      }
-
-      if (#{self}.keys.length !== other.keys.length) {
+      if (other.map == null) {
         return false;
       }
 
       var map  = #{self}.map,
           map2 = other.map;
 
-      for (var i = 0, length = #{self}.keys.length; i < length; i++) {
-        var key = #{self}.keys[i], obj = map[key], obj2 = map2[key];
+      for (var key in map) {
+        var obj = map[key], obj2 = map2[key];
 
         if (#{`obj` != `obj2`}) {
           return false;
@@ -103,10 +97,10 @@ class Hash
 
   def [](key)
     %x{
-      var bucket = #{self}.map[key];
+      var obj = #{self}.map[key];
 
-      if (bucket != null) {
-        return bucket;
+      if (obj != null) {
+        return obj;
       }
 
       var proc = #{@proc};
@@ -121,27 +115,18 @@ class Hash
 
   def []=(key, value)
     %x{
-      var map = #{self}.map;
-
-      if (!__hasOwn.call(map, key)) {
-        #{self}.keys.push(key);
-      }
-
-      map[key] = value;
-
+      #{self}.map[key] = value;
       return value;
     }
   end
 
   def assoc(object)
     %x{
-      var keys = #{self}.keys, key;
-
-      for (var i = 0, length = keys.length; i < length; i++) {
-        key = keys[i];
+      var map = #{self}.map;
 
+      for (var key in map) {
         if (#{`key` == object}) {
-          return [key, #{self}.map[key]];
+          return [key, map[key]];
         }
       }
 
@@ -152,7 +137,6 @@ class Hash
   def clear
     %x{
       #{self}.map = {};
-      #{self}.keys = [];
       return #{self};
     }
   end
@@ -161,12 +145,10 @@ class Hash
     %x{
       var result = __hash(),
           map    = #{self}.map,
-          map2   = result.map,
-          keys2  = result.keys;
+          map2   = result.map;
 
-      for (var i = 0, length = #{self}.keys.length; i < length; i++) {
-        keys2.push(#{self}.keys[i]);
-        map2[#{self}.keys[i]] = map[#{self}.keys[i]];
+      for (var key in map) {
+        map2[key] = map[key];
       }
 
       return result;
@@ -191,12 +173,10 @@ class Hash
 
   def delete(key)
     %x{
-      var map  = #{self}.map, result = map[key];
+      var map = #{self}.map, result = map[key];
 
       if (result != null) {
         delete map[key];
-        #{self}.keys.$delete(key);
-
         return result;
       }
 
@@ -206,21 +186,15 @@ class Hash
 
   def delete_if(&block)
     %x{
-      var map = #{self}.map, keys = #{self}.keys, value;
-
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key];
+      var map = #{self}.map, value;
 
-        if ((value = block(key, obj)) === __breaker) {
+      for (var key in map) {
+        if ((value = block(key, map[key])) === __breaker) {
           return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          keys.splice(i, 1);
-          delete map[key];
-
-          length--;
-          i--;
+          delete map[key]
         }
       }
 
@@ -232,11 +206,9 @@ class Hash
 
   def each(&block)
     %x{
-      var map = #{self}.map, keys = #{self}.keys;
-
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+      var map = #{self}.map;
 
+      for (var key in map) {
         if (block(key, map[key]) === __breaker) {
           return __breaker.$v;
         }
@@ -248,11 +220,9 @@ class Hash
 
   def each_key(&block)
     %x{
-      var keys = #{self}.keys;
-
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+      var map = #{self}.map;
 
+      for (var key in map) {
         if (block(key) === __breaker) {
           return __breaker.$v;
         }
@@ -266,10 +236,10 @@ class Hash
 
   def each_value(&block)
     %x{
-      var map = #{self}.map, keys = #{self}.keys;
+      var map = #{self}.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        if (block(map[keys[i]]) === __breaker) {
+      for (var key in map) {
+        if (block(map[key]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -280,7 +250,11 @@ class Hash
 
   def empty?
     %x{
-      return #{self}.keys.length === 0;
+      for (var key in #{self}.map) {
+        return false;
+      }
+
+      return true;
     }
   end
 
@@ -314,10 +288,10 @@ class Hash
 
   def flatten(level=undefined)
     %x{
-      var map = #{self}.map, keys = #{self}.keys, result = [];
+      var map = #{self}.map, result = [];
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], value = map[key];
+      for (var key in map) {
+        var value = map[key];
 
         result.push(key);
 
@@ -344,8 +318,10 @@ class Hash
 
   def has_value?(value)
     %x{
-      for (var assoc in #{self}.map) {
-        if (#{`#{self}.map[assoc]` == value}) {
+      var map = #{self}.map;
+
+      for (var key in map) {
+        if (#{`map[key]` == value}) {
           return true;
         }
       }
@@ -362,11 +338,9 @@ class Hash
 
   def index(object)
     %x{
-      var map = #{self}.map, keys = #{self}.keys;
-
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+      var map = #{self}.map;
 
+      for (var key in map) {
         if (#{object == `map[key]`}) {
           return key;
         }
@@ -381,13 +355,13 @@ class Hash
       var result = [], map = #{self}.map, val;
 
       for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], val = map[key];
+        val = map[keys[i]];
 
         if (val != null) {
           result.push(val);
         }
         else {
-          result.push(#{self}.none);
+          result.push(#{@none});
         }
       }
 
@@ -399,10 +373,9 @@ class Hash
 
   def inspect
     %x{
-      var inspect = [], keys = #{self}.keys, map = #{self}.map;
+      var inspect = [], map = #{self}.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+      for (var key in map) {
         inspect.push(#{`key`.inspect} + '=>' + #{`map[key]`.inspect});
       }
 
@@ -412,13 +385,10 @@ class Hash
 
   def invert
     %x{
-      var result = __hash(), keys = #{self}.keys, map = #{self}.map,
-          keys2 = result.keys, map2 = result.map;
+      var result = __hash(), map = #{self}.map, map2 = result.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key];
-
-        keys2.push(obj);
+      for (var key in map) {
+        var obj = map[key];
         map2[obj] = key;
       }
 
@@ -428,21 +398,17 @@ class Hash
 
   def keep_if(&block)
     %x{
-      var map = #{self}.map, keys = #{self}.keys, value;
+      var map = #{self}.map, value;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key];
+      for (var key in map) {
+        var obj = map[key];
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
-          keys.splice(i, 1);
           delete map[key];
-
-          length--;
-          i--;
         }
       }
 
@@ -456,13 +422,25 @@ class Hash
 
   def keys
     %x{
-      return #{self}.keys.slice(0);
+      var result = [], map = #{self}.map;
+
+      for (var key in map) {
+        result.push(key);
+      }
+
+      return result;
     }
   end
 
   def length
     %x{
-      return #{self}.keys.length;
+      var length = 0, map = #{self}.map;
+
+      for (var key in map) {
+        length++;
+      }
+
+      return length;
     }
   end
 
@@ -470,35 +448,22 @@ class Hash
 
   def merge(other, &block)
     %x{
-      var keys = #{self}.keys, map = #{self}.map,
-          result = __hash(), keys2 = result.keys, map2 = result.map;
-
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+      var map = #{self}.map, result = __hash(), map2 = result.map;
 
-        keys2.push(key);
+      for (var key in map) {
         map2[key] = map[key];
       }
 
-      var keys = other.keys, map = other.map;
+      map = other.map;
 
       if (block === nil) {
-        for (var i = 0, length = keys.length; i < length; i++) {
-          var key = keys[i];
-
-          if (map2[key] == null) {
-            keys2.push(key);
-          }
-
+        for (key in map) {
           map2[key] = map[key];
         }
       }
       else {
-        for (var i = 0, length = keys.length; i < length; i++) {
-          var key = keys[i];
-
+        for (key in map) {
           if (map2[key] == null) {
-            keys2.push(key);
             map2[key] = map[key];
           }
           else {
@@ -513,26 +478,16 @@ class Hash
 
   def merge!(other, &block)
     %x{
-      var keys = #{self}.keys, map = #{self}.map,
-          keys2 = other.keys, map2 = other.map;
+      var map = #{self}.map, map2 = other.map;
 
       if (block === nil) {
-        for (var i = 0, length = keys2.length; i < length; i++) {
-          var key = keys2[i];
-
-          if (map[key] == null) {
-            keys.push(key);
-          }
-
+        for (var key in map2) {
           map[key] = map2[key];
         }
       }
       else {
-        for (var i = 0, length = keys2.length; i < length; i++) {
-          var key = keys2[i];
-
+        for (key in map2) {
           if (map[key] == null) {
-            keys.push(key);
             map[key] = map2[key];
           }
           else {
@@ -547,10 +502,10 @@ class Hash
 
   def rassoc(object)
     %x{
-      var keys = #{self}.keys, map = #{self}.map;
+      var map = #{self}.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key];
+      for (var key in map) {
+        var obj = map[key];
 
         if (#{`obj` == object}) {
           return [key, obj];
@@ -563,18 +518,16 @@ class Hash
 
   def reject(&block)
     %x{
-      var keys = #{self}.keys, map = #{self}.map,
-          result = __hash(), map2 = result.map, keys2 = result.keys;
+      var map = #{self}.map, result = __hash(), map2 = result.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key], value;
+      for (var key in map) {
+        var obj = map[key], value;
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
-          keys2.push(key);
           map2[key] = obj;
         }
       }
@@ -585,12 +538,10 @@ class Hash
 
   def replace(other)
     %x{
-      var map = #{self}.map = {}, keys = #{self}.keys = [];
+      var map = #{self}.map = {}, map2 = other.map;
 
-      for (var i = 0, length = other.keys.length; i < length; i++) {
-        var key = other.keys[i];
-        keys.push(key);
-        map[key] = other.map[key];
+      for (var key in map2) {
+        map[key] = map2[key];
       }
 
       return #{self};
@@ -599,18 +550,16 @@ class Hash
 
   def select(&block)
     %x{
-      var keys = #{self}.keys, map = #{self}.map,
-          result = __hash(), map2 = result.map, keys2 = result.keys;
+      var map = #{self}.map, result = __hash(), map2 = result.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key], value;
+      for (var key in map) {
+        var obj = map[key], value;
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          keys2.push(key);
           map2[key] = obj;
         }
       }
@@ -621,21 +570,18 @@ class Hash
 
   def select!(&block)
     %x{
-      var map = #{self}.map, keys = #{self}.keys, value, result = nil;
+      var map = #{self}.map, value, result = nil;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key];
+      for (var key in map) {
+        var obj = map[key];
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
-          keys.splice(i, 1);
           delete map[key];
 
-          length--;
-          i--;
           result = #{self}
         }
       }
@@ -646,14 +592,11 @@ class Hash
 
   def shift
     %x{
-      var keys = #{self}.keys, map = #{self}.map;
-
-      if (keys.length) {
-        var key = keys[0], obj = map[key];
+      var map = #{self}.map;
 
+      for (var key in map) {
+        var obj = map[key];
         delete map[key];
-        keys.splice(0, 1);
-
         return [key, obj];
       }
 
@@ -665,10 +608,9 @@ class Hash
 
   def to_a
     %x{
-      var keys = #{self}.keys, map = #{self}.map, result = [];
+      var map = #{self}.map, result = [];
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+      for (var key in map) {
         result.push([key, map[key]]);
       }
 
@@ -682,10 +624,9 @@ class Hash
 
   def to_json
     %x{
-      var inspect = [], keys = #{self}.keys, map = #{self}.map;
+      var inspect = [], map = #{self}.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+      for (var key in map) {
         inspect.push(#{`key`.to_json} + ': ' + #{`map[key]`.to_json});
       }
 
@@ -695,10 +636,10 @@ class Hash
 
   def to_native
     %x{
-      var result = {}, keys = #{self}.keys, map = #{self}.map, bucket, value;
+      var result = {}, map = #{self}.map;
 
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], obj = map[key];
+      for (var key in map) {
+        var obj = map[key];
 
         if (obj.$to_native) {
           result[key] = #{`obj`.to_native};

data/core/json.rb

@@ -38,12 +38,11 @@ module JSON
             return arr;
           }
           else {
-            var hash = #{ {} }, v, map = hash.map, keys = hash.keys;
+            var hash = #{ {} }, v, map = hash.map;
 
             for (var k in value) {
               if (__hasOwn.call(value, k)) {
                 v = to_opal(value[k]);
-                keys.push(k);
                 map[k] = v;
               }
             }

data/lib/opal/parser.rb

@@ -776,7 +776,7 @@ module Opal
 
       case meth
       when :attr_reader, :attr_writer, :attr_accessor
-        return handle_attr_optimize(meth, arglist[1..-1])
+        return handle_attr_optimize(meth, arglist[1..-1]) if @scope.class_scope?
       when :block_given?
         return js_block_given(sexp, level)
       when :alias_native
@@ -1256,7 +1256,7 @@ module Opal
         map = hash_keys.map { |k| "#{k}: #{hash_obj[k]}"}
 
         @helpers[:hash2] = true
-        "__hash2([#{hash_keys.join ', '}], {#{map.join(', ')}})"
+        "__hash2({#{map.join(', ')}})"
       else
         @helpers[:hash] = true
         "__hash(#{sexp.map { |p| process p, :expr }.join ', '})"

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.32'
+  VERSION = '0.3.33'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.3.32
+  version: 0.3.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000Z
+date: 2013-01-18 00:00:00.000000000Z
 dependencies: []
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com