opal · Mar 12, 2015 · Mar 12, 2015 · Mar 13, 2015 · Mar 13, 2015
Showing with 8 additions and 7 deletions.

+8 −2 opal/corelib/struct.rb

+0 −5 spec/filters/bugs/struct.rb
diff --git a/opal/corelib/struct.rb b/opal/corelib/struct.rb
@@ -61,23 +61,29 @@ def members
 
   def [](name)
     if Integer === name
+      raise IndexError, "offset #{name} too small for struct(size:#{members.size})" if name < -members.size
       raise IndexError, "offset #{name} too large for struct(size:#{members.size})" if name >= members.size
 
       name = members[name]
-    else
+    elsif String === name
       raise NameError, "no member '#{name}' in struct" unless members.include?(name.to_sym)
+    else
+      raise TypeError, "no implicit conversion of #{name.class} into Integer"
     end
 
     instance_variable_get "@#{name}"
   end
 
   def []=(name, value)
     if Integer === name
+      raise IndexError, "offset #{name} too small for struct(size:#{members.size})" if name < -members.size
       raise IndexError, "offset #{name} too large for struct(size:#{members.size})" if name >= members.size
 
       name = members[name]
-    else
+    elsif String === name
       raise NameError, "no member '#{name}' in struct" unless members.include?(name.to_sym)
+    else
+      raise TypeError, "no implicit conversion of #{name.class} into Integer"
     end
 
     instance_variable_set "@#{name}", value

diff --git a/spec/filters/bugs/struct.rb b/spec/filters/bugs/struct.rb
@@ -1,9 +1,4 @@
 opal_filter "Struct" do
-  fails "Struct#[] fails when it does not know about the requested attribute"
-  fails "Struct#[] fails if not passed a string, symbol, or integer"
-
-  fails "Struct#[]= fails when trying to assign attributes which don't exist"
-
   fails "Struct#== returns true if the other has all the same fields"
   fails "Struct#== handles recursive structures by returning false if a difference can be found"