@@ -43,12 +43,13 @@ public class Error_c public function Init_Exception():void { rb_eException = rc.class_c.rb_define_class("Exception", rc.object_c.rb_cObject); - //rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1); + rc.class_c.rb_define_singleton_method(rb_eException, "exception", + rc.object_c.rb_class_new_instance, -1); //rb_define_method(rb_eException, "exception", exc_exception, -1); rc.class_c.rb_define_method(rb_eException, "initialize", exc_initialize, -1); + rc.class_c.rb_define_method(rb_eException, "to_s", exc_to_s, 0); /* rb_define_method(rb_eException, "==", exc_equal, 1); - rb_define_method(rb_eException, "to_s", exc_to_s, 0); rb_define_method(rb_eException, "message", exc_message, 0); rb_define_method(rb_eException, "inspect", exc_inspect, 0); rb_define_method(rb_eException, "backtrace", exc_backtrace, 0); @@ -61,8 +62,8 @@ public class Error_c rb_eInterrupt = rc.class_c.rb_define_class("Interrupt", rb_eSignal); rb_eStandardError = rc.class_c.rb_define_class("StandardError", rb_eException); - rc.error_c.rb_eTypeError = rc.class_c.rb_define_class("TypeError", rb_eStandardError); - rc.error_c.rb_eArgError = rc.class_c.rb_define_class("ArgumentError", rb_eStandardError); + rb_eTypeError = rc.class_c.rb_define_class("TypeError", rb_eStandardError); + rb_eArgError = rc.class_c.rb_define_class("ArgumentError", rb_eStandardError); rb_eIndexError = rc.class_c.rb_define_class("IndexError", rb_eStandardError); rb_eKeyError = rc.class_c.rb_define_class("KeyError", rb_eIndexError); rb_eRangeError = rc.class_c.rb_define_class("RangeError", rb_eStandardError); @@ -109,7 +110,7 @@ public class Error_c var arg:Value; //rb_scan_args(argc, argv, "01", &arg); - arg = argv.get_at(1); + arg = argv.get_at(0); rc.variable_c.rb_iv_set(exc, "mesg", arg); rc.variable_c.rb_iv_set(exc, "bt", rc.Qnil); @@ -244,6 +245,17 @@ public class Error_c return rb_exc_new(etype, s); } + // error.c:415 + public function + exc_to_s(exc:Value):Value + { + var mesg:Value = rc.variable_c.rb_attr_get(exc, rc.parse_y.rb_intern("mesg")); + + if (rc.NIL_P(mesg)) return rc.variable_c.rb_class_name(rc.CLASS_OF(exc)); + if (rc.OBJ_TAINTED(exc)) rc.OBJ_TAINT(mesg); + return mesg; + } + // error.c:645 public function name_err_initialize(argc:int, argv:StackPointer, self:Value):Value flash/src/ruby/internals/Error_c.as @@ -77,6 +77,52 @@ public class Eval_c public function rb_make_exception(argc:int, argv:StackPointer):Value { + var mesg:Value; + var exception:int; + // special value here + var n:int = -1; + + mesg = rc.Qnil; + switch (argc) { + case 0: + mesg = rc.Qnil; + break; + case 1: + if (rc.NIL_P(argv.get_at(0))) + break; + if (rc.TYPE(argv.get_at(0)) == Value.T_STRING) { + mesg = rc.error_c.rb_exc_new3(rc.error_c.rb_eRuntimeError, argv.get_at(0)); + break; + } + n = 0; + // goto exception_call; + case 2: + case 3: + if (n != 0) { + n = 1; + } + // exception_call: + exception = rc.CONST_ID("exception"); + if (!rc.vm_method_c.rb_respond_to(argv.get_at(0), exception)) { + rc.error_c.rb_raise(rc.error_c.rb_eTypeError, "exception class/object expected"); + } + mesg = rc.vm_eval_c.rb_funcall(argv.get_at(0), exception, n, argv.get_at(1)); + break; + default: + rc.error_c.rb_raise(rc.error_c.rb_eArgError, "wrong number of arguments"); + break; + } + if (argc > 0) { + if (!rc.object_c.rb_obj_is_kind_of(mesg, rc.error_c.rb_eException)) { + rc.error_c.rb_raise(rc.error_c.rb_eTypeError, "exception object expected"); + } + if (argc > 2) { + // set_backtrace(mesg, argv.get_at(2)); + trace("skipping set_backtrace"); + } + } + return mesg; + /* if (argc == 1 && rc.TYPE(argv.get_at(0)) == Value.T_STRING) { return rc.error_c.rb_exc_new3(rc.error_c.rb_eRuntimeError, argv.get_at(0)); } else { @@ -84,6 +130,7 @@ public class Eval_c return rc.error_c.rb_exc_new3(rc.error_c.rb_eRuntimeError, rc.string_c.rb_str_new("rb_make_exception: doesn't handle this case yet.")); } + */ } // eval.c:529 flash/src/ruby/internals/Eval_c.as @@ -335,6 +335,7 @@ public class String_c rb_cSymbol = rc.class_c.rb_define_class("Symbol", rc.object_c.rb_cObject); // TODO: Lots of Symbol methods + rc.class_c.rb_define_method(rb_cString, "+", rb_str_plus, 1); } flash/src/ruby/internals/String_c.as @@ -1,5 +1,26 @@ # Testing exceptions +puts "start" +begin + raise StandardError, "with description" + puts "** didn't raise" +rescue NoMethodError + puts "** caught NoMethodError" +rescue RuntimeError + puts "** caught RuntimeError" +rescue StandardError => bob + puts "caught StandardError: "+bob.to_s +end + +begin + raise "runtime error" + puts "** didn't raise" +rescue NoMethodError + puts "** caught NoMethodError" +rescue + puts "caught any error" +end + puts "Before Raise" begin raise "Something" @@ -11,9 +32,9 @@ end begin "corey".i_do_not_exist rescue NoMethodError - puts "wrong place" -rescue puts "right place" +rescue + puts "wrong place" end class A @@ -31,3 +52,4 @@ begin rescue puts "Should rescue" end + research/exceptions.rb 3b563b045297da86c50eb60b73fc76b7205724ae Jonathan Branam github@jonathanbranam.net http://github.com/jonathanbranam/redsun/commit/c9fbb5d6bb895d4afa166904343edaf39d455768 c9fbb5d6bb895d4afa166904343edaf39d455768 2008-12-15T19:49:31-08:00 2008-12-15T19:49:31-08:00 Supporting 2 param format for raise. Some fixes and support for 2 parameter format for raise. 5484cea4ffcc28579701d2234049ade8c03f9183 Jonathan Branam github@jonathanbranam.net