March 2009 - macruby-changes - lists.macosforge.org

[1143] MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb
by source_changes＠macosforge.org 25 Mar '09

25 Mar '09

Revision: 1143 http://trac.macosforge.org/projects/ruby/changeset/1143 Author: lsansonetti(a)apple.com Date: 2009-03-24 19:36:57 -0700 (Tue, 24 Mar 2009) Log Message: ----------- broke a test into 2 tests, one for all versions before 1.9 and one for 1.9 (eloy: feel free to correct this if necessary :)) Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb 2009-03-25 02:35:34 UTC (rev 1142) +++ MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb 2009-03-25 02:36:57 UTC (rev 1143) @@ -175,11 +175,21 @@ ret.should == "super" end - it "returns 'local-variable' when defined? is called on a block var" do - block = Proc.new { |xxx| defined?(xxx) } - ret = block.call(1) - ret.should == 'local-variable(in-block)' + ruby_version_is "" ... "1.8" do + it "returns 'local-variable' when defined? is called on a block var" do + block = Proc.new { |xxx| defined?(xxx) } + ret = block.call(1) + ret.should == 'local-variable(in-block)' + end end + + ruby_version_is "1.9" do + it "returns 'local-variable' when defined? is called on a block var" do + block = Proc.new { |xxx| defined?(xxx) } + ret = block.call(1) + ret.should == 'local-variable' + end + end end it "returns nil for an instance variable not yet accessed" do

1 0

[1142] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 25 Mar '09

25 Mar '09

