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

[1213] MacRuby/branches/experimental/process.c
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1213 http://trac.macosforge.org/projects/ruby/changeset/1213 Author: lsansonetti(a)apple.com Date: 2009-03-27 13:23:03 -0700 (Fri, 27 Mar 2009) Log Message: ----------- ported rb_cProcessStatus to rb_objc_define_method() Modified Paths: -------------- MacRuby/branches/experimental/process.c Modified: MacRuby/branches/experimental/process.c =================================================================== --- MacRuby/branches/experimental/process.c 2009-03-27 20:20:00 UTC (rev 1212) +++ MacRuby/branches/experimental/process.c 2009-03-27 20:23:03 UTC (rev 1213) @@ -238,7 +238,7 @@ */ static VALUE -pst_to_i(VALUE st) +pst_to_i(VALUE st, SEL sel) { return rb_iv_get(st, "status"); } @@ -256,7 +256,7 @@ */ static VALUE -pst_pid(VALUE st) +pst_pid(VALUE st, SEL sel) { return rb_iv_get(st, "pid"); } @@ -309,14 +309,14 @@ */ static VALUE -pst_to_s(VALUE st) +pst_to_s(VALUE st, SEL sel) { rb_pid_t pid; int status; VALUE str; - pid = NUM2LONG(pst_pid(st)); - status = NUM2INT(pst_to_i(st)); + pid = NUM2LONG(pst_pid(st, 0)); + status = NUM2INT(pst_to_i(st, 0)); str = rb_str_buf_new(0); pst_message(str, pid, status); @@ -332,14 +332,14 @@ */ static VALUE -pst_inspect(VALUE st) +pst_inspect(VALUE st, SEL sel) { rb_pid_t pid; int status; VALUE str; - pid = NUM2LONG(pst_pid(st)); - status = NUM2INT(pst_to_i(st)); + pid = NUM2LONG(pst_pid(st, 0)); + status = NUM2INT(pst_to_i(st, 0)); str = rb_sprintf("#<%s: ", rb_class2name(CLASS_OF(st))); pst_message(str, pid, status); @@ -357,10 +357,12 @@ */ static VALUE -pst_equal(VALUE st1, VALUE st2) +pst_equal(VALUE st1, SEL sel, VALUE st2) { - if (st1 == st2) return Qtrue; - return rb_equal(pst_to_i(st1), st2); + if (st1 == st2) { + return Qtrue; + } + return rb_equal(pst_to_i(st1, 0), st2); } @@ -377,7 +379,7 @@ */ static VALUE -pst_bitand(VALUE st1, VALUE st2) +pst_bitand(VALUE st1, SEL sel, VALUE st2) { int status = NUM2INT(st1) & NUM2INT(st2); @@ -398,7 +400,7 @@ */ static VALUE -pst_rshift(VALUE st1, VALUE st2) +pst_rshift(VALUE st1, SEL sel, VALUE st2) { int status = NUM2INT(st1) >> NUM2INT(st2); @@ -416,7 +418,7 @@ */ static VALUE -pst_wifstopped(VALUE st) +pst_wifstopped(VALUE st, SEL sel) { int status = NUM2INT(st); @@ -436,7 +438,7 @@ */ static VALUE -pst_wstopsig(VALUE st) +pst_wstopsig(VALUE st, SEL sel) { int status = NUM2INT(st); @@ -455,7 +457,7 @@ */ static VALUE -pst_wifsignaled(VALUE st) +pst_wifsignaled(VALUE st, SEL sel) { int status = NUM2INT(st); @@ -476,7 +478,7 @@ */ static VALUE -pst_wtermsig(VALUE st) +pst_wtermsig(VALUE st, SEL sel) { int status = NUM2INT(st); @@ -496,7 +498,7 @@ */ static VALUE -pst_wifexited(VALUE st) +pst_wifexited(VALUE st, SEL sel) { int status = NUM2INT(st); @@ -527,7 +529,7 @@ */ static VALUE -pst_wexitstatus(VALUE st) +pst_wexitstatus(VALUE st, SEL sel) { int status = NUM2INT(st); @@ -546,7 +548,7 @@ */ static VALUE -pst_success_p(VALUE st) +pst_success_p(VALUE st, SEL sel) { int status = NUM2INT(st); @@ -565,7 +567,7 @@ */ static VALUE -pst_wcoredump(VALUE st) +pst_wcoredump(VALUE st, SEL sel) { #ifdef WCOREDUMP int status = NUM2INT(st); @@ -5094,24 +5096,24 @@ rb_cProcessStatus = rb_define_class_under(rb_mProcess, "Status", rb_cObject); rb_undef_method(CLASS_OF(rb_cProcessStatus), "new"); - rb_define_method(rb_cProcessStatus, "==", pst_equal, 1); - rb_define_method(rb_cProcessStatus, "&", pst_bitand, 1); - rb_define_method(rb_cProcessStatus, ">>", pst_rshift, 1); - rb_define_method(rb_cProcessStatus, "to_i", pst_to_i, 0); - rb_define_method(rb_cProcessStatus, "to_int", pst_to_i, 0); - rb_define_method(rb_cProcessStatus, "to_s", pst_to_s, 0); - rb_define_method(rb_cProcessStatus, "inspect", pst_inspect, 0); + rb_objc_define_method(rb_cProcessStatus, "==", pst_equal, 1); + rb_objc_define_method(rb_cProcessStatus, "&", pst_bitand, 1); + rb_objc_define_method(rb_cProcessStatus, ">>", pst_rshift, 1); + rb_objc_define_method(rb_cProcessStatus, "to_i", pst_to_i, 0); + rb_objc_define_method(rb_cProcessStatus, "to_int", pst_to_i, 0); + rb_objc_define_method(rb_cProcessStatus, "to_s", pst_to_s, 0); + rb_objc_define_method(rb_cProcessStatus, "inspect", pst_inspect, 0); - rb_define_method(rb_cProcessStatus, "pid", pst_pid, 0); + rb_objc_define_method(rb_cProcessStatus, "pid", pst_pid, 0); - rb_define_method(rb_cProcessStatus, "stopped?", pst_wifstopped, 0); - rb_define_method(rb_cProcessStatus, "stopsig", pst_wstopsig, 0); - rb_define_method(rb_cProcessStatus, "signaled?", pst_wifsignaled, 0); - rb_define_method(rb_cProcessStatus, "termsig", pst_wtermsig, 0); - rb_define_method(rb_cProcessStatus, "exited?", pst_wifexited, 0); - rb_define_method(rb_cProcessStatus, "exitstatus", pst_wexitstatus, 0); - rb_define_method(rb_cProcessStatus, "success?", pst_success_p, 0); - rb_define_method(rb_cProcessStatus, "coredump?", pst_wcoredump, 0); + rb_objc_define_method(rb_cProcessStatus, "stopped?", pst_wifstopped, 0); + rb_objc_define_method(rb_cProcessStatus, "stopsig", pst_wstopsig, 0); + rb_objc_define_method(rb_cProcessStatus, "signaled?", pst_wifsignaled, 0); + rb_objc_define_method(rb_cProcessStatus, "termsig", pst_wtermsig, 0); + rb_objc_define_method(rb_cProcessStatus, "exited?", pst_wifexited, 0); + rb_objc_define_method(rb_cProcessStatus, "exitstatus", pst_wexitstatus, 0); + rb_objc_define_method(rb_cProcessStatus, "success?", pst_success_p, 0); + rb_objc_define_method(rb_cProcessStatus, "coredump?", pst_wcoredump, 0); rb_define_module_function(rb_mProcess, "pid", get_pid, 0); rb_define_module_function(rb_mProcess, "ppid", get_ppid, 0);

