1 files changed, 200 insertions, 14 deletions

diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb
index f2da8a9293..34408c0190 100644
--- a/spec/ruby/language/defined_spec.rb
+++ b/spec/ruby/language/defined_spec.rb
@@ -5,21 +5,25 @@ describe "The defined? keyword for literals" do
   it "returns 'self' for self" do
     ret = defined?(self)
     ret.should == "self"
+    ret.frozen?.should == true
   end
 
   it "returns 'nil' for nil" do
     ret = defined?(nil)
     ret.should == "nil"
+    ret.frozen?.should == true
   end
 
   it "returns 'true' for true" do
     ret = defined?(true)
     ret.should == "true"
+    ret.frozen?.should == true
   end
 
   it "returns 'false' for false" do
     ret = defined?(false)
     ret.should == "false"
+    ret.frozen?.should == true
   end
 
   describe "for a literal Array" do
@@ -27,6 +31,7 @@ describe "The defined? keyword for literals" do
     it "returns 'expression' if each element is defined" do
       ret = defined?([Object, Array])
       ret.should == "expression"
+      ret.frozen?.should == true
     end
 
     it "returns nil if one element is not defined" do
@@ -43,9 +48,25 @@ describe "The defined? keyword for literals" do
 end
 
 describe "The defined? keyword when called with a method name" do
+  before :each do
+    ScratchPad.clear
+  end
+
+  it "does not call the method" do
+    defined?(DefinedSpecs.side_effects).should == "method"
+    ScratchPad.recorded.should != :defined_specs_side_effects
+  end
+
+  it "does not execute the arguments" do
+    defined?(DefinedSpecs.any_args(DefinedSpecs.side_effects)).should == "method"
+    ScratchPad.recorded.should != :defined_specs_side_effects
+  end
+
   describe "without a receiver" do
     it "returns 'method' if the method is defined" do
-      defined?(puts).should == "method"
+      ret = defined?(puts)
+      ret.should == "method"
+      ret.frozen?.should == true
     end
 
     it "returns nil if the method is not defined" do
@@ -95,6 +116,11 @@ describe "The defined? keyword when called with a method name" do
       defined?(obj.a_defined_method).should == "method"
     end
 
+    it "returns 'method' for []=" do
+      a = []
+      defined?(a[0] = 1).should == "method"
+    end
+
     it "returns nil if the method is not defined" do
       obj = DefinedSpecs::Basic.new
       defined?(obj.an_undefined_method).should be_nil
@@ -159,6 +185,32 @@ describe "The defined? keyword when called with a method name" do
       ScratchPad.recorded.should == :defined_specs_fixnum_method
     end
   end
+
+  describe "having a throw in the receiver" do
+    it "escapes defined? and performs the throw semantics as normal" do
+      defined_returned = false
+      catch(:out) {
+        # NOTE: defined? behaves differently if it is called in a void context, see below
+        defined?(throw(:out, 42).foo).should == :unreachable
+        defined_returned = true
+      }.should == 42
+      defined_returned.should == false
+    end
+  end
+
+  describe "in a void context" do
+    it "does not execute the receiver" do
+      ScratchPad.record :not_executed
+      defined?(DefinedSpecs.side_effects / 2)
+      ScratchPad.recorded.should == :not_executed
+    end
+
+    it "warns about the void context when parsing it" do
+      -> {
+        eval "defined?(DefinedSpecs.side_effects / 2); 42"
+      }.should complain(/warning: possibly useless use of defined\? in void context/, verbose: true)
+    end
+  end
 end
 
 describe "The defined? keyword for an expression" do
@@ -167,7 +219,9 @@ describe "The defined? keyword for an expression" do
   end
 
   it "returns 'assignment' for assigning a local variable" do
-    defined?(x = 2).should == "assignment"
+    ret = defined?(x = 2)
+    ret.should == "assignment"
+    ret.frozen?.should == true
   end
 
   it "returns 'assignment' for assigning an instance variable" do
