Merge branch 'master' into attr-perf-fix

Conflicts:
	mrblib/class.rb

1 files changed, 13 insertions, 7 deletions

diff --git a/mrblib/class.rb b/mrblib/class.rb
index d6ef34f17..0678d943d 100644
--- a/mrblib/class.rb
+++ b/mrblib/class.rb
@@ -1,18 +1,24 @@
 class Module
   # 15.2.2.4.13
   def attr_reader(*names)
-    names.each{|name|
-      name2 = ('@'+name.to_s)
+    names.each do |name|
+      name = name.to_s
+      raise(NameError, "#{name.inspect} is not allowed as an instance variable name") if name.include?('@') || name.include?('?')  || name.include?('$')
+      
+      name2 = ('@'+name).intern
       define_method(name){self.instance_variable_get(name2)}
-    }
+    end
   end
   # 15.2.2.4.14
   def attr_writer(*names)
-    names.each{|name|
-      name2 = ('@'+name.to_s)
-      name = (name.to_s+"=")
+    names.each do |name|
+      name = name.to_s
+      raise(NameError, "#{name.inspect} is not allowed as an instance variable name") if name.include?('@') || name.include?('?')  || name.include?('$')
+      
+      name2 = ('@'+name).intern
+      name = (name+"=").intern
       define_method(name){|v|self.instance_variable_set(name2,v)}
-    }
+    end
   end
   # 15.2.2.4.12
   def attr_accessor(*names)