September 2010 - macruby-changes - lists.macosforge.org

[4563] MacRuby/trunk/version.h
by source_changes＠macosforge.org 30 Sep '10

30 Sep '10

Revision: 4563 http://trac.macosforge.org/projects/ruby/changeset/4563 Author: lsansonetti(a)apple.com Date: 2010-09-30 16:03:59 -0700 (Thu, 30 Sep 2010) Log Message: ----------- trunk is now 0.8 Modified Paths: -------------- MacRuby/trunk/version.h Modified: MacRuby/trunk/version.h =================================================================== --- MacRuby/trunk/version.h 2010-09-30 23:02:23 UTC (rev 4562) +++ MacRuby/trunk/version.h 2010-09-30 23:03:59 UTC (rev 4563) @@ -1,5 +1,5 @@ #define RUBY_ENGINE "macruby" -#define MACRUBY_VERSION "0.7" +#define MACRUBY_VERSION "0.8" #define RUBY_VERSION "1.9.2" #define RUBY_RELEASE_DATE "2008-06-03"

1 0

[4562] MacRuby/branches/0.7/
by source_changes＠macosforge.org 30 Sep '10

30 Sep '10

Revision: 4562 http://trac.macosforge.org/projects/ruby/changeset/4562 Author: lsansonetti(a)apple.com Date: 2010-09-30 16:02:23 -0700 (Thu, 30 Sep 2010) Log Message: ----------- branching for 0.7 Added Paths: ----------- MacRuby/branches/0.7/ Property changes on: MacRuby/branches/0.7 ___________________________________________________________________ Added: svn:ignore + # Binary files. *.o .ext miniruby markgc macruby *.rbo *.dylib # Generated files. .installed.list doc include/ruby/config.h dtrace.h revision.h parse.c y.tab.c lex.c miniprelude.c node_name.inc prelude.c rbconfig.rb Added: svn:mergeinfo + /MacRuby/branches/icu:3533-3744

1 0

[4561] MacRuby/trunk/spec/frozen/tags/macruby/language/defined_tags.txt
by source_changes＠macosforge.org 30 Sep '10

30 Sep '10

