Revision: 1194 http://trac.macosforge.org/projects/ruby/changeset/1194 Author: lsansonetti@apple.com Date: 2009-03-26 18:19:25 -0700 (Thu, 26 Mar 2009) Log Message: ----------- now accept splats in a rescue argument Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 01:06:32 UTC (rev 1193) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 01:19:25 UTC (rev 1194) @@ -3790,12 +3790,16 @@ } else { NODE *n2 = n->nd_args; - assert(nd_type(n2) == NODE_ARRAY); - while (n2 != NULL) { - exceptions_to_catch.push_back(compile_node( - n2->nd_head)); - n2 = n2->nd_next; + if (nd_type(n2) == NODE_ARRAY) { + while (n2 != NULL) { + exceptions_to_catch.push_back(compile_node( + n2->nd_head)); + n2 = n2->nd_next; + } } + else { + exceptions_to_catch.push_back(compile_node(n2)); + } } Function *isEHActiveFunc = NULL; @@ -5855,12 +5859,21 @@ unsigned char active = 0; va_start(ar, argc); - for (int i = 0; i < argc; ++i) { - VALUE klass = va_arg(ar, VALUE); - if (rb_obj_is_kind_of(GET_VM()->current_exception, klass)) { - active = 1; - break; + for (int i = 0; i < argc && active == 0; ++i) { + VALUE obj = va_arg(ar, VALUE); + if (TYPE(obj) == T_ARRAY) { + for (int j = 0, count = RARRAY_LEN(obj); j < count; ++j) { + VALUE obj2 = RARRAY_AT(obj, j); + if (rb_obj_is_kind_of(GET_VM()->current_exception, obj2)) { + active = 1; + } + } } + else { + if (rb_obj_is_kind_of(GET_VM()->current_exception, obj)) { + active = 1; + } + } } va_end(ar);