1 0

[1212] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1212 http://trac.macosforge.org/projects/ruby/changeset/1212 Author: lsansonetti(a)apple.com Date: 2009-03-27 13:20:00 -0700 (Fri, 27 Mar 2009) Log Message: ----------- implemented last process status primitives Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/ruby.h MacRuby/branches/experimental/process.c MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/include/ruby/ruby.h =================================================================== --- MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-27 20:11:09 UTC (rev 1211) +++ MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-27 20:20:00 UTC (rev 1212) @@ -1031,6 +1031,7 @@ RUBY_EXTERN VALUE rb_cNilClass; RUBY_EXTERN VALUE rb_cNumeric; RUBY_EXTERN VALUE rb_cProc; +RUBY_EXTERN VALUE rb_cProcessStatus; RUBY_EXTERN VALUE rb_cRange; RUBY_EXTERN VALUE rb_cRational; RUBY_EXTERN VALUE rb_cComplex; Modified: MacRuby/branches/experimental/process.c =================================================================== --- MacRuby/branches/experimental/process.c 2009-03-27 20:11:09 UTC (rev 1211) +++ MacRuby/branches/experimental/process.c 2009-03-27 20:20:00 UTC (rev 1212) @@ -216,29 +216,12 @@ * _stat_, we're referring to this 16 bit value. */ -static VALUE rb_cProcessStatus; +VALUE rb_cProcessStatus; -VALUE -rb_last_status_get(void) -{ - // TODO - return Qnil; -} - -void -rb_last_status_set(int status, rb_pid_t pid) -{ -#if 0 // TODO - VALUE last_status = rb_obj_alloc(rb_cProcessStatus); - rb_iv_set(vm->last_status, "status", INT2FIX(status)); - rb_iv_set(vm->last_status, "pid", PIDT2NUM(pid)); -#endif -} - static void rb_last_status_clear(void) { - // TODO + rb_last_status_set(0, -1); } /* Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 20:11:09 UTC (rev 1211) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 20:20:00 UTC (rev 1212) @@ -407,6 +407,7 @@ VALUE load_path; VALUE backref; VALUE broken_with; + VALUE last_status; int safe_level; std::map<NODE *, rb_vm_block_t *> blocks; std::map<double, struct rb_float_cache *> float_cache; @@ -1949,6 +1950,7 @@ backref = Qnil; broken_with = Qundef; + last_status = Qnil; current_block = NULL; previous_block = NULL; @@ -6149,6 +6151,33 @@ } extern "C" +VALUE +rb_last_status_get(void) +{ + return GET_VM()->last_status; +} + +extern "C" +void +rb_last_status_set(int status, rb_pid_t pid) +{ + if (GET_VM()->last_status != Qnil) { + rb_objc_release((void *)GET_VM()->last_status); + } + VALUE last_status; + if (pid == -1) { + last_status = Qnil; + } + else { + last_status = rb_obj_alloc(rb_cProcessStatus); + rb_iv_set(last_status, "status", INT2FIX(status)); + rb_iv_set(last_status, "pid", PIDT2NUM(pid)); + rb_objc_retain((void *)last_status); + } + GET_VM()->last_status = last_status; +} + +extern "C" const char * rb_sourcefile(void) {