Revision: 1142 http://trac.macosforge.org/projects/ruby/changeset/1142 Author: lsansonetti(a)apple.com Date: 2009-03-24 19:35:34 -0700 (Tue, 24 Mar 2009) Log Message: ----------- fixed bugs in defined? Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-24 21:49:37 UTC (rev 1141) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-25 02:35:34 UTC (rev 1142) @@ -234,14 +234,6 @@ Function *getSpecialFunc; Function *breakFunc; - VALUE defined_nil; - VALUE defined_self; - VALUE defined_true; - VALUE defined_false; - VALUE defined_expression; - VALUE defined_lvar; - VALUE defined_assignment; - Constant *zeroVal; Constant *oneVal; Constant *twoVal; @@ -291,6 +283,8 @@ Value *compile_defined_expression(NODE *node); Value *compile_dstr(NODE *node); void compile_dead_branch(void); + void compile_landing_pad_header(void); + void compile_landing_pad_footer(void); Value *get_var(ID name, std::map<ID, Value *> &container, bool do_assert) { @@ -514,14 +508,6 @@ current_loop_end_bb = NULL; current_loop_exit_val = NULL; - defined_nil = 0; - defined_self = 0; - defined_true = 0; - defined_false = 0; - defined_expression = 0; - defined_lvar = 0; - defined_assignment = 0; - dispatcherFunc = NULL; fastEqqFunc = NULL; whenSplatFunc = NULL; @@ -1041,65 +1027,41 @@ #define DEFINED_GVAR 2 #define DEFINED_CVAR 3 #define DEFINED_CONST 4 +#define DEFINED_SUPER 5 +#define DEFINED_METHOD 6 Value * RoxorCompiler::compile_defined_expression(NODE *node) { + // Easy cases first. VALUE str = 0; - int defined_mode = -1; - VALUE defined_what = 0; - switch (nd_type(node)) { case NODE_NIL: - if (defined_nil == 0) { - defined_nil = rb_str_new2("nil"); - rb_objc_retain((void *)defined_nil); - } - str = defined_nil; + str = (VALUE)CFSTR("nil"); break; case NODE_SELF: - if (defined_self == 0) { - defined_self = rb_str_new2("self"); - rb_objc_retain((void *)defined_self); - } - str = defined_self; + str = (VALUE)CFSTR("self"); break; case NODE_TRUE: - if (defined_true == 0) { - defined_true = rb_str_new2("true"); - rb_objc_retain((void *)defined_true); - } - str = defined_true; + str = (VALUE)CFSTR("true"); break; case NODE_FALSE: - if (defined_false == 0) { - defined_false = rb_str_new2("false"); - rb_objc_retain((void *)defined_false); - } - str = defined_false; + str = (VALUE)CFSTR("false"); break; case NODE_ARRAY: + case NODE_ZARRAY: case NODE_STR: case NODE_LIT: - case NODE_ZARRAY: - if (defined_expression == 0) { - defined_expression = rb_str_new2("expression"); - rb_objc_retain((void *)defined_expression); - } - str = defined_expression; + str = (VALUE)CFSTR("expression"); break; case NODE_LVAR: case NODE_DVAR: - if (defined_lvar == 0) { - defined_lvar = rb_str_new2("local-variable"); - rb_objc_retain((void *)defined_lvar); - } - str = defined_lvar; + str = (VALUE)CFSTR("local-variable"); break; case NODE_OP_ASGN1: @@ -1115,61 +1077,120 @@ case NODE_CDECL: case NODE_CVDECL: case NODE_CVASGN: - if (defined_assignment == 0) { - defined_assignment = rb_str_new2("assignment"); - rb_objc_retain((void *)defined_assignment); - } - str = defined_assignment; + str = (VALUE)CFSTR("assignment"); break; + } + if (str != 0) { + return ConstantInt::get(RubyObjTy, (long)str); + } + // Now the less easy ones... let's set up an exception handler first + // because we might need to evalute things that will result in an + // exception. + Function *f = bb->getParent(); + BasicBlock *old_rescue_bb = rescue_bb; + BasicBlock *new_rescue_bb = BasicBlock::Create("rescue", f); + BasicBlock *merge_bb = BasicBlock::Create("merge", f); + rescue_bb = new_rescue_bb; + + // Prepare arguments for the runtime. + Value *self = current_self; + VALUE what1 = 0; + Value *what2 = NULL; + int type = 0; + + switch (nd_type(node)) { case NODE_IVAR: - defined_mode = DEFINED_IVAR; - defined_what = (VALUE)node->nd_vid; + type = DEFINED_IVAR; + what1 = (VALUE)node->nd_vid; break; case NODE_GVAR: - defined_mode = DEFINED_GVAR; - defined_what = (VALUE)node->nd_entry; + type = DEFINED_GVAR; + what1 = (VALUE)node->nd_entry; break; case NODE_CVAR: - defined_mode = DEFINED_CVAR; - defined_what = (VALUE)node->nd_vid; + type = DEFINED_CVAR; + what1 = (VALUE)node->nd_vid; break; case NODE_CONST: - defined_mode = DEFINED_CONST; - defined_what = (VALUE)node->nd_vid; + type = DEFINED_CONST; + what1 = (VALUE)node->nd_vid; break; - default: - compile_node_error("unimplemented defined? argument", node); + case NODE_SUPER: + case NODE_ZSUPER: + type = DEFINED_SUPER; + what1 = (VALUE)current_mid; + break; + + case NODE_COLON2: + what2 = compile_node(node->nd_head); + if (rb_is_const_id(node->nd_mid)) { + type = DEFINED_CONST; + what1 = (VALUE)node->nd_mid; + } + else { + type = DEFINED_METHOD; + what1 = (VALUE)node->nd_mid; + } + break; + + case NODE_CALL: + case NODE_VCALL: + case NODE_FCALL: + case NODE_ATTRASGN: + if (nd_type(node) == NODE_CALL + || (nd_type(node) == NODE_ATTRASGN + && node->nd_recv != (NODE *)1)) { + self = compile_node(node->nd_recv); + } + type = DEFINED_METHOD; + what1 = (VALUE)node->nd_mid; + break; } - if (str != 0) { - return ConstantInt::get(RubyObjTy, (long)str); + if (type == 0) { + compile_node_error("unrecognized defined? arg", node); } - else { - assert(defined_mode != -1); - assert(defined_what != 0); - - if (definedFunc == NULL) { - // VALUE rb_vm_defined(VALUE self, int mode, VALUE what); - definedFunc = - cast<Function>(module->getOrInsertFunction("rb_vm_defined", - RubyObjTy, RubyObjTy, Type::Int32Ty, RubyObjTy, - NULL)); - } - std::vector<Value *> params; + if (definedFunc == NULL) { + // VALUE rb_vm_defined(VALUE self, int type, VALUE what, VALUE what2); + definedFunc = cast<Function>(module->getOrInsertFunction( + "rb_vm_defined", + RubyObjTy, RubyObjTy, Type::Int32Ty, RubyObjTy, RubyObjTy, + NULL)); + } - params.push_back(current_self); - params.push_back(ConstantInt::get(Type::Int32Ty, defined_mode)); - params.push_back(ConstantInt::get(RubyObjTy, defined_what)); + std::vector<Value *> params; - return CallInst::Create(definedFunc, params.begin(), params.end(), "", - bb); - } + params.push_back(self); + params.push_back(ConstantInt::get(Type::Int32Ty, type)); + params.push_back(ConstantInt::get(RubyObjTy, what1)); + params.push_back(what2 == NULL ? nilVal : what2); + + // Call the runtime. + Value *val = compile_protected_call(definedFunc, params); + BasicBlock *normal_bb = bb; + BranchInst::Create(merge_bb, bb); + + // The rescue block - here we simply do nothing. + bb = new_rescue_bb; + compile_landing_pad_header(); + compile_landing_pad_footer(); + BranchInst::Create(merge_bb, bb); + + // Now merging. + bb = merge_bb; + PHINode *pn = PHINode::Create(RubyObjTy, "", bb); + pn->addIncoming(val, normal_bb); + pn->addIncoming(nilVal, new_rescue_bb); + + rescue_bb = old_rescue_bb; + + return pn; } Value * @@ -1216,7 +1237,6 @@ return compile_node(node->nd_head); } - // XXX not sure about that... return compile_current_class(); } @@ -1224,11 +1244,67 @@ RoxorCompiler::compile_dead_branch(void) { // To not complicate the compiler even more, let's be very lazy here and - // continue on a dead branch. Hopefully LLVM will be smart enough to eliminate + // continue on a dead branch. Hopefully LLVM is smart enough to eliminate // it at compilation time. bb = BasicBlock::Create("DEAD", bb->getParent()); } +void +RoxorCompiler::compile_landing_pad_header(void) +{ + Function *eh_exception_f = Intrinsic::getDeclaration(module, + Intrinsic::eh_exception); + Value *eh_ptr = CallInst::Create(eh_exception_f, "", bb); + +#if __LP64__ + Function *eh_selector_f = Intrinsic::getDeclaration(module, + Intrinsic::eh_selector_i64); +#else + Function *eh_selector_f = Intrinsic::getDeclaration(module, + Intrinsic::eh_selector_i32); +#endif + + std::vector<Value *> params; + params.push_back(eh_ptr); + Function *__gxx_personality_v0_func = NULL; + if (__gxx_personality_v0_func == NULL) { + __gxx_personality_v0_func = cast<Function>( + module->getOrInsertFunction("__gxx_personality_v0", + PtrTy, NULL)); + } + params.push_back(new BitCastInst(__gxx_personality_v0_func, + PtrTy, "", bb)); + params.push_back(compile_const_pointer(NULL)); + + CallInst::Create(eh_selector_f, params.begin(), params.end(), + "", bb); + + Function *beginCatchFunc = NULL; + if (beginCatchFunc == NULL) { + // void *__cxa_begin_catch(void *); + beginCatchFunc = cast<Function>( + module->getOrInsertFunction("__cxa_begin_catch", + Type::VoidTy, PtrTy, NULL)); + } + params.clear(); + params.push_back(eh_ptr); + CallInst::Create(beginCatchFunc, params.begin(), params.end(), + "", bb); +} + +void +RoxorCompiler::compile_landing_pad_footer(void) +{ + Function *endCatchFunc = NULL; + if (endCatchFunc == NULL) { + // void __cxa_end_catch(void); + endCatchFunc = cast<Function>( + module->getOrInsertFunction("__cxa_end_catch", + Type::VoidTy, NULL)); + } + CallInst::Create(endCatchFunc, "", bb); +} + Value * RoxorCompiler::compile_optimized_dispatch_call(SEL sel, int argc, std::vector<Value *> &params) { @@ -3583,56 +3659,19 @@ // Landing pad header. bb = new_rescue_bb; - Function *eh_exception_f = Intrinsic::getDeclaration(module, Intrinsic::eh_exception); - Value *eh_ptr = CallInst::Create(eh_exception_f, "", bb); + compile_landing_pad_header(); -#if __LP64__ - Function *eh_selector_f = Intrinsic::getDeclaration(module, Intrinsic::eh_selector_i64); -#else - Function *eh_selector_f = Intrinsic::getDeclaration(module, Intrinsic::eh_selector_i32); -#endif - - std::vector<Value *> params; - params.push_back(eh_ptr); - Function *__gxx_personality_v0_func = NULL; - if (__gxx_personality_v0_func == NULL) { - __gxx_personality_v0_func = cast<Function>( - module->getOrInsertFunction("__gxx_personality_v0", - PtrTy, NULL)); - } - params.push_back(new BitCastInst(__gxx_personality_v0_func, PtrTy, "", bb)); - params.push_back(compile_const_pointer(NULL)); - - CallInst::Create(eh_selector_f, params.begin(), params.end(), "", bb); - - Function *beginCatchFunc = NULL; - if (beginCatchFunc == NULL) { - // void *__cxa_begin_catch(void *); - beginCatchFunc = cast<Function>( - module->getOrInsertFunction("__cxa_begin_catch", - Type::VoidTy, PtrTy, NULL)); - } - params.clear(); - params.push_back(eh_ptr); - CallInst::Create(beginCatchFunc, params.begin(), params.end(), "", bb); - // Landing pad code. Value *rescue_val = compile_node(node->nd_resq); new_rescue_bb = bb; // Landing pad footer. - Function *endCatchFunc = NULL; - if (endCatchFunc == NULL) { - // void __cxa_end_catch(void); - endCatchFunc = cast<Function>( - module->getOrInsertFunction("__cxa_end_catch", - Type::VoidTy, NULL)); - } - CallInst::Create(endCatchFunc, "", bb); + compile_landing_pad_footer(); BranchInst::Create(merge_bb, bb); - PHINode *pn = PHINode::Create(RubyObjTy, "rescue_result", merge_bb); + PHINode *pn = PHINode::Create(RubyObjTy, "rescue_result", + merge_bb); pn->addIncoming(begin_val, real_begin_bb); pn->addIncoming(rescue_val, new_rescue_bb); bb = merge_bb; @@ -4275,34 +4314,67 @@ extern "C" VALUE -rb_vm_defined(VALUE self, int mode, VALUE what) +rb_vm_defined(VALUE self, int type, VALUE what, VALUE what2) { const char *str = NULL; - switch (mode) { + switch (type) { case DEFINED_IVAR: if (rb_ivar_defined(self, (ID)what)) { str = "instance-variable"; } break; -// case DEFINED_CVAR: -// TODO - case DEFINED_GVAR: if (rb_gvar_defined((struct global_entry *)what)) { str = "global-variable"; } break; + case DEFINED_CVAR: + if (rb_cvar_defined(CLASS_OF(self), (ID)what)) { + str = "class variable"; + } + break; + case DEFINED_CONST: - if (rb_const_defined(CLASS_OF(self), (ID)what)) { - str = "constant"; + { + VALUE outer = what2; + if (NIL_P(outer)) { + outer = CLASS_OF(self); + } + if (rb_const_defined(outer, (ID)what)) { + str = "constant"; + } } break; + case DEFINED_SUPER: + case DEFINED_METHOD: + { + VALUE klass = CLASS_OF(self); + if (type == DEFINED_SUPER) { + klass = RCLASS_SUPER(klass); + } + const char *idname = rb_id2name((ID)what); + SEL sel = sel_registerName(idname); + + bool ok = class_getInstanceMethod((Class)klass, sel) != NULL; + if (!ok && idname[strlen(idname) - 1] != ':') { + char buf[100]; + snprintf(buf, sizeof buf, "%s:", idname); + sel = sel_registerName(buf); + ok = class_getInstanceMethod((Class)klass, sel) != NULL; + } + + if (ok) { + str = type == DEFINED_SUPER ? "super" : "method"; + } + } + break; + default: - printf("unrecognized defined? mode %d\n", mode); + printf("unknown defined? type %d", type); abort(); }