Revision: 4561 http://trac.macosforge.org/projects/ruby/changeset/4561 Author: lsansonetti(a)apple.com Date: 2010-09-29 17:47:51 -0700 (Wed, 29 Sep 2010) Log Message: ----------- cleanup defined? tags Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/language/defined_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/defined_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/defined_tags.txt 2010-09-29 23:46:45 UTC (rev 4560) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/defined_tags.txt 2010-09-30 00:47:51 UTC (rev 4561) @@ -1,21 +1,19 @@ -critical:The defined? keyword returns 'super' when Subclass#no_args and created with define_method -critical:The defined? keyword returns 'super' when Subclass#args and created with define_method -critical:The defined? keyword returns 'super' when Subclass#no_args uses a block in define_method -critical:The defined? keyword returns 'super' when Subclass#args uses a block in define_method -critical:The defined? keyword for super for a method taking no arguments returns nil from a #define_method when no superclass method exists -critical:The defined? keyword for super for a method taking no arguments returns nil from a block in a #define_method when no superclass method exists -critical:The defined? keyword for super for a method taking no arguments returns 'super' from a #define_method when a superclass method exists -critical:The defined? keyword for super for a method taking no arguments returns 'super' from a block in a #define_method when a superclass method exists -critical:The defined? keyword for super for a method taking arguments returns nil from a #define_method when no superclass method exists -critical:The defined? keyword for super for a method taking arguments returns nil from a block in a #define_method when no superclass method exists -critical:The defined? keyword for super for a method taking arguments returns 'super' from a #define_method when a superclass method exists -critical:The defined? keyword for super for a method taking arguments returns 'super' from a block in a #define_method when a superclass method exists fails:The defined? keyword when called with a method name having a module as receiver returns nil if the method is private +fails:The defined? keyword when called with a method name having a module as receiver returns nil if the method is protected fails:The defined? keyword when called with a method name having a local variable as receiver calls #respond_to_missing? -fails:The defined? keyword for an expression returns nil for an expression with 'not' and an unset global variable -fails:The defined? keyword for an expression returns nil for an expression with 'not' and an unset instance variable -fails:The defined? keyword for an expression returns nil for an expression with '!' and an unset global variable -fails:The defined? keyword for an expression returns nil for an expression with '!' and an unset instance variable +fails:The defined? keyword when called with a method name having a local variable as receiver calls #respond_to_missing? +fails:The defined? keyword for an expression with logical connectives returns nil for an expression with '!' and an unset global variable +fails:The defined? keyword for an expression with logical connectives returns nil for an expression with '!' and an unset instance variable +fails:The defined? keyword for an expression with logical connectives returns nil for an expression with 'not' and an unset global variable +fails:The defined? keyword for an expression with logical connectives returns nil for an expression with 'not' and an unset instance variable +fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '&&/and' and an undefined method +fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '&&/and' and an unset class variable +fails:The defined? keyword for an expression with logical connectives does not call a method in an '&&' expression and returns 'expression' +fails:The defined? keyword for an expression with logical connectives does not call a method in an 'and' expression and returns 'expression' +fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '||/or' and an undefined method +fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '||/or' and an unset class variable +fails:The defined? keyword for an expression with logical connectives does not call a method in an '||' expression and returns 'expression' +fails:The defined? keyword for an expression with logical connectives does not call a method in an 'or' expression and returns 'expression' fails:The defined? keyword for an expression with a dynamic String returns 'expression' when the String contains a call to an undefined method fails:The defined? keyword for an expression with a dynamic String does not call the method in the String fails:The defined? keyword for an expression with a dynamic Regexp returns 'expression' when the Regexp contains a call to an undefined method @@ -45,16 +43,7 @@ fails:The defined? keyword for yield returns 'yield' if a block is passed to a method not taking a block parameter fails:The defined? keyword for yield returns 'yield' if a block is passed to a method taking a block parameter fails:The defined? keyword for super returns nil when a superclass undef's the method -fails:The defined? keyword when called with a method name having a module as receiver returns nil if the method is protected -fails:The defined? keyword for an expression with logical connectives returns nil for an expression with '!' and an unset global variable -fails:The defined? keyword for an expression with logical connectives returns nil for an expression with '!' and an unset instance variable -fails:The defined? keyword for an expression with logical connectives returns nil for an expression with 'not' and an unset global variable -fails:The defined? keyword for an expression with logical connectives returns nil for an expression with 'not' and an unset instance variable -fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '&&/and' and an undefined method -fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '&&/and' and an unset class variable -fails:The defined? keyword for an expression with logical connectives does not call a method in an '&&' expression and returns 'expression' -fails:The defined? keyword for an expression with logical connectives does not call a method in an 'and' expression and returns 'expression' -fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '||/or' and an undefined method -fails:The defined? keyword for an expression with logical connectives returns 'expression' for an expression with '||/or' and an unset class variable -fails:The defined? keyword for an expression with logical connectives does not call a method in an '||' expression and returns 'expression' -fails:The defined? keyword for an expression with logical connectives does not call a method in an 'or' expression and returns 'expression' +fails:The defined? keyword for super for a method taking no arguments returns 'super' from a #define_method when a superclass method exists +fails:The defined? keyword for super for a method taking no arguments returns 'super' from a block in a #define_method when a superclass method exists +fails:The defined? keyword for super for a method taking arguments returns 'super' from a #define_method when a superclass method exists +fails:The defined? keyword for super for a method taking arguments returns 'super' from a block in a #define_method when a superclass method exists

1 0

[4560] MacRuby/trunk/spec
by source_changes＠macosforge.org 29 Sep '10

29 Sep '10

Revision: 4560 http://trac.macosforge.org/projects/ruby/changeset/4560 Author: lsansonetti(a)apple.com Date: 2010-09-29 16:46:45 -0700 (Wed, 29 Sep 2010) Log Message: ----------- net/http specs all pass Modified Paths: -------------- MacRuby/trunk/spec/macruby.mspec Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/library/net/http/ Modified: MacRuby/trunk/spec/macruby.mspec =================================================================== --- MacRuby/trunk/spec/macruby.mspec 2010-09-29 23:44:27 UTC (rev 4559) +++ MacRuby/trunk/spec/macruby.mspec 2010-09-29 23:46:45 UTC (rev 4560) @@ -32,7 +32,6 @@ '^library/continuation', # Tons of IO issues - '^library/net/http', # due to '/fixtures/http_server' loaded in net/http/http/active_spec.rb (webrick) '^library/net/ftp', # exists the specs when running using rake spec:library and reaching net/ftp/chdir_spec.rb # Currently not working on MacRuby '^library/cgi/htmlextension', # runs fine when run separately, it seems another spec brings IO in a wrong state