1 0

[1211] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1211 http://trac.macosforge.org/projects/ruby/changeset/1211 Author: pthomson(a)apple.com Date: 2009-03-27 13:11:09 -0700 (Fri, 27 Mar 2009) Log Message: ----------- Put in calls to rb_last_status_set so that lrz can reimplement it. Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/io.h MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/include/ruby/io.h =================================================================== --- MacRuby/branches/experimental/include/ruby/io.h 2009-03-27 19:40:37 UTC (rev 1210) +++ MacRuby/branches/experimental/include/ruby/io.h 2009-03-27 20:11:09 UTC (rev 1211) @@ -60,6 +60,16 @@ #define FMODE_TRUNC 0x00000800 #define FMODE_TEXTMODE 0x00001000 + +#ifndef SEEK_CUR +# define SEEK_SET 0 +# define SEEK_CUR 1 +# define SEEK_END 2 +#endif + +#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE) + + VALUE rb_io_taint_check(VALUE); NORETURN(void rb_eof_error(void)); Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-27 19:40:37 UTC (rev 1210) +++ MacRuby/branches/experimental/io.c 2009-03-27 20:11:09 UTC (rev 1211) @@ -1,4 +1,4 @@ -/********************************************************************** + /********************************************************************** io.c - @@ -300,6 +300,33 @@ return convert_fmode_to_oflags(convert_mode_string_to_fmode(s)); } +static inline int +convert_oflags_to_fmode(int mode) +{ + int flags = 0; + + switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) { + case O_RDONLY: + flags = FMODE_READABLE; + break; + case O_WRONLY: + flags = FMODE_WRITABLE; + break; + case O_RDWR: + flags = FMODE_READWRITE; + break; + } + + if (mode & O_APPEND) { + flags |= FMODE_APPEND; + } + if (mode & O_CREAT) { + flags |= FMODE_CREATE; + } + + return flags; +} + void rb_eof_error(void) { @@ -363,42 +390,6 @@ || CFWriteStreamGetStatus(io_struct->writeStream) == kCFStreamStatusOpen); } -#define FMODE_PREP (1<<16) -#define IS_PREP_STDIO(f) ((f)->mode & FMODE_PREP) -#define PREP_STDIO_NAME(f) ((f)->path) - -static inline int -rb_io_modenum_flags(int mode) -{ - int flags = 0; - - switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) { - case O_RDONLY: - flags = FMODE_READABLE; - break; - case O_WRONLY: - flags = FMODE_WRITABLE; - break; - case O_RDWR: - flags = FMODE_READWRITE; - break; - } - - if (mode & O_APPEND) { - flags |= FMODE_APPEND; - } - if (mode & O_CREAT) { - flags |= FMODE_CREATE; - } -#ifdef O_BINARY - if (mode & O_BINARY) { - flags |= FMODE_BINMODE; - } -#endif - - return flags; -} - /* * call-seq: * IO.try_convert(obj) -> io or nil @@ -416,14 +407,6 @@ rb_notimplement(); } -#ifndef SEEK_CUR -# define SEEK_SET 0 -# define SEEK_CUR 1 -# define SEEK_END 2 -#endif - -#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE) - static VALUE io_alloc(VALUE klass, SEL sel) { @@ -485,8 +468,6 @@ io_struct->sync = mode & FMODE_SYNC; } -int macruby_pclose(FILE *iop); - static void io_struct_close(rb_io_t *io_struct, bool close_read, bool close_write) { @@ -497,10 +478,10 @@ CFWriteStreamClose(io_struct->writeStream); } if (io_struct->fp != NULL) { - const int status = macruby_pclose(io_struct->fp); - io_struct->fp = NULL; - // TODO find out the real pid instead of passing -1 - rb_last_status_set(status, -1); + const int status = macruby_pclose(io_struct->fp); + io_struct->fp = NULL; + rb_last_status_set(status, io_struct->pid); + io_struct->pid = -1; } } @@ -1785,7 +1766,7 @@ if (path != NULL && strcmp(path, "-") != 0) { klass = rb_cFile; } - return prep_io(fd, rb_io_modenum_flags(mode), klass); + return prep_io(fd, convert_oflags_to_fmode(mode), klass); } static VALUE

