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

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

29 Mar '09

Revision: 1243 http://trac.macosforge.org/projects/ruby/changeset/1243 Author: lsansonetti(a)apple.com Date: 2009-03-28 20:31:28 -0700 (Sat, 28 Mar 2009) Log Message: ----------- fix header Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-29 00:26:20 UTC (rev 1242) +++ MacRuby/branches/experimental/io.c 2009-03-29 03:31:28 UTC (rev 1243) @@ -1,16 +1,14 @@ - /********************************************************************** +/* + * MacRuby implementation of Ruby 1.9's io.c. + * + * This file is covered by the Ruby license. See COPYING for more details. + * + * Copyright (C) 2007-2008 Apple Inc. All rights reserved. + * Copyright (C) 1993-2007 Yukihiro Matsumoto + * Copyright (C) 2000 Network Applied Communication Laboratory, Inc. + * Copyright (C) 2000 Information-technology Promotion Agency, Japan + */ - io.c - - - $Author: mame $ - created at: Fri Oct 15 18:08:59 JST 1993 - - Copyright (C) 1993-2007 Yukihiro Matsumoto - Copyright (C) 2000 Network Applied Communication Laboratory, Inc. - Copyright (C) 2000 Information-technology Promotion Agency, Japan - -**********************************************************************/ - #include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/signal.h"

1 0

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

29 Mar '09

Revision: 1242 http://trac.macosforge.org/projects/ruby/changeset/1242 Author: eloy.de.enige(a)gmail.com Date: 2009-03-28 17:26:20 -0700 (Sat, 28 Mar 2009) Log Message: ----------- Revert "A temporary hack to fix gets() behavior at end of line until I figure out exactly what is wrong with #eof?" This reverts commit 34d08b6fc3c12e136431fb50d1414ab2e6816a2c. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-28 23:57:01 UTC (rev 1241) +++ MacRuby/branches/experimental/io.c 2009-03-29 00:26:20 UTC (rev 1242) @@ -1265,7 +1265,7 @@ } } } - if ((rb_io_eof(io, 0) == Qtrue) && (RSTRING_LEN(bstr) == 0)) return Qnil; + return bstr; }

1 0

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

28 Mar '09

Revision: 1241 http://trac.macosforge.org/projects/ruby/changeset/1241 Author: pthomson(a)apple.com Date: 2009-03-28 16:57:01 -0700 (Sat, 28 Mar 2009) Log Message: ----------- A temporary hack to fix gets() behavior at end of line until I figure out exactly what is wrong with #eof? Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-28 23:47:54 UTC (rev 1240) +++ MacRuby/branches/experimental/io.c 2009-03-28 23:57:01 UTC (rev 1241) @@ -1265,7 +1265,7 @@ } } } - + if ((rb_io_eof(io, 0) == Qtrue) && (RSTRING_LEN(bstr) == 0)) return Qnil; return bstr; }

1 0

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

28 Mar '09

Revision: 1240 http://trac.macosforge.org/projects/ruby/changeset/1240 Author: pthomson(a)apple.com Date: 2009-03-28 16:47:54 -0700 (Sat, 28 Mar 2009) Log Message: ----------- First stage of a bug fix in gets. Oh, and I implemented readline. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-28 21:07:14 UTC (rev 1239) +++ MacRuby/branches/experimental/io.c 2009-03-28 23:47:54 UTC (rev 1240) @@ -1248,15 +1248,17 @@ CFDataSetLength(data, r.location); } } else { - // this is kind of a stupid implementation... + // Though this isn't the worst possible implementation, it could + // certainly use a little work. If it causes problems we'll take a look at it. long string_offset = 0; + int seplen = RSTRING_LEN(sep); for(;;) { - CFDataIncreaseLength(data, 1); + CFDataIncreaseLength(data, seplen); UInt8 *b = CFDataGetMutableBytePtr(data) + string_offset; - long read = rb_io_read_internal(io_struct, b, 1); + long read = rb_io_read_internal(io_struct, b, seplen); CFRange r = CFStringFind((CFStringRef)bstr, (CFStringRef)sep, 0); - if (r.location != kCFNotFound) { - CFDataSetLength(data, r.location + RSTRING_LEN(sep)); + if ((r.location != kCFNotFound) || (rb_io_eof(io, 0) == Qtrue)) { + CFDataSetLength(data, r.location + (seplen)); break; } else { string_offset += read; @@ -1331,7 +1333,9 @@ static VALUE rb_io_readline(VALUE io, SEL sel, int argc, VALUE *argv) { -rb_notimplement(); + VALUE ret = rb_io_gets_m(io, sel, argc, argv); + if(NIL_P(ret)) rb_eof_error(); + return ret; } /* @@ -1843,44 +1847,7 @@ VALUE rb_io_gets(VALUE io, SEL sel) { - rb_io_t *io_struct = ExtractIOStruct(io); - rb_io_assert_readable(io_struct); - - VALUE outbuf = rb_bytestring_new(); - CFMutableDataRef data = rb_bytestring_wrapped_data(outbuf); - - long s = 512; - CFDataSetLength(data, s); - UInt8 *buf = CFDataGetMutableBytePtr(data); - - // FIXME this is a very naive implementation - - long data_read = 0; - while (true) { - UInt8 byte; - if (rb_io_read_internal(io_struct, &byte, 1) != 1) { - break; - } - - if (data_read >= s) { - s += s; - CFDataSetLength(data, s); - buf = CFDataGetMutableBytePtr(data); - } - buf[data_read++] = byte; - - if (byte == '\n') { - break; - } - } - - if (data_read == 0) { - return Qnil; - } - - CFDataSetLength(data, data_read); - - return outbuf; + return rb_io_gets_m(io, sel, 0, NULL); } /*