1 0

[1141] MacRuby/branches/experimental/mspec/lib/mspec/utils/script.rb
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1141 http://trac.macosforge.org/projects/ruby/changeset/1141 Author: eloy.de.enige(a)gmail.com Date: 2009-03-24 14:49:37 -0700 (Tue, 24 Mar 2009) Log Message: ----------- Removed the nasty Dir[] workaround. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec/utils/script.rb Modified: MacRuby/branches/experimental/mspec/lib/mspec/utils/script.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/utils/script.rb 2009-03-24 20:40:05 UTC (rev 1140) +++ MacRuby/branches/experimental/mspec/lib/mspec/utils/script.rb 2009-03-24 21:49:37 UTC (rev 1141) @@ -1,14 +1,6 @@ require 'mspec/guards/guard' require 'mspec/runner/formatters/dotted' -# MR Hack: Dir[]/Dir.glob only return the first entry, use ls in backticks. -# I know I feel dirty too ;) -class Dir - def self.[](pattern) - `ls #{pattern}`.split("\n") - end -end - # MSpecScript provides a skeleton for all the MSpec runner scripts. class MSpecScript @@ -195,10 +187,7 @@ if File.file?(expanded) res = [pattern] elsif File.directory?(expanded) - # MR Hack: Atm we only really care about those in spec/frozen/language, - # and using backticks doesn't handle the same glob pattern. - #specs = File.join(pattern, "/**/*_spec.rb") - specs = File.join(pattern, "/*_spec.rb") + specs = File.join(pattern, "/**/*_spec.rb") specs = File.expand_path(specs) rescue specs res = Dir[specs].sort end