@@ -182,6 +236,14 @@ describe "The defined? keyword for an expression" do
     defined?(@@defined_specs_x = 2).should == "assignment"
   end
 
+  it "returns 'assignment' for assigning a constant" do
+    defined?(A = 2).should == "assignment"
+  end
+
+  it "returns 'assignment' for assigning a fully qualified constant" do
+    defined?(Object::A = 2).should == "assignment"
+  end
+
   it "returns 'assignment' for assigning multiple variables" do
     defined?((a, b = 1, 2)).should == "assignment"
   end
@@ -199,7 +261,27 @@ describe "The defined? keyword for an expression" do
   end
 
   it "returns 'assignment' for an expression with '+='" do
-    defined?(x += 2).should == "assignment"
+    defined?(a += 1).should == "assignment"
+    defined?(@a += 1).should == "assignment"
+    defined?(@@a += 1).should == "assignment"
+    defined?($a += 1).should == "assignment"
+    defined?(A += 1).should == "assignment"
+    # fully qualified constant check is moved out into a separate test case
+    defined?(a.b += 1).should == "assignment"
+    defined?(a[:b] += 1).should == "assignment"
+  end
+
+  # https://bugs.ruby-lang.org/issues/20111
+  ruby_version_is ""..."3.4" do
+    it "returns 'expression' for an assigning a fully qualified constant with '+='" do
+      defined?(Object::A += 1).should == "expression"
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "returns 'assignment' for an assigning a fully qualified constant with '+='" do
+      defined?(Object::A += 1).should == "assignment"
+    end
   end
 
   it "returns 'assignment' for an expression with '*='" do
@@ -230,12 +312,90 @@ describe "The defined? keyword for an expression" do
     defined?(x >>= 2).should == "assignment"
   end
 