1 0

[1239] MacRubyWebsite/trunk/content/feeds/posts/macruby/index.txt
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1239 http://trac.macosforge.org/projects/ruby/changeset/1239 Author: lsansonetti(a)apple.com Date: 2009-03-28 14:07:14 -0700 (Sat, 28 Mar 2009) Log Message: ----------- fixed the rss link Modified Paths: -------------- MacRubyWebsite/trunk/content/feeds/posts/macruby/index.txt Modified: MacRubyWebsite/trunk/content/feeds/posts/macruby/index.txt =================================================================== --- MacRubyWebsite/trunk/content/feeds/posts/macruby/index.txt 2009-03-28 21:00:42 UTC (rev 1238) +++ MacRubyWebsite/trunk/content/feeds/posts/macruby/index.txt 2009-03-28 21:07:14 UTC (rev 1239) @@ -2,7 +2,7 @@ title: MacRuby Posts description: News posts for the MacRuby project at Mac OS Forge. created_at: 2008-08-02 14:06:40.000000 -06:00 -link: http://macruby.infoether.com +link: http://macruby.org extension: xml layout: nil dirty: true

1 0

[1238] MacRubyWebsite/trunk/Sitefile
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1238 http://trac.macosforge.org/projects/ruby/changeset/1238 Author: lsansonetti(a)apple.com Date: 2009-03-28 14:00:42 -0700 (Sat, 28 Mar 2009) Log Message: ----------- the default Sitefile (warning: only me can access it right now) Modified Paths: -------------- MacRubyWebsite/trunk/Sitefile Modified: MacRubyWebsite/trunk/Sitefile =================================================================== --- MacRubyWebsite/trunk/Sitefile 2009-03-28 21:00:20 UTC (rev 1237) +++ MacRubyWebsite/trunk/Sitefile 2009-03-28 21:00:42 UTC (rev 1238) @@ -1,6 +1,6 @@ -SITE.user = 'rich' -SITE.host = 'infoether.com' -SITE.remote_dir = '/var/www/macruby.infoether.com' +SITE.user = 'sansonet' +SITE.host = 'gamma.macosforge.org' +SITE.remote_dir = '/www/hosts/www.macruby.org' task :default => :build

1 0

[1237] MacRubyWebsite/trunk/content/roadmap.txt
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1237 http://trac.macosforge.org/projects/ruby/changeset/1237 Author: lsansonetti(a)apple.com Date: 2009-03-28 14:00:20 -0700 (Sat, 28 Mar 2009) Log Message: ----------- fixed roadmap to mention that 0.4 was released Modified Paths: -------------- MacRubyWebsite/trunk/content/roadmap.txt Modified: MacRubyWebsite/trunk/content/roadmap.txt =================================================================== --- MacRubyWebsite/trunk/content/roadmap.txt 2009-03-28 21:00:02 UTC (rev 1236) +++ MacRubyWebsite/trunk/content/roadmap.txt 2009-03-28 21:00:20 UTC (rev 1237) @@ -18,7 +18,7 @@ * Can read BridgeSupport files. * Integration with the Objective-C garbage collector. -h2. 0.2 (released 2008-06-06 for WWDC) +h2. 0.2 (released 2008-06-06) * Rewrite of the String, Array and Hash builtin classes using CoreFoundation. * Re-implementation of the Ruby interface on the CoreFoundation classes. @@ -33,7 +33,7 @@ * HotCocoa layer. * Performance work, should be fast. -h2. 0.4 (to be released, soon) +h2. 0.4 (released 2009-03-09) * Threaded GC by default. * 64-bit support. @@ -46,10 +46,10 @@ * Better support for bytestrings. * Rewrite IO with CoreFoundation. -* New virtual machine. +* New virtual machine based on LLVM. h2. 0.6 (to be released, no release date planned yet) * RubyCocoa compatible layer. * OSA (Open Scripting Architecture) conformance. -* AppleEvent API. \ No newline at end of file +* AppleEvent API.