1 0

[1140] MacRuby/branches/experimental
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1140 http://trac.macosforge.org/projects/ruby/changeset/1140 Author: lsansonetti(a)apple.com Date: 2009-03-24 13:40:05 -0700 (Tue, 24 Mar 2009) Log Message: ----------- fixed Dir.glob() & co Modified Paths: -------------- MacRuby/branches/experimental/dir.c MacRuby/branches/experimental/eval.c Modified: MacRuby/branches/experimental/dir.c =================================================================== --- MacRuby/branches/experimental/dir.c 2009-03-24 18:32:00 UTC (rev 1139) +++ MacRuby/branches/experimental/dir.c 2009-03-24 20:40:05 UTC (rev 1140) @@ -13,61 +13,18 @@ #include "ruby/ruby.h" #include "ruby/node.h" +#include "ruby/util.h" #include "roxor.h" #include <sys/types.h> #include <sys/stat.h> - -#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif - -#if defined HAVE_DIRENT_H && !defined _WIN32 -# include <dirent.h> -# define NAMLEN(dirent) strlen((dirent)->d_name) -#elif defined HAVE_DIRECT_H && !defined _WIN32 -# include <direct.h> -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# if !defined __NeXT__ -# define NAMLEN(dirent) (dirent)->d_namlen -# else -# /* On some versions of NextStep, d_namlen is always zero, so avoid it. */ -# define NAMLEN(dirent) strlen((dirent)->d_name) -# endif -# if HAVE_SYS_NDIR_H -# include <sys/ndir.h> -# endif -# if HAVE_SYS_DIR_H -# include <sys/dir.h> -# endif -# if HAVE_NDIR_H -# include <ndir.h> -# endif -# ifdef _WIN32 -# include "win32/dir.h" -# endif -#endif - +#include <dirent.h> #include <errno.h> - -#ifndef HAVE_STDLIB_H -char *getenv(); -#endif - -#ifndef HAVE_STRING_H -char *strchr(char*,char); -#endif - #include <ctype.h> -#include "ruby/util.h" +#define NAMLEN(dirent) strlen((dirent)->d_name) -#if !defined HAVE_LSTAT && !defined lstat -#define lstat stat -#endif - #define FNM_NOESCAPE 0x01 #define FNM_PATHNAME 0x02 #define FNM_DOTMATCH 0x04 @@ -1285,14 +1242,10 @@ } if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0 && fnmatch("*", dp->d_name, flags) == 0) { -#ifndef _WIN32 if (do_lstat(buf, &st, flags) == 0) new_isdir = S_ISDIR(st.st_mode) ? DIR_YES : S_ISLNK(st.st_mode) ? DIR_UNKNOWN : DIR_NO; else new_isdir = DIR_NO; -#else - new_isdir = dp->d_isdir ? (!dp->d_isrep ? DIR_YES : DIR_UNKNOWN) : DIR_NO; -#endif } new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2); @@ -1387,9 +1340,6 @@ start = root = path; flags |= FNM_SYSCASE; -#if defined DOSISH - root = rb_path_skip_prefix(root); -#endif if (root && *root == '/') root++; @@ -1707,10 +1657,12 @@ VALUE str, rflags, ary; int flags; - if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2) + if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2) { flags = NUM2INT(rflags); - else + } + else { flags = 0; + } ary = rb_check_array_type(str); if (NIL_P(ary)) { Modified: MacRuby/branches/experimental/eval.c =================================================================== --- MacRuby/branches/experimental/eval.c 2009-03-24 18:32:00 UTC (rev 1139) +++ MacRuby/branches/experimental/eval.c 2009-03-24 20:40:05 UTC (rev 1140) @@ -483,6 +483,9 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state) { // TODO + if (state != NULL) { + *state = 0; + } return (*proc)(data); }

