Add missing bits of FrozenError after merging parallel exceptions.

jruby · Mar 20, 2018 · 659a2c5 · 659a2c5
1 parent c9a3691
commit 659a2c5
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 9 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -1567,6 +1567,7 @@ public IRubyObject[] getNilPrefilledArray() {
     private void initExceptions() {
         ifAllowed("StandardError",          (ruby) -> standardError = RubyStandardError.define(ruby, exceptionClass));
         ifAllowed("RubyError",              (ruby) -> runtimeError = RubyRuntimeError.define(ruby, standardError));
+        ifAllowed("FrozenError",            (ruby) -> frozenError = RubyFrozenError.define(ruby, runtimeError));
         ifAllowed("IOError",                (ruby) -> ioError = RubyIOError.define(ruby, standardError));
         ifAllowed("ScriptError",            (ruby) -> scriptError = RubyScriptError.define(ruby, exceptionClass));
         ifAllowed("RangeError",             (ruby) -> rangeError = RubyRangeError.define(ruby, standardError));

diff --git a/core/src/main/java/org/jruby/RubyFrozenError.java b/core/src/main/java/org/jruby/RubyFrozenError.java
@@ -0,0 +1,53 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby;
+
+import org.jruby.anno.JRubyClass;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.exceptions.FrozenError;
+
+/**
+ * The Java representation of a Ruby FrozenError.
+ *
+ * @see FrozenError
+ */
+@JRubyClass(name="FrozenError", parent="RuntimeError")
+public class RubyFrozenError extends RubyRuntimeError {
+    protected RubyFrozenError(Ruby runtime, RubyClass exceptionClass) {
+        super(runtime, exceptionClass);
+    }
+
+    static RubyClass define(Ruby runtime, RubyClass exceptionClass) {
+        RubyClass frozenErrorClass = runtime.defineClass("FrozenError", exceptionClass, (r, klass) -> new RubyFrozenError(runtime, klass));
+
+        return frozenErrorClass;
+    }
+
+    protected RaiseException constructThrowable(String message) {
+        return new FrozenError(message, this);
+    }
+}
diff --git a/core/src/main/java/org/jruby/exceptions/FrozenError.java b/core/src/main/java/org/jruby/exceptions/FrozenError.java
@@ -0,0 +1,39 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+package org.jruby.exceptions;
+
+import org.jruby.RubyFrozenError;
+
+/**
+ * Represents a Ruby FrozenError as a throwable Java exception.
+ *
+ * @see RubyFrozenError
+ */
+public class FrozenError extends StandardError {
+    public FrozenError(String message, RubyFrozenError exception) {
+        super(message, exception);
+    }
+}
diff --git a/core/src/main/java/org/jruby/exceptions/RuntimeError.java b/core/src/main/java/org/jruby/exceptions/RuntimeError.java
@@ -11,15 +11,6 @@
  * implied. See the License for the specific language governing
  * rights and limitations under the License.
  *
- * Copyright (C) 2001 Alan Moore <alan_moore@gmx.net>
- * Copyright (C) 2001-2004 Jan Arne Petersen <jpetersen@uni-bonn.de>
- * Copyright (C) 2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
- * Copyright (C) 2002-2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
- * Copyright (C) 2004 Thomas E Enebo <enebo@acm.org>
- * Copyright (C) 2004 Joey Gibson <joey@joeygibson.com>
- * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
- * Copyright (C) 2005 Charles O Nutter <headius@headius.com>
- *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),