1 0

[1210] MacRuby/branches/experimental/io.c
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1210 http://trac.macosforge.org/projects/ruby/changeset/1210 Author: pthomson(a)apple.com Date: 2009-03-27 12:40:37 -0700 (Fri, 27 Mar 2009) Log Message: ----------- Whoops. Forgot a parenthesis. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-27 19:35:10 UTC (rev 1209) +++ MacRuby/branches/experimental/io.c 2009-03-27 19:40:37 UTC (rev 1210) @@ -210,7 +210,7 @@ } while (pid == -1 && errno == EINTR); /* Remove the entry from the linked list. */ - if (last == NULL + if (last == NULL) pidlist = cur->next; else last->next = cur->next;

1 0

[1209] MacRuby/branches/experimental/io.c
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1209 http://trac.macosforge.org/projects/ruby/changeset/1209 Author: pthomson(a)apple.com Date: 2009-03-27 12:35:10 -0700 (Fri, 27 Mar 2009) Log Message: ----------- Reimplemented IO.popen() such that it sets the #pid variable correctly. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-27 19:17:09 UTC (rev 1208) +++ MacRuby/branches/experimental/io.c 2009-03-27 19:35:10 UTC (rev 1209) @@ -24,6 +24,7 @@ #include <sys/select.h> #include <sys/types.h> #include <sys/ioctl.h> +#include <paths.h> #include <fcntl.h> #include <sys/stat.h> @@ -91,6 +92,132 @@ // return S_ISSOCK(sbuf.st_mode); // } +// This was copied wholesale from an implementation of unistd I found. +// I am not sure that the usage of vfork here is correct, as on some systems +// vfork is not at all thread-safe. + +static struct pid { + struct pid *next; + FILE *fp; + pid_t pid; +} *pidlist; + +FILE * +macruby_popen(const char *program, const char *type, pid_t *new_pid) +{ + struct pid * volatile cur; + FILE *iop; + int pdes[2]; + pid_t pid; + + if ((*type != 'r' && *type != 'w') || type[1] != '\0') { + errno = EINVAL; + return (NULL); + } + + if ((cur = malloc(sizeof(struct pid))) == NULL) + return (NULL); + + if (pipe(pdes) < 0) { + free(cur); + return (NULL); + } + + switch (pid = vfork()) { + case -1: /* Error. */ + (void)close(pdes[0]); + (void)close(pdes[1]); + free(cur); + return (NULL); + /* NOTREACHED */ + case 0: /* Child. */ + { + struct pid *pcur; + /* + * because vfork() instead of fork(), must leak FILE *, + * but luckily we are terminally headed for an execl() + */ + for (pcur = pidlist; pcur; pcur = pcur->next) + close(fileno(pcur->fp)); + + if (*type == 'r') { + int tpdes1 = pdes[1]; + + (void) close(pdes[0]); + /* + * We must NOT modify pdes, due to the + * semantics of vfork. + */ + if (tpdes1 != STDOUT_FILENO) { + (void)dup2(tpdes1, STDOUT_FILENO); + (void)close(tpdes1); + tpdes1 = STDOUT_FILENO; + } + } else { + (void)close(pdes[1]); + if (pdes[0] != STDIN_FILENO) { + (void)dup2(pdes[0], STDIN_FILENO); + (void)close(pdes[0]); + } + } + execl(_PATH_BSHELL, "sh", "-c", program, (char *)NULL); + _exit(127); + /* NOTREACHED */ + } + } + + /* Parent; assume fdopen can't fail. */ + if (*type == 'r') { + iop = fdopen(pdes[0], type); + (void)close(pdes[1]); + } else { + iop = fdopen(pdes[1], type); + (void)close(pdes[0]); + } + + /* Link into list of file descriptors. */ + cur->fp = iop; + cur->pid = pid; + cur->next = pidlist; + pidlist = cur; + + if (new_pid != NULL) { + *new_pid = pid; + } + + return iop; +} + +int +macruby_pclose(FILE *iop) +{ + struct pid *cur, *last; + int pstat; + pid_t pid; + + /* Find the appropriate file pointer. */ + for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next) + if (cur->fp == iop) + break; + + if (cur == NULL) + return (-1); + + (void)fclose(iop); + + do { + pid = waitpid(cur->pid, &pstat, 0); + } while (pid == -1 && errno == EINTR); + + /* Remove the entry from the linked list. */ + if (last == NULL + pidlist = cur->next; + else + last->next = cur->next; + free(cur); + return (pid == -1 ? -1 : pstat); +} + static int convert_mode_string_to_fmode(VALUE rstr) { @@ -358,6 +485,8 @@ io_struct->sync = mode & FMODE_SYNC; } +int macruby_pclose(FILE *iop); + static void io_struct_close(rb_io_t *io_struct, bool close_read, bool close_write) { @@ -368,7 +497,7 @@ CFWriteStreamClose(io_struct->writeStream); } if (io_struct->fp != NULL) { - const int status = pclose(io_struct->fp); + const int status = macruby_pclose(io_struct->fp); io_struct->fp = NULL; // TODO find out the real pid instead of passing -1 rb_last_status_set(status, -1); @@ -1864,18 +1993,20 @@ rb_io_s_popen(VALUE klass, SEL sel, int argc, VALUE *argv) { VALUE process_name, mode; + pid_t popen_pid; rb_scan_args(argc, argv, "11", &process_name, &mode); if (NIL_P(mode)) { mode = (VALUE)CFSTR("r"); } - FILE *process = popen(StringValueCStr(process_name), RSTRING_PTR(mode)); + FILE *process = macruby_popen(StringValueCStr(process_name), RSTRING_PTR(mode), &popen_pid); if (process == NULL) { rb_raise(rb_eIOError, "system call to popen() failed"); } VALUE io = prep_io(fileno(process), convert_mode_string_to_fmode(mode), klass); ExtractIOStruct(io)->fp = process; + ExtractIOStruct(io)->pid = popen_pid; return io; }

