Define rb_eFatal for C extensions

PullRequest: truffleruby/527

Author: eregon

lib/cext/include/truffleruby/constants.h

@@ -1,4 +1,4 @@
-// From tool/generate-cext-constants.rb
+// From ./tool/generate-cext-constants.rb
 
 VALUE rb_tr_get_undef(void);
 VALUE rb_tr_get_true(void);
@@ -67,6 +67,7 @@ VALUE rb_tr_get_ThreadError(void);
 VALUE rb_tr_get_WaitReadable(void);
 VALUE rb_tr_get_WaitWritable(void);
 VALUE rb_tr_get_ZeroDivError(void);
+VALUE rb_tr_get_eFatal(void);
 VALUE rb_tr_get_stdin(void);
 VALUE rb_tr_get_stdout(void);
 VALUE rb_tr_get_stderr(void);
@@ -138,6 +139,7 @@ VALUE rb_tr_get_default_rs(void);
 #define rb_mWaitReadable rb_tr_get_WaitReadable()
 #define rb_mWaitWritable rb_tr_get_WaitWritable()
 #define rb_eZeroDivError rb_tr_get_ZeroDivError()
+#define rb_eFatal rb_tr_get_eFatal()
 #define rb_stdin rb_tr_get_stdin()
 #define rb_stdout rb_tr_get_stdout()
 #define rb_stderr rb_tr_get_stderr()

lib/truffle/truffle/cext_constants.rb

@@ -1,4 +1,4 @@
-# From tool/generate-cext-constants.rb
+# From ./tool/generate-cext-constants.rb
 
 module Truffle::CExt
   def Qundef
@@ -269,6 +269,10 @@ def rb_eZeroDivError
     ZeroDivisionError
   end
 
+  def rb_eFatal
+    Truffle::CExt.rb_const_get(Object, "fatal")
+  end
+
   def rb_stdin
     $stdin
   end

src/main/c/cext/cext_constants.c

@@ -268,6 +268,10 @@ VALUE rb_tr_get_ZeroDivError(void) {
   return RUBY_CEXT_INVOKE("rb_eZeroDivError");
 }
 
+VALUE rb_tr_get_eFatal(void) {
+  return RUBY_CEXT_INVOKE("rb_eFatal");
+}
+
 VALUE rb_tr_get_stdin(void) {
   return RUBY_CEXT_INVOKE("rb_stdin");
 }

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -335,6 +335,9 @@ public CoreLibrary(RubyContext context) {
         exceptionClass = defineClass("Exception");
         Layouts.CLASS.setInstanceFactoryUnsafe(exceptionClass, Layouts.EXCEPTION.createExceptionShape(exceptionClass, exceptionClass));
 
+        // fatal
+        defineClass(exceptionClass, "fatal");
+
         // NoMemoryError
         noMemoryErrorClass = defineClass(exceptionClass, "NoMemoryError");
 

tool/generate-cext-constants.rb

@@ -76,6 +76,7 @@
     IO::WaitReadable,
     IO::WaitWritable,
     [ZeroDivisionError, 'ZeroDivError'],
+    ['Truffle::CExt.rb_const_get(Object, "fatal")', 'eFatal'],
     ['$stdin', 'stdin'],
     ['$stdout', 'stdout'],
     ['$stderr', 'stderr'],
@@ -88,7 +89,7 @@
     value, name = const
   else
     value = const
-    
+
     if value.nil?
       name = 'nil'
     elsif value.is_a?(Module)
@@ -97,13 +98,13 @@
       name = value.to_s
     end
   end
-  
+
   if value.nil?
     expr = 'nil'
   else
     expr = value.to_s
   end
-  
+
   if [true, false, nil].include?(value) or name == 'undef'
     tag = 'Q'
   elsif value.is_a?(Class) && (value < Exception || value == Exception)
@@ -115,9 +116,9 @@
   else
     tag = 'rb_'
   end
-  
+
   macro_name = "#{tag}#{name}"
-  
+
   [macro_name, name, expr]
 end