1 0

[4559] MacRuby/trunk
by source_changes＠macosforge.org 29 Sep '10

29 Sep '10

Revision: 4559 http://trac.macosforge.org/projects/ruby/changeset/4559 Author: lsansonetti(a)apple.com Date: 2010-09-29 16:44:27 -0700 (Wed, 29 Sep 2010) Log Message: ----------- add basic support for __method__ and __callee__ Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/eval.c MacRuby/trunk/id.c MacRuby/trunk/id.h MacRuby/trunk/symbol.c Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-09-29 14:14:51 UTC (rev 4558) +++ MacRuby/trunk/compiler.cpp 2010-09-29 23:44:27 UTC (rev 4559) @@ -208,6 +208,7 @@ newRangeFunc = NULL; newRegexpFunc = NULL; strInternFunc = NULL; + selToSymFunc = NULL; keepVarsFunc = NULL; masgnGetElemBeforeSplatFunc = get_function("vm_masgn_get_elem_before_splat"); @@ -2367,6 +2368,26 @@ return pn; } + // __method__ or __callee__ + else if (sel == sel__method__ || sel == sel__callee__) { + + if (current_block_func != NULL || argc != 0) { + return NULL; + } + + Function *f = bb->getParent(); + Function::arg_iterator arg = f->arg_begin(); + arg++; // skip self + Value *callee_sel = arg; + + if (selToSymFunc == NULL) { + // VALUE rb_sel_to_sym(SEL sel); + selToSymFunc = cast<Function>( + module->getOrInsertFunction("rb_sel_to_sym", + RubyObjTy, PtrTy, NULL)); + } + return CallInst::Create(selToSymFunc, callee_sel, "", bb); + } return NULL; } Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-09-29 14:14:51 UTC (rev 4558) +++ MacRuby/trunk/compiler.h 2010-09-29 23:44:27 UTC (rev 4559) @@ -198,6 +198,7 @@ Function *newRangeFunc; Function *newRegexpFunc; Function *strInternFunc; + Function *selToSymFunc; Function *keepVarsFunc; Function *masgnGetElemBeforeSplatFunc; Function *masgnGetElemAfterSplatFunc; Modified: MacRuby/trunk/eval.c =================================================================== --- MacRuby/trunk/eval.c 2010-09-29 14:14:51 UTC (rev 4558) +++ MacRuby/trunk/eval.c 2010-09-29 23:44:27 UTC (rev 4559) @@ -805,14 +805,7 @@ static VALUE rb_f_method_name(VALUE rcv, SEL sel) { - ID fname = rb_frame_callee(); - - if (fname) { - return ID2SYM(fname); - } - else { - return Qnil; - } + return Qnil; } void Init_vm_eval(void); Modified: MacRuby/trunk/id.c =================================================================== --- MacRuby/trunk/id.c 2010-09-29 14:14:51 UTC (rev 4558) +++ MacRuby/trunk/id.c 2010-09-29 23:44:27 UTC (rev 4559) @@ -107,6 +107,9 @@ selLambda = sel_registerName("lambda"); selObjectForKey = sel_registerName("objectForKey:"); selSetObjectForKey = sel_registerName("setObject:forKey:"); + + sel__method__= sel_registerName("__method__"); + sel__callee__ = sel_registerName("__callee__"); #endif idAREF = rb_intern("[]"); Modified: MacRuby/trunk/id.h =================================================================== --- MacRuby/trunk/id.h 2010-09-29 14:14:51 UTC (rev 4558) +++ MacRuby/trunk/id.h 2010-09-29 23:44:27 UTC (rev 4559) @@ -117,6 +117,8 @@ extern SEL selLambda; extern SEL selObjectForKey; extern SEL selSetObjectForKey; +extern SEL sel__method__; +extern SEL sel__callee__; extern ID idIncludedModules; extern ID idIncludedInClasses; extern ID idAncestors; Modified: MacRuby/trunk/symbol.c =================================================================== --- MacRuby/trunk/symbol.c 2010-09-29 14:14:51 UTC (rev 4558) +++ MacRuby/trunk/symbol.c 2010-09-29 23:44:27 UTC (rev 4559) @@ -843,3 +843,12 @@ { return RSYM(sym)->str; } + +VALUE +rb_sel_to_sym(SEL sel) +{ + if (sel == 0) { + return Qnil; + } + return ID2SYM(rb_intern(sel_getName(sel))); +}