1 0

[1139] MacRuby/branches/experimental/spec/frozen/language/versions
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1139 http://trac.macosforge.org/projects/ruby/changeset/1139 Author: eloy.de.enige(a)gmail.com Date: 2009-03-24 11:32:00 -0700 (Tue, 24 Mar 2009) Log Message: ----------- Removed all examples of deprecated behaviour which causes SyntaxErrors in 1.9. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb Removed Paths: ------------- MacRuby/branches/experimental/spec/frozen/language/versions/break_1.9.rb MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb MacRuby/branches/experimental/spec/frozen/language/versions/next_1.9.rb MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb MacRuby/branches/experimental/spec/frozen/language/versions/retry_1.9.rb MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -14,18 +14,4 @@ sum.should == 6 var.should == nil end -end - -describe "Block parameters (to be removed from MRI)" do - it "raises a SyntaxError when using a global variable" do - lambda do - instance_eval "[].each {|$global_for_block_assignment| ;}" - end.should raise_error(SyntaxError) - end - - it "raises a SyntaxError when making a method call" do - lambda do - instance_eval "o = Object.new; [].each {|o.id| }" - end.should raise_error(SyntaxError) - end end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/break_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/break_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/break_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -1,5 +0,0 @@ -describe "The break statement" do - it "raises a SyntaxError if used not within block or while/for loop" do - lambda { eval "def x; break; end" }.should raise_error(SyntaxError) - end -end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -1,9 +0,0 @@ -describe "An instance method definition with a splat" do - it "raises a SyntaxError when invoked with an inline hash argument" do - def foo(a,b,*c); [a,b,c] end - - lambda do - instance_eval "foo('abc', 'specs' => 'fail sometimes', 'on' => '1.9', *[789, 'yeah'])" - end.should raise_error(SyntaxError) - end -end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -1,5 +0,0 @@ -describe "The if expression" do - it "raises a SyntaxError if a colon is used" do - lambda { eval "if true: 1; end" }.should raise_error(SyntaxError) - end -end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/next_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/next_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/next_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -1,5 +0,0 @@ -describe "The next statement" do - it "raises a SyntaxError if used not within block or while/for loop" do - lambda { eval "def bad_meth; next; end" }.should raise_error(SyntaxError) - end -end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -1,7 +0,0 @@ -describe "The redo statement" do - it "raises a SyntaxError if used not within block" do - lambda do - instance_eval "def bad_meth_redo; redo; end" - end.should raise_error(SyntaxError) - end -end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/retry_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/retry_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/retry_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -1,6 +0,0 @@ -describe "The retry statement" do - it "raises a SyntaxError if used outside of a block" do - lambda { eval "def bad_meth_retry; retry; end" }.should raise_error(SyntaxError) - lambda { eval "lambda { retry }.call" }.should raise_error(SyntaxError) - end -end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb 2009-03-24 15:13:36 UTC (rev 1138) +++ MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb 2009-03-24 18:32:00 UTC (rev 1139) @@ -1,5 +0,0 @@ -describe "The unless expression" do - it "raises a SyntaxError when expression and body are on one line (using ':')" do - lambda { instance_eval "unless false: 'foo'; end" }.should raise_error(SyntaxError) - end -end \ No newline at end of file

