mruby-enumerator: remove internal attribute methods; ref #6068

matz · matz · commit 735fa246bf33 · 2023-10-09T22:39:43.000+09:00
Removed methods: obj, args, kwd, meth, fib.
diff --git a/mrbgems/mruby-enum-lazy/mrblib/lazy.rb b/mrbgems/mruby-enum-lazy/mrblib/lazy.rb
@@ -47,9 +47,12 @@ def to_enum(meth=:each, *args, &block)
         raise ArgumentError, "undefined method #{meth}"
       end
       lz = Lazy.new(self, &block)
-      lz.obj = self
-      lz.meth = meth
-      lz.args = args
+      obj = self
+      lz.instance_eval {
+        @obj = obj
+        @meth = meth
+        @args = args
+      }
       lz
     end
     alias enum_for to_enum
diff --git a/mrbgems/mruby-enumerator/mrblib/enumerator.rb b/mrbgems/mruby-enumerator/mrblib/enumerator.rb
@@ -132,16 +132,20 @@ def initialize(obj=NONE, meth=:each, *args, **kwd, &block)
     @stop_exc = false
   end
 
-  attr_accessor :obj, :meth, :args, :kwd
-  attr_reader :fib
-
   def initialize_copy(obj)
     raise TypeError, "can't copy type #{obj.class}" unless obj.kind_of? Enumerator
-    raise TypeError, "can't copy execution context" if obj.fib
-    @obj = obj.obj
-    @meth = obj.meth
-    @args = obj.args
-    @kwd = obj.kwd
+    raise TypeError, "can't copy execution context" if obj.instance_eval{@fib}
+    meth = args = kwd = fib = nil
+    obj.instance_eval {
+      obj = @obj
+      meth = @meth
+      args = @args
+      kwd = @kwd
+    }
+    @obj = obj
+    @meth = meth
+    @args = args
+    @kwd = kwd
     @fib = nil
     @lookahead = nil
     @feedvalue = nil
@@ -274,14 +278,14 @@ def each(*argv, &block)
     obj = self
     if 0 < argv.length
       obj = self.dup
-      args = obj.args
+      args = obj.instance_eval{@args}
       if !args.empty?
         args = args.dup
         args.concat argv
       else
         args = argv.dup
       end
-      obj.args = args
+      obj.instance_eval{@args = args}
     end
     return obj unless block
     enumerator_block_call(&block)