1 0

[4558] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 29 Sep '10

29 Sep '10

Revision: 4558 http://trac.macosforge.org/projects/ruby/changeset/4558 Author: watson1978(a)gmail.com Date: 2010-09-29 07:14:51 -0700 (Wed, 29 Sep 2010) Log Message: ----------- Fixed the Zlib::GzipReader#getbyte, #readbyte and #each_char. Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-29 01:14:30 UTC (rev 4557) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-29 14:14:51 UTC (rev 4558) @@ -2888,14 +2888,59 @@ * See Zlib::GzipReader documentation for a description. */ static VALUE +rb_gzreader_getbyte(VALUE obj, SEL sel) +{ + struct gzfile *gz = get_gzfile(obj); + VALUE dst; + + dst = gzfile_read(gz, 1); + if (!NIL_P(dst)) { + dst = INT2FIX((unsigned int)(BSTRING_PTR(dst)[0]) & 0xff); + } + return dst; +} + +/* + * See Zlib::GzipReader documentation for a description. + */ +static VALUE +rb_gzreader_readbyte(VALUE obj, SEL sel) +{ + VALUE dst; + dst = rb_gzreader_getbyte(obj, 0); + if (NIL_P(dst)) { + rb_raise(rb_eEOFError, "end of file reached"); + } + return dst; +} + +/* + * See Zlib::GzipReader documentation for a description. + */ +static VALUE +rb_gzreader_each_char(VALUE obj, SEL sel) +{ + VALUE c; + + RETURN_ENUMERATOR(obj, 0, 0); + + while (!NIL_P(c = rb_gzreader_getc(obj, 0))) { + rb_yield(c); + } + return Qnil; +} + +/* + * See Zlib::GzipReader documentation for a description. + */ +static VALUE rb_gzreader_each_byte(VALUE obj, SEL sel) { VALUE c; RETURN_ENUMERATOR(obj, 0, 0); - while (!NIL_P(c = rb_gzreader_getc(obj, 0))) { - c = INT2FIX((unsigned int)(BSTRING_PTR(c)[0]) & 0xff); + while (!NIL_P(c = rb_gzreader_getbyte(obj, 0))) { rb_yield(c); } return Qnil; @@ -3323,8 +3368,11 @@ rb_objc_define_method(cGzipReader, "read", rb_gzreader_read, -1); rb_objc_define_method(cGzipReader, "readpartial", rb_gzreader_readpartial, -1); rb_objc_define_method(cGzipReader, "getc", rb_gzreader_getc, 0); + rb_objc_define_method(cGzipReader, "getbyte", rb_gzreader_getbyte, 0); rb_objc_define_method(cGzipReader, "readchar", rb_gzreader_readchar, 0); + rb_objc_define_method(cGzipReader, "readbyte", rb_gzreader_readbyte, 0); rb_objc_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0); + rb_objc_define_method(cGzipReader, "each_char", rb_gzreader_each_char, 0); rb_objc_define_method(cGzipReader, "bytes", rb_gzreader_each_byte, 0); rb_objc_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1); rb_objc_define_method(cGzipReader, "gets", rb_gzreader_gets, -1);

1 0

[4557] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 29 Sep '10

29 Sep '10