1 0

[1138] MacRuby/branches/experimental/spec/frozen/tags/macruby/language
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1138 http://trac.macosforge.org/projects/ruby/changeset/1138 Author: eloy.de.enige(a)gmail.com Date: 2009-03-24 08:13:36 -0700 (Tue, 24 Mar 2009) Log Message: ----------- Added some more critical tags, but to even get to these specs with spec:language you need to skip a few files. Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/eigenclass_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/encoding_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/ensure_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/eigenclass_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/eigenclass_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/eigenclass_tags.txt 2009-03-24 15:13:36 UTC (rev 1138) @@ -0,0 +1 @@ +critical:A constant on an eigenclass cannot be accessed via object::CONST \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/encoding_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/encoding_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/encoding_tags.txt 2009-03-24 15:13:36 UTC (rev 1138) @@ -0,0 +1,2 @@ +critical:The __ENCODING__ pseudo-variable is the evaluated strings's one inside an eval +critical:The __ENCODING__ pseudo-variable is equal to the specified encoding when a magic comment exists \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/ensure_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/ensure_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/ensure_tags.txt 2009-03-24 15:13:36 UTC (rev 1138) @@ -0,0 +1,2 @@ +critical:An ensure block inside a method is executed when an exception is raised in the method +critical:An ensure block inside a method is executed even when a symbol is thrown in the method \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt 2009-03-24 15:13:36 UTC (rev 1138) @@ -0,0 +1 @@ +critical:The __FILE__ constant equals (eval) inside an eval \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt 2009-03-24 15:13:36 UTC (rev 1138) @@ -0,0 +1,4 @@ +critical:The for expression iterates over an Hash passing each key-value pair to the block +critical:The for expression allows an instance variable as an iterator name +critical:The for expression returns expr +critical:The for expression repeats current iteration with 'redo' \ No newline at end of file