1 0

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

27 Mar '09

Revision: 1208 http://trac.macosforge.org/projects/ruby/changeset/1208 Author: lsansonetti(a)apple.com Date: 2009-03-27 12:17:09 -0700 (Fri, 27 Mar 2009) Log Message: ----------- implemented the compiler side of 'undef' Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 19:01:45 UTC (rev 1207) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 19:17:09 UTC (rev 1208) @@ -214,6 +214,7 @@ Function *getIvarFunc; Function *setIvarFunc; Function *definedFunc; + Function *undefFunc; Function *aliasFunc; Function *valiasFunc; Function *newHashFunc; @@ -550,6 +551,7 @@ getIvarFunc = NULL; setIvarFunc = NULL; definedFunc = NULL; + undefFunc = NULL; aliasFunc = NULL; valiasFunc = NULL; newHashFunc = NULL; @@ -3725,6 +3727,29 @@ } break; + case NODE_UNDEF: + { + if (undefFunc == NULL) { + // VALUE rb_vm_undef(VALUE klass, ID name); + undefFunc = + cast<Function>(module->getOrInsertFunction( + "rb_vm_undef", + Type::VoidTy, RubyObjTy, IntTy, NULL)); + } + + assert(node->u2.node != NULL); + ID name = node->u2.node->u1.id; + + std::vector<Value *> params; + params.push_back(compile_current_class()); + params.push_back(ConstantInt::get(IntTy, name)); + + compile_protected_call(undefFunc, params); + + return nilVal; + } + break; + case NODE_TRUE: return trueVal; @@ -4538,6 +4563,17 @@ } extern "C" +void +rb_vm_undef(VALUE klass, ID name) +{ + if (GET_VM()->current_class != NULL) { + klass = (VALUE)GET_VM()->current_class; + } + + rb_undef(klass, name); +} + +extern "C" VALUE rb_vm_defined(VALUE self, int type, VALUE what, VALUE what2) {