Revision: 4557 http://trac.macosforge.org/projects/ruby/changeset/4557 Author: watson1978(a)gmail.com Date: 2010-09-28 18:14:30 -0700 (Tue, 28 Sep 2010) Log Message: ----------- Zlib::GzipReader#getc should return a character. Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-29 00:44:16 UTC (rev 4556) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-29 01:14:30 UTC (rev 4557) @@ -2866,13 +2866,8 @@ rb_gzreader_getc(VALUE obj, SEL sel) { struct gzfile *gz = get_gzfile(obj); - VALUE dst; - dst = gzfile_read(gz, 1); - if (!NIL_P(dst)) { - dst = INT2FIX((unsigned int)(BSTRING_PTR(dst)[0]) & 0xff); - } - return dst; + return gzfile_read(gz, 1); } /* @@ -2900,6 +2895,7 @@ RETURN_ENUMERATOR(obj, 0, 0); while (!NIL_P(c = rb_gzreader_getc(obj, 0))) { + c = INT2FIX((unsigned int)(BSTRING_PTR(c)[0]) & 0xff); rb_yield(c); } return Qnil;

1 0

[4556] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 29 Sep '10

29 Sep '10

Revision: 4556 http://trac.macosforge.org/projects/ruby/changeset/4556 Author: watson1978(a)gmail.com Date: 2010-09-28 17:44:16 -0700 (Tue, 28 Sep 2010) Log Message: ----------- Fixed that throws a buffer error exception in Zlib::Deflate#params. Merged from CRuby 1.9.2. Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-29 00:11:24 UTC (rev 4555) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-29 00:44:16 UTC (rev 4556) @@ -1236,15 +1236,20 @@ struct zstream *z = get_zstream(obj); int level, strategy; int err; + uInt n; level = ARG_LEVEL(v_level); strategy = ARG_STRATEGY(v_strategy); + n = z->stream.avail_out; err = deflateParams(&z->stream, level, strategy); + z->buf_filled += n - z->stream.avail_out; while (err == Z_BUF_ERROR) { rb_warning("deflateParams() returned Z_BUF_ERROR"); zstream_expand_buffer(z); + n = z->stream.avail_out; err = deflateParams(&z->stream, level, strategy); + z->buf_filled += n - z->stream.avail_out; } if (err != Z_OK) { raise_zlib_error(err, z->stream.msg);

1 0

[4555] MacRuby/trunk/bin/rubyc
by source_changes＠macosforge.org 29 Sep '10

29 Sep '10

Revision: 4555 http://trac.macosforge.org/projects/ruby/changeset/4555 Author: lsansonetti(a)apple.com Date: 2010-09-28 17:11:24 -0700 (Tue, 28 Sep 2010) Log Message: ----------- AOT: disable frame pointer elimination optimization because it will mess up with the backtracing routines Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-09-28 23:38:57 UTC (rev 4554) +++ MacRuby/trunk/bin/rubyc 2010-09-29 00:11:24 UTC (rev 4555) @@ -73,7 +73,7 @@ @tmpdir = (ENV['TMPDIR'] or '/tmp') @tmpfiles = [] - @llc_flags = '-relocation-model=pic ' + @llc_flags = '-relocation-model=pic -disable-fp-elim ' if system("#{@llc} -help | grep jit-enable-eh >& /dev/null") @llc_flags << '-jit-enable-eh' else

1 0

[4554] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 28 Sep '10

28 Sep '10

Revision: 4554 http://trac.macosforge.org/projects/ruby/changeset/4554 Author: watson1978(a)gmail.com Date: 2010-09-28 16:38:57 -0700 (Tue, 28 Sep 2010) Log Message: ----------- Fixed what was not able to handle String including '\0' in Zlib::GzipWriter#comment= and Zlib::GzipWriter#orig_name=. Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-28 22:32:38 UTC (rev 4553) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-28 23:38:57 UTC (rev 4554) @@ -2379,7 +2379,8 @@ s = rb_str_dup(rb_str_to_str(str)); p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s)); if (p) { - rb_str_resize(s, p - RSTRING_PTR(s)); + long beg = p - RSTRING_PTR(s); + rb_str_delete(s, beg, RSTRING_LEN(s) - beg); } gz->orig_name = s; return str; @@ -2401,7 +2402,8 @@ s = rb_str_dup(rb_str_to_str(str)); p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s)); if (p) { - rb_str_resize(s, p - (char*)BSTRING_PTR(s)); + long beg = p - RSTRING_PTR(s); + rb_str_delete(s, beg, RSTRING_LEN(s) - beg); } gz->comment = s; return str;

1 0