1 0

[1137] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1137 http://trac.macosforge.org/projects/ruby/changeset/1137 Author: eloy.de.enige(a)gmail.com Date: 2009-03-24 07:44:35 -0700 (Tue, 24 Mar 2009) Log Message: ----------- Added failing test for constant lookup. Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-24 14:37:21 UTC (rev 1136) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-24 14:44:35 UTC (rev 1137) @@ -419,6 +419,20 @@ p Z::Y.new.foo } + assert '42', %q{ + class A + module B + def foo + 42 + end + end + module C + extend B + end + end + p A::C.foo + } + assert 'true', 'p ::String == String' end

1 0

[1136] MacRuby/branches/experimental/spec/frozen
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1136 http://trac.macosforge.org/projects/ruby/changeset/1136 Author: eloy.de.enige(a)gmail.com Date: 2009-03-24 07:37:21 -0700 (Tue, 24 Mar 2009) Log Message: ----------- Added some critical tags for examples which cause execution of the spec runner to completely halt. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/class_spec.rb MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt Modified: MacRuby/branches/experimental/spec/frozen/language/class_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/class_spec.rb 2009-03-24 14:37:05 UTC (rev 1135) +++ MacRuby/branches/experimental/spec/frozen/language/class_spec.rb 2009-03-24 14:37:21 UTC (rev 1136) @@ -44,7 +44,7 @@ }.should raise_error(TypeError) end - it "allows using self as the superclass iff self is a class" do + it "allows using self as the superclass if self is a class" do ClassSpecs::I::J.superclass.should == ClassSpecs::I lambda { Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt 2009-03-24 14:37:05 UTC (rev 1135) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt 2009-03-24 14:37:21 UTC (rev 1136) @@ -1 +1 @@ -critical:A block whose arguments are splatted yields the correct arguments in a nested block \ No newline at end of file +critical:A block whose arguments are splatted yields the correct arguments in a nested block Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt 2009-03-24 14:37:21 UTC (rev 1136) @@ -0,0 +1 @@ +critical:The break statement raises a SyntaxError if used not within block or while/for loop \ No newline at end of file Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt 2009-03-24 14:37:05 UTC (rev 1135) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt 2009-03-24 14:37:21 UTC (rev 1136) @@ -6,3 +6,7 @@ fails:A class definition allows the definition of class-level instance variables in a class method fails:A class definition allows the declaration of class variables in an instance method fails:An outer class definition contains the inner classes +critical:A class definition raises TypeError if the constant qualifying the class is nil +critical:A class definition allows using self as the superclass if self is a class +critical:A Class Definitions extending an object raises a TypeError when trying to extend numbers +critical:Reopening a class raises a TypeError when superclasses mismatch