1 0

[1207] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1207 http://trac.macosforge.org/projects/ruby/changeset/1207 Author: lsansonetti(a)apple.com Date: 2009-03-27 12:01:45 -0700 (Fri, 27 Mar 2009) Log Message: ----------- tagged failing tests in variables_spec.rb and moved it to the not-green-yet list Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-27 18:49:20 UTC (rev 1206) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-27 19:01:45 UTC (rev 1207) @@ -45,6 +45,7 @@ rescue return throw + variables yield } Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt 2009-03-27 19:01:45 UTC (rev 1207) @@ -0,0 +1,16 @@ +fails:Basic assignment allows the assignment of the rhs to the lhs using the lhs splat operator +fails:Basic assignment allows the assignment of rhs to the lhs using the lhs and rhs splat operators simultaneously +fails:Basic assignment allows multiple values to be assigned +fails:Basic assignment supports the {|r,| } form of block assignment +fails:Assignment using expansion succeeds without conversion +fails:Assigning multiple values bundles remaining values to an array when using the splat operator +fails:Assigning multiple values calls #to_ary on rhs arg if rhs has only a single arg +fails:Assigning multiple values allows complex parallel assignment +fails:Conditional assignment checks for class variable definition before fetching its value +fails:Operator assignment 'obj[idx] op= expr' returns result of rhs not result of []= +fails:Multiple assignments with splats * on the lhs has to be applied to the last parameter +fails:Multiple assignments with splats * on the lhs collects all parameters from its position onwards as an Array or an empty Array +fails:Multiple assignments with grouping A group on the lhs is considered one position and treats its corresponding rhs position like an Array +fails:Multiple assignments with grouping supports multiple levels of nested groupings +fails:Multiple assignment has the proper return value +fails:Multiple assignment, array-style returns an array of all rhs values Property changes on: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt ___________________________________________________________________ Added: svn:eol-style + native