-  it "returns 'assignment' for an expression with '||='" do
-    defined?(x ||= 2).should == "assignment"
+  context "||=" do
+    it "returns 'assignment' for assigning a local variable with '||='" do
+      defined?(a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning an instance variable with '||='" do
+      defined?(@a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a class variable with '||='" do
+      defined?(@@a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a global variable with '||='" do
+      defined?($a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a constant with '||='" do
+      defined?(A ||= true).should == "assignment"
+    end
+
+    # https://bugs.ruby-lang.org/issues/20111
+    ruby_version_is ""..."3.4" do
+      it "returns 'expression' for assigning a fully qualified constant with '||='" do
+        defined?(Object::A ||= true).should == "expression"
+      end
+    end
+
+    ruby_version_is "3.4" do
+      it "returns 'assignment' for assigning a fully qualified constant with '||='" do
+        defined?(Object::A ||= true).should == "assignment"
+      end
+    end
+
+    it "returns 'assignment' for assigning an attribute with '||='" do
+      defined?(a.b ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a referenced element with '||='" do
+      defined?(a[:b] ||= true).should == "assignment"
+    end
   end
 
-  it "returns 'assignment' for an expression with '&&='" do
-    defined?(x &&= 2).should == "assignment"
+  context "&&=" do
+    it "returns 'assignment' for assigning a local variable with '&&='" do
+      defined?(a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning an instance variable with '&&='" do
+      defined?(@a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a class variable with '&&='" do
+      defined?(@@a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a global variable with '&&='" do
+      defined?($a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a constant with '&&='" do
+      defined?(A &&= true).should == "assignment"
+    end
+
+    # https://bugs.ruby-lang.org/issues/20111
+    ruby_version_is ""..."3.4" do
+      it "returns 'expression' for assigning a fully qualified constant with '&&='" do
+        defined?(Object::A &&= true).should == "expression"
+      end
+    end
+
+    ruby_version_is "3.4" do
+      it "returns 'assignment' for assigning a fully qualified constant with '&&='" do
+        defined?(Object::A &&= true).should == "assignment"
+      end
+    end
+
+    it "returns 'assignment' for assigning an attribute with '&&='" do
+      defined?(a.b &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a referenced element with '&&='" do
+      defined?(a[:b] &&= true).should == "assignment"
+    end
   end
 
   it "returns 'assignment' for an expression with '**='" do
@@ -470,7 +630,9 @@ end
 
 describe "The defined? keyword for variables" do
   it "returns 'local-variable' when called with the name of a local variable" do
-    DefinedSpecs::Basic.new.local_variable_defined.should == "local-variable"
+    ret = DefinedSpecs::Basic.new.local_variable_defined
+    ret.should == "local-variable"
+    ret.frozen?.should == true
   end
 
   it "returns 'local-variable' when called with the name of a local variable assigned to nil" do
@@ -486,7 +648,9 @@ describe "The defined? keyword for variables" do
   end
 
   it "returns 'instance-variable' for an instance variable that has been assigned" do
-    DefinedSpecs::Basic.new.instance_variable_defined.should == "instance-variable"
+    ret = DefinedSpecs::Basic.new.instance_variable_defined
+    ret.should == "instance-variable"
+    ret.frozen?.should == true
   end
 
   it "returns 'instance-variable' for an instance variable that has been assigned to nil" do
@@ -502,7 +666,9 @@ describe "The defined? keyword for variables" do
   end
 
   it "returns 'global-variable' for a global variable that has been assigned nil" do
-    DefinedSpecs::Basic.new.global_variable_defined_as_nil.should == "global-variable"
+    ret = DefinedSpecs::Basic.new.global_variable_defined_as_nil
+    ret.should == "global-variable"
+    ret.frozen?.should == true
   end
 
   # MRI appears to special case defined? for $! and $~ in that it returns
@@ -674,7 +840,9 @@ describe "The defined? keyword for variables" do
   # get to the defined? call so it really has nothing to do with 'defined?'.
 
   it "returns 'class variable' when called with the name of a class variable" do
-    DefinedSpecs::Basic.new.class_variable_defined.should == "class variable"
+    ret = DefinedSpecs::Basic.new.class_variable_defined
+    ret.should == "class variable"
+    ret.frozen?.should == true
   end
 
   it "returns 'local-variable' when called with the name of a block local" do
@@ -685,7 +853,9 @@ end
 
 describe "The defined? keyword for a simple constant" do
   it "returns 'constant' when the constant is defined" do
-    defined?(DefinedSpecs).should == "constant"
+    ret = defined?(DefinedSpecs)
+    ret.should == "constant"
+    ret.frozen?.should == true
   end
 
   it "returns nil when the constant is not defined" do
@@ -941,12 +1111,26 @@ describe "The defined? keyword for yield" do
   end
 
   it "returns 'yield' if a block is passed to a method not taking a block parameter" do
-    DefinedSpecs::Basic.new.yield_block.should == "yield"
+    ret = DefinedSpecs::Basic.new.yield_block
+    ret.should == "yield"
+    ret.frozen?.should == true
   end
 
   it "returns 'yield' if a block is passed to a method taking a block parameter" do
     DefinedSpecs::Basic.new.yield_block_parameter.should == "yield"
   end
+
+  it "returns 'yield' when called within a block" do
+    def yielder
+      yield
+    end
+
+    def call_defined
+      yielder { defined?(yield) }
+    end
+
+    call_defined() { }.should == "yield"
+  end
 end
 
 describe "The defined? keyword for super" do
@@ -972,7 +1156,9 @@ describe "The defined? keyword for super" do
     end
 
     it "returns 'super' when a superclass method exists" do
-      DefinedSpecs::Super.new.method_no_args.should == "super"
+      ret = DefinedSpecs::Super.new.method_no_args
+      ret.should == "super"
+      ret.frozen?.should == true
     end
 
     it "returns 'super' from a block when a superclass method exists" do