Cleanups

Author: eregon

lib/cext/include/ruby/internal/intern/time.h

@@ -121,9 +121,9 @@ void rb_tr_time_interval(VALUE num, struct timeval *result);
  */
 #ifdef TRUFFLERUBY
 static inline struct timeval rb_time_interval(VALUE num) {
-  struct timeval result;
-	rb_tr_time_interval(num, &result);
-	return result;
+    struct timeval result;
+    rb_tr_time_interval(num, &result);
+    return result;
 }
 #else
 struct timeval rb_time_interval(VALUE num);
@@ -144,9 +144,9 @@ void rb_tr_time_timeval(VALUE time, struct timeval *result);
  */
 #ifdef TRUFFLERUBY
 static inline struct timeval rb_time_timeval(VALUE time) {
-  struct timeval result;
-	rb_tr_time_timeval(time, &result);
-	return result;
+    struct timeval result;
+    rb_tr_time_timeval(time, &result);
+    return result;
 }
 #else
 struct timeval rb_time_timeval(VALUE time);
@@ -165,9 +165,9 @@ void rb_tr_time_timespec(VALUE time, struct timespec *result);
  */
 #ifdef TRUFFLERUBY
 static inline struct timespec rb_time_timespec(VALUE time) {
-  struct timespec result;
-	rb_tr_time_timespec(time, &result);
-	return result;
+    struct timespec result;
+    rb_tr_time_timespec(time, &result);
+    return result;
 }
 #else
 struct timespec rb_time_timespec(VALUE time);

lib/cext/include/truffleruby/truffleruby.h

@@ -306,7 +306,7 @@ static inline int rb_tr_scan_args_kw_int(int kw_flag, int argc, VALUE *argv, str
   }
 
   if (argn < argc) {
-	rb_error_arity(argc, n_mand, parse_data.rest ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
+    rb_error_arity(argc, n_mand, parse_data.rest ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
   }
 
   return argc;

src/main/c/cext/exception.c

@@ -26,7 +26,7 @@ VALUE rb_exc_new_str(VALUE exception_class, VALUE message) {
 }
 
 void rb_exc_raise(VALUE exception) {
-  RUBY_CEXT_INVOKE_NO_WRAP("rb_exc_raise", exception); // TODO
+  RUBY_CEXT_INVOKE_NO_WRAP("rb_exc_raise", exception);
   UNREACHABLE;
 }
 

src/main/c/cext/globals.c

@@ -29,7 +29,6 @@ void rb_gvar_var_setter(VALUE val, ID id, VALUE *data) {
 }
 
 void rb_define_hooked_variable(const char *name, VALUE *var, rb_gvar_getter_t *getter, rb_gvar_setter_t *setter) {
-// void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(ANYARGS), void (*setter)(ANYARGS)) {
   if (!getter) {
     getter = rb_gvar_var_getter;
   }

tool/generate-cext-trampoline.rb

@@ -247,11 +247,4 @@ def struct_by_value?(type)
     f.puts "  impl_#{function_name} = get_libtruffleruby_function(\"#{function_name}\");"
   end
   f.puts "}"
-
-#   f.puts
-#   f.puts <<C
-# void rb_tr_trampoline_init_globals(void* impl_rb_tr_longwrap) {
-#   rb_tr_longwrap = impl_rb_tr_longwrap;
-# }
-# C
 end

tool/jt.rb

@@ -2695,16 +2695,6 @@ def check_polyglot_methods
     end
   end
 
-  def check_cext_files
-    run_ruby('tool/generate-cext-trampoline.rb')
-    diff = sh 'git', 'diff', 'src/main/c/cext-trampoline/trampoline.c', capture: :out
-    unless diff.empty?
-      STDERR.puts 'DIFF:'
-      STDERR.puts diff
-      abort "src/main/c/cext-trampoline/trampoline.c must be regenerated by 'tool/generate-cext-trampoline.rb'"
-    end
-  end
-
   private def check_source_files
     diff = sh 'git', 'diff', capture: :out
     unless diff.empty?
@@ -3076,7 +3066,6 @@ def check_generated_files
     check_parser
     check_options
     check_polyglot_methods
-    check_cext_files
   end
 
   def lint(*args)