1 0

[1206] MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1206 http://trac.macosforge.org/projects/ruby/changeset/1206 Author: lsansonetti(a)apple.com Date: 2009-03-27 11:49:20 -0700 (Fri, 27 Mar 2009) Log Message: ----------- rewrote a few specs to work with ruby 1.9 (note, still 4 failures) Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb 2009-03-27 08:36:32 UTC (rev 1205) +++ MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb 2009-03-27 18:49:20 UTC (rev 1206) @@ -20,50 +20,109 @@ it "assigns nil to lhs when rhs is an empty expression" do a = () a.should be_nil + end - a = *() - a.should be_nil + ruby_version_is "" ... "1.9" do + it "assigns nil to lhs when rhs is an empty splat expression" do + a = *() + a.should be_nil + end end + ruby_version_is "1.9" do + it "assigns [] to lhs when rhs is an empty splat expression" do + a = *() + a.should == [] + end + end - it "allows the assignment of the rhs to the lhs using the rhs splat operator" do - a = *nil; a.should == nil - a = *1; a.should == 1 - a = *[]; a.should == nil - a = *[1]; a.should == 1 - a = *[nil]; a.should == nil - a = *[[]]; a.should == [] - a = *[1,2]; a.should == [1,2] - a = *[*[]]; a.should == nil - a = *[*[1]]; a.should == 1 - a = *[*[1,2]]; a.should == [1,2] + ruby_version_is "" ... "1.9" do + it "allows the assignment of the rhs to the lhs using the rhs splat operator" do + a = *nil; a.should == nil + a = *1; a.should == 1 + a = *[]; a.should == nil + a = *[1]; a.should == 1 + a = *[nil]; a.should == nil + a = *[[]]; a.should == [] + a = *[1,2]; a.should == [1,2] + a = *[*[]]; a.should == nil + a = *[*[1]]; a.should == 1 + a = *[*[1,2]]; a.should == [1,2] + end end + ruby_version_is "1.9" do + it "allows the assignment of the rhs to the lhs using the rhs splat operator" do + a = *nil; a.should == [] + a = *1; a.should == [1] + a = *[]; a.should == [] + a = *[1]; a.should == [1] + a = *[nil]; a.should == [nil] + a = *[[]]; a.should == [[]] + a = *[1,2]; a.should == [1,2] + a = *[*[]]; a.should == [] + a = *[*[1]]; a.should == [1] + a = *[*[1,2]]; a.should == [1,2] + end + end - it "allows the assignment of the rhs to the lhs using the lhs splat operator" do - * = 1,2 # Valid syntax, but pretty useless! Nothing to test - *a = nil; a.should == [nil] - *a = 1; a.should == [1] - *a = []; a.should == [[]] - *a = [1]; a.should == [[1]] - *a = [nil]; a.should == [[nil]] - *a = [[]]; a.should == [[[]]] - *a = [1,2]; a.should == [[1,2]] - *a = [*[]]; a.should == [[]] - *a = [*[1]]; a.should == [[1]] - *a = [*[1,2]]; a.should == [[1,2]] + ruby_version_is "" ... "1.9" do + it "allows the assignment of the rhs to the lhs using the lhs splat operator" do + * = 1,2 # Valid syntax, but pretty useless! Nothing to test + *a = nil; a.should == [nil] + *a = 1; a.should == [1] + *a = []; a.should == [[]] + *a = [1]; a.should == [[1]] + *a = [nil]; a.should == [[nil]] + *a = [[]]; a.should == [[[]]] + *a = [1,2]; a.should == [[1,2]] + *a = [*[]]; a.should == [[]] + *a = [*[1]]; a.should == [[1]] + *a = [*[1,2]]; a.should == [[1,2]] + end end + ruby_version_is "1.9" do + it "allows the assignment of the rhs to the lhs using the lhs splat operator" do + * = 1,2 # Valid syntax, but pretty useless! Nothing to test + *a = nil; a.should == [nil] + *a = 1; a.should == [1] + *a = []; a.should == [] + *a = [1]; a.should == [1] + *a = [nil]; a.should == [nil] + *a = [[]]; a.should == [[]] + *a = [1,2]; a.should == [1,2] + *a = [*[]]; a.should == [] + *a = [*[1]]; a.should == [1] + *a = [*[1,2]]; a.should == [1,2] + end + end - it "allows the assignment of rhs to the lhs using the lhs and rhs splat operators simultaneously" do - *a = *nil; a.should == [nil] - *a = *1; a.should == [1] - *a = *[]; a.should == [] - *a = *[1]; a.should == [1] - *a = *[nil]; a.should == [nil] - *a = *[[]]; a.should == [[]] - *a = *[1,2]; a.should == [1,2] - *a = *[*[]]; a.should == [] - *a = *[*[1]]; a.should == [1] - *a = *[*[1,2]]; a.should == [1,2] + ruby_version_is "" ... "1.9" do + it "allows the assignment of rhs to the lhs using the lhs and rhs splat operators simultaneously" do + *a = *nil; a.should == [nil] + *a = *1; a.should == [1] + *a = *[]; a.should == [] + *a = *[1]; a.should == [1] + *a = *[nil]; a.should == [nil] + *a = *[[]]; a.should == [[]] + *a = *[1,2]; a.should == [1,2] + *a = *[*[]]; a.should == [] + *a = *[*[1]]; a.should == [1] + *a = *[*[1,2]]; a.should == [1,2] + end end + ruby_version_is "1.9" do + it "allows the assignment of rhs to the lhs using the lhs and rhs splat operators simultaneously" do + *a = *nil; a.should == [] + *a = *1; a.should == [1] + *a = *[]; a.should == [] + *a = *[1]; a.should == [1] + *a = *[nil]; a.should == [nil] + *a = *[[]]; a.should == [[]] + *a = *[1,2]; a.should == [1,2] + *a = *[*[]]; a.should == [] + *a = *[*[1]]; a.should == [1] + *a = *[*[1,2]]; a.should == [1,2] + end + end it "allows multiple values to be assigned" do a,b,*c = nil; [a,b,c].should == [nil, nil, []] @@ -128,10 +187,18 @@ end describe "Assignment using expansion" do - it "succeeds without conversion" do - *x = (1..7).to_a - x.should == [[1, 2, 3, 4, 5, 6, 7]] + ruby_version_is "" ... "1.9" do + it "succeeds without conversion" do + *x = (1..7).to_a + x.should == [[1, 2, 3, 4, 5, 6, 7]] + end end + ruby_version_is "1.9" do + it "succeeds without conversion" do + *x = (1..7).to_a + x.should == [1, 2, 3, 4, 5, 6, 7] + end + end end describe "Assigning multiple values" do

