misc cleanup

Author: Nicolas Laurent

src/main/java/org/truffleruby/language/constants/OrAssignConstantNode.java

@@ -55,7 +55,7 @@ public Object execute(VirtualFrame frame) {
         final RubyConstant constant = readConstant.getConstantIfDefined(module);
         final Object value = constant == null
                 ? null
-                : readConstant.execute(frame, module, constant);
+                : readConstant.getConstant(module, constant);
 
         // Write if the constant is undefined or if its value is falsy.
         if (constant == null || !castToBoolean(value)) {

src/main/java/org/truffleruby/language/constants/ReadConstantNode.java

@@ -41,20 +41,15 @@ public ReadConstantNode(RubyNode moduleNode, String name) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final Object moduleObject = moduleNode.execute(frame);
-        return lookupAndGetConstant(checkModule(moduleObject));
-    }
-
-    public Object execute(VirtualFrame frame, RubyModule module, RubyConstant constant) {
-        return getConstant(module, constant);
+        return lookupAndGetConstant(evaluateModule(frame));
     }
 
     private Object lookupAndGetConstant(RubyModule module) {
         return getGetConstantNode()
                 .lookupAndResolveConstant(LexicalScope.IGNORE, module, name, getLookupConstantNode());
     }
 
-    private Object getConstant(RubyModule module, RubyConstant constant) {
+    public Object getConstant(RubyModule module, RubyConstant constant) {
         return getGetConstantNode()
                 .executeGetConstant(LexicalScope.IGNORE, module, name, constant, getLookupConstantNode());
     }
@@ -95,7 +90,7 @@ public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext c
             final RubyConstant constant = getConstantIfDefined(module);
             return constant == null ? nil : coreStrings().CONSTANT.createInstance(getContext());
         } catch (RaiseException e) {
-            return nil; // MRI swallows all exceptions in defined? (MRI Bug#5786)
+            return nil; // MRI swallows all exceptions in defined? (https://bugs.ruby-lang.org/issues/5786)
         }
     }
 

src/main/java/org/truffleruby/language/constants/WriteConstantNode.java

@@ -61,8 +61,7 @@ public void assign(VirtualFrame frame, Object value) {
     }
 
     private void assign(RubyModule module, Object value) {
-        final RubyConstant previous = module.fields
-                .setConstant(getContext(), this, name, value);
+        final RubyConstant previous = module.fields.setConstant(getContext(), this, name, value);
         if (previous != null && previous.hasValue()) {
             warnAlreadyInitializedConstant(module, name, previous.getSourceSection());
         }