1 0

[1135] MacRuby/branches/experimental
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1135 http://trac.macosforge.org/projects/ruby/changeset/1135 Author: eloy.de.enige(a)gmail.com Date: 2009-03-24 07:37:05 -0700 (Tue, 24 Mar 2009) Log Message: ----------- Added failing test for rescueing an exception raised from a file which is being required. Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Added Paths: ----------- MacRuby/branches/experimental/test_roxor_fixtures/lib/raise.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-24 13:56:31 UTC (rev 1134) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-24 14:37:05 UTC (rev 1135) @@ -1350,6 +1350,8 @@ assert ":ok", "$:.unshift('test_roxor_fixtures/lib'); require 'foo'" + assert ":ok", "begin; require 'test_roxor_fixtures/lib/raise'; rescue NameError; p :ok; end" + end test "method" do Added: MacRuby/branches/experimental/test_roxor_fixtures/lib/raise.rb =================================================================== --- MacRuby/branches/experimental/test_roxor_fixtures/lib/raise.rb (rev 0) +++ MacRuby/branches/experimental/test_roxor_fixtures/lib/raise.rb 2009-03-24 14:37:05 UTC (rev 1135) @@ -0,0 +1 @@ +raise NameError, "I don't like my name! It's sooo negative..." \ No newline at end of file

1 0

[1134] MacRuby/branches/experimental
by source_changes＠macosforge.org 24 Mar '09

24 Mar '09

Revision: 1134 http://trac.macosforge.org/projects/ruby/changeset/1134 Author: eloy.de.enige(a)gmail.com Date: 2009-03-24 06:56:31 -0700 (Tue, 24 Mar 2009) Log Message: ----------- Added failing tests about encoding. Modified Paths: -------------- MacRuby/branches/experimental/Rakefile MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/Rakefile =================================================================== --- MacRuby/branches/experimental/Rakefile 2009-03-24 13:46:41 UTC (rev 1133) +++ MacRuby/branches/experimental/Rakefile 2009-03-24 13:56:31 UTC (rev 1134) @@ -1,3 +1,5 @@ +# encoding: utf-8 + # See ./rakelib/*.rake for all tasks. desc "Same as all" Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-24 13:46:41 UTC (rev 1133) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-24 13:56:31 UTC (rev 1134) @@ -1393,4 +1393,13 @@ assert "true", "p(Dir['*.c'].length > 1)" assert "true", "p(Dir.glob('*.c').length > 1)" + end + +test "encoding" do + + assert "US-ASCII", "File.open('Rakefile', 'r:US-ASCII') {|f| puts f.read.encoding.name }" + + assert ":ok", "puts ':ok'.encode('US-ASCII')" + +end \ No newline at end of file

1 0