1 0

[1236] MacRubyWebsite/trunk/content/blog/2009/03
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1236 http://trac.macosforge.org/projects/ruby/changeset/1236 Author: lsansonetti(a)apple.com Date: 2009-03-28 14:00:02 -0700 (Sat, 28 Mar 2009) Log Message: ----------- added experimental-branch blog article Added Paths: ----------- MacRubyWebsite/trunk/content/blog/2009/03/28/ MacRubyWebsite/trunk/content/blog/2009/03/28/experimental-branch.txt Added: MacRubyWebsite/trunk/content/blog/2009/03/28/experimental-branch.txt =================================================================== --- MacRubyWebsite/trunk/content/blog/2009/03/28/experimental-branch.txt (rev 0) +++ MacRubyWebsite/trunk/content/blog/2009/03/28/experimental-branch.txt 2009-03-28 21:00:02 UTC (rev 1236) @@ -0,0 +1,44 @@ +--- +title: An Experimental MacRuby +created_at: 2009-03-28 08:24:51.725991 -04:00 +blog_post: true +layout: blog_entry +author: lrz +filter: + - erb + - textile +--- +<% @page[:excerpt] = capture_erb do %> +As you might have noticed, MacRuby 0.4 has just been released a few days ago. It's now time to focus on the next release, 0.5, which will be principally dedicated to performance. +<% end %> +<%= RedCloth.new((a)page.excerpt).to_html %> + +h3. New Virtual Machine + +A new virtual machine based on the "LLVM compiler infrastructure":http://llvm.org/ has been developed and integrated as a replacement for YARV. + +The new VM transforms the abstract source tree (AST) directly from the parser into LLVM's intermediate representation (IR), which is then compiled into optimized machine code. A number of other key optimizations have also been completed, such as fast fixnum arithmetic, cached method dispatch, zero-cost IA64 exceptions, fast instance variable access, constants caching, fast break/next, cheap local variables, tail call optimization and much more. + +While the amount of work remaining is significant, the compiler is already able to compile most of the Ruby syntax and the new runtime is mostly complete. Early performance measurements are also very promising, with substantial room for improvement remaining. + +h3. New IO Subsystem + +A new IO implementation based on "CoreFoundation streams":http://developer.apple.com/documentation/CoreFOundation/Reference/CFStreamConstants/Reference/reference.html is under active development. The objective of this work is to provide a cleaner and faster implementation of the various IO operations; additionally, we will be able to perform asynchronous operations through the principal run loop. + +A ByteString class which silently inherits from String has been introduced and is now used as the return value of all IO operations. Its backing store is a "CFMutableDataRef":http://developer.apple.com/DOCUMENTATION/CoreFoundation/Reference/CFMutableDataRef/Reference/reference.html, which integrates better with the new IO subsystem and offers substantially better performance. + +h3. RubySpec Integration + +Performance without compatibility is, of course, meaningless. We have therefore integrated the "RubySpec":http://rubyspec.org/ project and are aiming to pass all the specifications. + +The current experimental branch is already able to pass most of the language specifications and will be a standard part of our regression test suite. We are also actively working on upgrading the specifications to match the Ruby 1.9 behaviors. + +h3. Want to Help? + +If you want to help or simply give the new changes a try, everything is on the experimental SVN branch. + +<pre class="commands"> +$ svn co http://svn.macosforge.org/repository/ruby/MacRuby/branches/experimental macruby-experimental +</pre> + +Please make sure to read the README file for information regarding requirements, dependencies and build instructions. Do not hesitate to contact us if you need more info! Property changes on: MacRubyWebsite/trunk/content/blog/2009/03/28/experimental-branch.txt ___________________________________________________________________ Added: svn:eol-style + native

