[GR-34365] Module#attr_* methods now return an array of method names (#2498)

PullRequest: truffleruby/2969

Author: eregon

CHANGELOG.md

@@ -15,6 +15,7 @@ Compatibility:
 * Implement `rb_sprintf` in our format compiler to provide consistent formatting across C standard libraries.
 * Update `defined?` to return frozen strings (#2450).
 * Use compensated summation for `{Array,Enumerable}#sum` when floating point values are included.
+* `Module#attr_*` methods now return an array of method names (#2498, @gogainda).
 
 Performance:
 

spec/tags/core/module/attr_accessor_tags.txt

@@ -0,0 +1 @@
+fails:Module#attr_accessor returns nil

spec/tags/core/module/attr_reader_tags.txt

@@ -0,0 +1 @@
+fails:Module#attr_reader returns nil

spec/tags/core/module/attr_tags.txt

@@ -0,0 +1 @@
+fails:Module#attr returns nil

spec/tags/core/module/attr_writer_tags.txt

@@ -0,0 +1 @@
+fails:Module#attr_writer returns nil

spec/truffleruby.mspec

@@ -96,6 +96,10 @@ class MSpecScript
     spec/ruby/core/mutex/owned_spec.rb
     spec/ruby/core/fiber/raise_spec.rb
     spec/ruby/core/process/status/wait_spec.rb
+    spec/ruby/core/module/attr_spec.rb
+    spec/ruby/core/module/attr_reader_spec.rb
+    spec/ruby/core/module/attr_writer_spec.rb
+    spec/ruby/core/module/attr_accessor_spec.rb
   ]
 
   set :tags_patterns, [

src/main/java/org/truffleruby/core/module/ModuleNodes.java

@@ -439,16 +439,17 @@ enum Accessor {
             BOTH
         }
 
-        protected void generateAccessor(Frame callerFrame, RubyModule module, Object[] names, Accessor accessor,
-                RootCallTarget target) {
+        protected Object[] generateAccessors(Frame callerFrame, RubyModule module, Object[] names,
+                Accessor accessor, RootCallTarget target) {
             needCallerFrame(callerFrame, target);
             final Visibility visibility = DeclarationContext
                     .findVisibilityCheckSelfAndDefaultDefinee(module, callerFrame);
-            createAccessors(module, names, accessor, visibility);
+            return createAccessors(module, names, accessor, visibility);
         }
 
         @TruffleBoundary
-        private void createAccessors(RubyModule module, Object[] names, Accessor accessor, Visibility visibility) {
+        private Object[] createAccessors(RubyModule module, Object[] names, Accessor accessor,
+                Visibility visibility) {
             final Node currentNode = getNode();
             final SourceSection sourceSection;
             if (currentNode != null) {
@@ -457,19 +458,22 @@ private void createAccessors(RubyModule module, Object[] names, Accessor accesso
                 sourceSection = CoreLibrary.UNAVAILABLE_SOURCE_SECTION;
             }
 
+            Object[] generatedMethods = accessor == BOTH ? new Object[names.length * 2] : new Object[names.length];
+            int i = 0;
             for (Object nameObject : names) {
                 final String name = NameToJavaStringNode.getUncached().execute(nameObject);
                 if (accessor == BOTH) {
-                    createAccessor(module, name, READER, visibility, sourceSection);
-                    createAccessor(module, name, WRITER, visibility, sourceSection);
+                    generatedMethods[i++] = createAccessor(module, name, READER, visibility, sourceSection);
+                    generatedMethods[i++] = createAccessor(module, name, WRITER, visibility, sourceSection);
                 } else {
-                    createAccessor(module, name, accessor, visibility, sourceSection);
+                    generatedMethods[i++] = createAccessor(module, name, accessor, visibility, sourceSection);
                 }
             }
+            return generatedMethods;
         }
 
         @TruffleBoundary
-        private void createAccessor(RubyModule module, String name, Accessor accessor, Visibility visibility,
+        private RubySymbol createAccessor(RubyModule module, String name, Accessor accessor, Visibility visibility,
                 SourceSection sourceSection) {
             assert accessor != BOTH;
             final Arity arity = accessor == READER ? Arity.NO_ARGUMENTS : Arity.ONE_REQUIRED;
@@ -516,6 +520,7 @@ private void createAccessor(RubyModule module, String name, Accessor accessor, V
                     nil);
 
             module.fields.addMethod(getContext(), this, method);
+            return getLanguage().getSymbol(method.getName());
         }
     }
 
@@ -534,8 +539,7 @@ protected Object attr(
                 setter = false;
             }
 
-            generateAccessor(callerFrame, module, names, setter ? BOTH : READER, target);
-            return nil;
+            return createArray(generateAccessors(callerFrame, module, names, setter ? BOTH : READER, target));
         }
 
         @TruffleBoundary
@@ -554,8 +558,7 @@ public abstract static class AttrAccessorNode extends GenerateAccessorNode {
         @Specialization
         protected Object attrAccessor(
                 Frame callerFrame, RubyModule module, Object[] names, Object block, RootCallTarget target) {
-            generateAccessor(callerFrame, module, names, BOTH, target);
-            return nil;
+            return createArray(generateAccessors(callerFrame, module, names, BOTH, target));
         }
     }
 
@@ -565,8 +568,7 @@ public abstract static class AttrReaderNode extends GenerateAccessorNode {
         @Specialization
         protected Object attrReader(
                 Frame callerFrame, RubyModule module, Object[] names, Object block, RootCallTarget target) {
-            generateAccessor(callerFrame, module, names, READER, target);
-            return nil;
+            return createArray(generateAccessors(callerFrame, module, names, READER, target));
         }
     }
 
@@ -576,8 +578,7 @@ public abstract static class AttrWriterNode extends GenerateAccessorNode {
         @Specialization
         protected Object attrWriter(
                 Frame callerFrame, RubyModule module, Object[] names, Object block, RootCallTarget target) {
-            generateAccessor(callerFrame, module, names, WRITER, target);
-            return nil;
+            return createArray(generateAccessors(callerFrame, module, names, WRITER, target));
         }
     }