[GR-18163] Process.exit should use "exit" for the message

PullRequest: truffleruby/3254

Author: eregon

spec/ruby/core/exception/system_exit_spec.rb

@@ -1,6 +1,48 @@
 require_relative '../../spec_helper'
 
 describe "SystemExit" do
+  describe "#initialize" do
+    it "accepts a status and message" do
+      exc = SystemExit.new(42, "message")
+      exc.status.should == 42
+      exc.message.should == "message"
+
+      exc = SystemExit.new(true, "message")
+      exc.status.should == 0
+      exc.message.should == "message"
+
+      exc = SystemExit.new(false, "message")
+      exc.status.should == 1
+      exc.message.should == "message"
+    end
+
+    it "accepts a status only" do
+      exc = SystemExit.new(42)
+      exc.status.should == 42
+      exc.message.should == "SystemExit"
+
+      exc = SystemExit.new(true)
+      exc.status.should == 0
+      exc.message.should == "SystemExit"
+
+      exc = SystemExit.new(false)
+      exc.status.should == 1
+      exc.message.should == "SystemExit"
+    end
+
+    it "accepts a message only" do
+      exc = SystemExit.new("message")
+      exc.status.should == 0
+      exc.message.should == "message"
+    end
+
+    it "accepts no arguments" do
+      exc = SystemExit.new
+      exc.status.should == 0
+      exc.message.should == "SystemExit"
+    end
+  end
+
   it "sets the exit status and exits silently when raised" do
     code = 'raise SystemExit.new(7)'
     result = ruby_exe(code, args: "2>&1", exit_status: 7)

spec/ruby/shared/process/exit.rb

@@ -21,6 +21,12 @@
     end
   end
 
+  it "raises a SystemExit with message 'exit'" do
+    -> { @object.exit }.should raise_error(SystemExit) { |e|
+      e.message.should == "exit"
+    }
+  end
+
   it "tries to convert the passed argument to an Integer using #to_int" do
     obj = mock('5')
     obj.should_receive(:to_int).and_return(5)

src/main/ruby/truffleruby/core/exception.rb

@@ -247,55 +247,30 @@ def initialize(*args)
 end
 
 class SystemExit < Exception
+  def initialize(status = true, message = nil)
+    case status
+    when true
+      status = Process::EXIT_SUCCESS
+    when false
+      status = Process::EXIT_FAILURE
+    else
+      converted = Truffle::Type.rb_check_to_integer(status, :to_int)
+      if Primitive.nil?(converted)
+        message = status
+        status = Process::EXIT_SUCCESS
+      else
+        status = converted
+      end
+    end
 
-  ##
-  # Process exit status if this exception is raised
-
-  ##
-  # Creates a SystemExit exception with optional status and message.  If the
-  # status is omitted, Process::EXIT_SUCCESS is used.
-  #--
-  # *args is used to simulate optional prepended argument like MRI
-
-  def initialize(*args)
-    status = if args.empty?
-               Process::EXIT_SUCCESS
-             else
-               case args[0]
-               when true
-                 args.shift
-                 Process::EXIT_SUCCESS
-               when false
-                 args.shift
-                 Process::EXIT_FAILURE
-               else
-                 converted = Truffle::Type.rb_check_to_integer(args[0], :to_int)
-                 if Primitive.nil?(converted)
-                   Process::EXIT_SUCCESS
-                 else
-                   args.shift
-                   if converted == 0
-                     Process::EXIT_SUCCESS
-                   else
-                     converted
-                   end
-                 end
-               end
-             end
-    super(*args)
+    message ? super(message) : super()
 
     Primitive.system_exit_set_status(self, status)
   end
 
-  ##
-  # Returns true is exiting successfully, false if not. A successful exit is
-  # one with a status equal to 0 (zero). Any other status is considered a
-  # unsuccessful exit.
-
   def success?
     status == Process::EXIT_SUCCESS
   end
-
 end
 
 

src/main/ruby/truffleruby/core/process.rb

@@ -69,8 +69,6 @@ module Constants
 
   FFI = Truffle::FFI
 
-  # Terminate with given status code.
-  #
   def self.exit(code=0)
     case code
     when true
@@ -81,7 +79,7 @@ def self.exit(code=0)
       code = Truffle::Type.coerce_to code, Integer, :to_int
     end
 
-    raise SystemExit, code
+    raise SystemExit.new(code, 'exit')
   end
 
   def self.exit!(code=1)