1 0

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

28 Mar '09

Revision: 1235 http://trac.macosforge.org/projects/ruby/changeset/1235 Author: pthomson(a)apple.com Date: 2009-03-28 13:02:24 -0700 (Sat, 28 Mar 2009) Log Message: ----------- Added a preliminary IO#gets. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-28 10:45:51 UTC (rev 1234) +++ MacRuby/branches/experimental/io.c 2009-03-28 20:02:24 UTC (rev 1235) @@ -1206,7 +1206,65 @@ static VALUE rb_io_gets_m(VALUE io, SEL sel, int argc, VALUE *argv) { - rb_notimplement(); + VALUE sep, limit; + rb_scan_args(argc, argv, "02", &sep, &limit); + rb_io_t *io_struct = ExtractIOStruct(io); + + if (rb_io_eof(io, 0) == Qtrue) { + return Qnil; + } + + if (NIL_P(rb_rs)) { + // TODO: Get rid of this when the fix comes in for the $\ variable. + rb_rs = (VALUE)CFSTR("\n"); + } + + if (NIL_P(sep)) { + // no arguments were passed at all. + // FIXME: if you pass nil, it's suppose to read everything. that sucks. + sep = rb_rs; + limit = Qnil; + } else { + if (TYPE(sep) != T_STRING) { + // sep wasn't given, limit was. + limit = sep; + sep = rb_rs; + } else if (RSTRING_LEN(sep) == 0) { + sep = (VALUE)CFSTR("\n\n"); + } + } + long line_limit = (NIL_P(limit) ? -1 : FIX2LONG(limit)); + // now that we've got our parameters, let's get down to business. + + VALUE bstr = rb_bytestring_new(); + CFMutableDataRef data = rb_bytestring_wrapped_data(bstr); + // this is not the best code i've ever written, but it'll do. + if(line_limit != -1) { + CFDataIncreaseLength(data, line_limit); + UInt8 *b = CFDataGetMutableBytePtr(data); + rb_io_read_internal(io_struct, b, line_limit); + CFRange r = CFStringFind((CFStringRef)bstr, (CFStringRef)sep, 0); + if (r.location != kCFNotFound) { + CFDataSetLength(data, r.location); + } + } else { + // this is kind of a stupid implementation... + long string_offset = 0; + for(;;) { + CFDataIncreaseLength(data, 1); + UInt8 *b = CFDataGetMutableBytePtr(data) + string_offset; + long read = rb_io_read_internal(io_struct, b, 1); + CFRange r = CFStringFind((CFStringRef)bstr, (CFStringRef)sep, 0); + if (r.location != kCFNotFound) { + CFDataSetLength(data, r.location + RSTRING_LEN(sep)); + break; + } else { + string_offset += read; + } + } + } + + return bstr; } /*

1 0

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

28 Mar '09

Revision: 1234 http://trac.macosforge.org/projects/ruby/changeset/1234 Author: vincent.isambart(a)gmail.com Date: 2009-03-28 03:45:51 -0700 (Sat, 28 Mar 2009) Log Message: ----------- added multiple assignment failing tests Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-28 03:46:56 UTC (rev 1233) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-28 10:45:51 UTC (rev 1234) @@ -316,13 +316,18 @@ assert ':ok', "a, b, c = [1, 2]; p :ok if a == 1 and b == 2 and c == nil" assert ':ok', "a, b, c = nil; p :ok if a == nil and b == nil and c == nil" + assert '[nil, [], nil]', "a, *b, c = nil; p [a, b, c]" + assert '[1, [], 2]', "a, *b, c = 1, 2; p [a, b, c]" + assert '[1, [2, 3], 4]', "a, *b, c = 1, 2, 3, 4; p [a, b, c]" + assert '[[1, 2, 3], 4]', "*a, b = 1, 2, 3, 4; p [a, b]" + assert '4', "*, a = 1, 2, 3, 4; p a" + assert '[1, [2, 3], 4]', "(a, *b), c = [1, 2, 3], 4; p [a, b, c]" + assert ':ok', '* = 1,2; p :ok' assert '[1, 2]', 'x = (* = 1,2); p x' assert '[42]', "a=[1,2,3]; b=[0,3]; a[*b]=42; p a" - # TODO add more multiple assignments test - assert '42', "a=[20]; a[0] += 22; p a[0]" assert '42', "a=[80]; a[0] -= 38; p a[0]" assert '42', "a=[84]; a[0] /= 2; p a[0]"

1 0