1 0

[1205] MacRuby/branches/experimental/rakelib/spec.rake
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1205 http://trac.macosforge.org/projects/ruby/changeset/1205 Author: lsansonetti(a)apple.com Date: 2009-03-27 01:36:32 -0700 (Fri, 27 Mar 2009) Log Message: ----------- added method_spec.rb in the not-green-yet list Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-27 08:35:53 UTC (rev 1204) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-27 08:36:32 UTC (rev 1205) @@ -38,6 +38,7 @@ loop magic_comment metaclass + method next predefined private

1 0

[1204] MacRuby/branches/experimental/spec/frozen/tags/macruby/language/ method_tags.txt
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1204 http://trac.macosforge.org/projects/ruby/changeset/1204 Author: lsansonetti(a)apple.com Date: 2009-03-27 01:35:53 -0700 (Fri, 27 Mar 2009) Log Message: ----------- added failing specs and marked the first one as critical since it aborts the process Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt 2009-03-27 08:30:29 UTC (rev 1203) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt 2009-03-27 08:35:53 UTC (rev 1204) @@ -1 +1,5 @@ -fails:Calling a method allows any number of args beyond required to method with a splat \ No newline at end of file +critical:Calling a method allows any number of args beyond required to method with a splat +fails:Calling a method with block argument converts the block to proc +fails:Calling a method with invalid argument count raises an ArgumentError +fails:Calling a private getter method does not permit self as a receiver +fails:Calling a method expands an array to arguments grouped in parentheses which in turn takes rest arguments

1 0