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

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

20 Mar '09

Revision: 1023 http://trac.macosforge.org/projects/ruby/changeset/1023 Author: pthomson(a)apple.com Date: 2009-03-20 13:06:48 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Well, let's just pretend that that embarrassing bug never happened. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-20 20:01:35 UTC (rev 1022) +++ MacRuby/branches/experimental/io.c 2009-03-20 20:06:48 UTC (rev 1023) @@ -1811,7 +1811,7 @@ * object as a parameter to the block, the child version of the block * will be passed <code>nil</code>, and the child's standard in and * standard out will be connected to the parent through the pipe. Not - * available on all platforms. + * available on all platforms.s * * f = IO.popen("uname") * p f.readlines @@ -1844,7 +1844,7 @@ } FILE *process = popen(StringValueCStr(process_name), RSTRING_PTR(mode)); - if (process) { + if (process == NULL) { rb_raise(rb_eIOError, "system call to popen() failed"); }

1 0

[1022] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Mar '09

20 Mar '09

Revision: 1022 http://trac.macosforge.org/projects/ruby/changeset/1022 Author: pthomson(a)apple.com Date: 2009-03-20 13:01:35 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Implemented a preliminary version of popen(). 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-20 18:27:46 UTC (rev 1021) +++ MacRuby/branches/experimental/include/ruby/io.h 2009-03-20 20:01:35 UTC (rev 1022) @@ -27,12 +27,15 @@ // The streams. CFReadStreamRef readStream; CFWriteStreamRef writeStream; + + // The Unixy low-level file handles. + int fd; // You can expect this to be what the above CFStreams point to. + FILE *fp; // NOTE: Only used by #popen. Don't depend on it! // Additional information. CFStringRef path; pid_t pid; int lineno; - int fd; bool sync; // For ungetc. Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-20 18:27:46 UTC (rev 1021) +++ MacRuby/branches/experimental/io.c 2009-03-20 20:01:35 UTC (rev 1022) @@ -342,6 +342,9 @@ else { io_struct->writeStream = NULL; } + + io_struct->fp = NULL; + io_struct->pid = -1; // TODO: Eventually make the ungetc_buf a ByteString io_struct->fd = fd; @@ -1834,7 +1837,20 @@ static VALUE rb_io_s_popen(VALUE klass, SEL sel, int argc, VALUE *argv) { -rb_notimplement(); + VALUE process_name, mode; + 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)); + if (process) { + 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; + return io; } /*

1 0

[1021] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Mar '09

20 Mar '09

Revision: 1021 http://trac.macosforge.org/projects/ruby/changeset/1021 Author: lsansonetti(a)apple.com Date: 2009-03-20 11:27:46 -0700 (Fri, 20 Mar 2009) Log Message: ----------- empty implementation of #flush (for now) + re-enabled the IO finalizer Modified Paths: -------------- MacRuby/branches/experimental/gc.c MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/gc.c =================================================================== --- MacRuby/branches/experimental/gc.c 2009-03-20 17:59:04 UTC (rev 1020) +++ MacRuby/branches/experimental/gc.c 2009-03-20 18:27:46 UTC (rev 1021) @@ -38,10 +38,7 @@ #endif static auto_zone_t *__auto_zone = NULL; -int rb_io_fptr_finalize(struct rb_io_t* t) -{ - rb_notimplement(); -} +int rb_io_fptr_finalize(struct rb_io_t *io_struct); static VALUE nomem_error; Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-20 17:59:04 UTC (rev 1020) +++ MacRuby/branches/experimental/io.c 2009-03-20 18:27:46 UTC (rev 1021) @@ -352,6 +352,24 @@ io_struct->sync = mode & FMODE_SYNC; } +static void +io_struct_close(rb_io_t *io_struct, bool close_read, bool close_write) +{ + if (close_read && io_struct->readStream != NULL) { + CFReadStreamClose(io_struct->readStream); + } + if (close_write && io_struct->writeStream != NULL) { + CFWriteStreamClose(io_struct->writeStream); + } +} + +int +rb_io_fptr_finalize(rb_io_t *io_struct) +{ + io_struct_close(io_struct, true, true); + return 1; +} + static VALUE prep_io(int fd, int mode, VALUE klass) { @@ -473,7 +491,8 @@ VALUE rb_io_flush(VALUE io, SEL sel) { - rb_notimplement(); + // TODO investigate how to flush a CFStream... + return io; } /* @@ -1507,12 +1526,7 @@ { rb_io_t *io_struct = ExtractIOStruct(io); - if (close_read && io_struct->readStream != NULL) { - CFReadStreamClose(io_struct->readStream); - } - if (close_write && io_struct->writeStream != NULL) { - CFWriteStreamClose(io_struct->writeStream); - } + io_struct_close(io_struct, close_read, close_write); } static VALUE

1 0

[1020] MacRuby/branches/experimental/signal.c
by source_changes＠macosforge.org 20 Mar '09

20 Mar '09

Revision: 1020 http://trac.macosforge.org/projects/ruby/changeset/1020 Author: lsansonetti(a)apple.com Date: 2009-03-20 10:59:04 -0700 (Fri, 20 Mar 2009) Log Message: ----------- ported to rb_objc_define_method() Modified Paths: -------------- MacRuby/branches/experimental/signal.c Modified: MacRuby/branches/experimental/signal.c =================================================================== --- MacRuby/branches/experimental/signal.c 2009-03-20 17:34:16 UTC (rev 1019) +++ MacRuby/branches/experimental/signal.c 2009-03-20 17:59:04 UTC (rev 1020) @@ -213,7 +213,7 @@ */ static VALUE -esignal_init(int argc, VALUE *argv, VALUE self) +esignal_init(VALUE self, SEL sel, int argc, VALUE *argv) { int argnum = 1; VALUE sig = Qnil; @@ -271,13 +271,13 @@ */ static VALUE -esignal_signo(VALUE self) +esignal_signo(VALUE self, SEL sel) { return rb_iv_get(self, "signo"); } static VALUE -interrupt_init(int argc, VALUE *argv, VALUE self) +interrupt_init(VALUE self, SEL sel, int argc, VALUE *argv) { VALUE args[2]; @@ -914,7 +914,7 @@ * Terminating: 27460 */ static VALUE -sig_trap(int argc, VALUE *argv) +sig_trap(VALUE rcv, SEL sel, int argc, VALUE *argv) { struct trap_arg arg; @@ -961,7 +961,7 @@ * Signal.list #=> {"ABRT"=>6, "ALRM"=>14, "BUS"=>7, "CHLD"=>17, "CLD"=>17, "CONT"=>18, "FPE"=>8, "HUP"=>1, "ILL"=>4, "INT"=>2, "IO"=>29, "IOT"=>6, "KILL"=>9, "PIPE"=>13, "POLL"=>29, "PROF"=>27, "PWR"=>30, "QUIT"=>3, "SEGV"=>11, "STOP"=>19, "SYS"=>31, "TERM"=>15, "TRAP"=>5, "TSTP"=>20, "TTIN"=>21, "TTOU"=>22, "URG"=>23, "USR1"=>10, "USR2"=>12, "VTALRM"=>26, "WINCH"=>28, "XCPU"=>24, "XFSZ"=>25} */ static VALUE -sig_list(void) +sig_list(VALUE rcv, SEL sel) { VALUE h = rb_hash_new(); const struct signals *sigs; @@ -1085,14 +1085,14 @@ #ifndef MACOS_UNUSE_SIGNAL VALUE mSignal = rb_define_module("Signal"); - rb_define_global_function("trap", sig_trap, -1); - rb_define_module_function(mSignal, "trap", sig_trap, -1); - rb_define_module_function(mSignal, "list", sig_list, 0); + rb_objc_define_method(rb_mKernel, "trap", sig_trap, -1); + rb_objc_define_method(*(VALUE *)mSignal, "trap", sig_trap, -1); + rb_objc_define_method(*(VALUE *)mSignal, "list", sig_list, 0); - rb_define_method(rb_eSignal, "initialize", esignal_init, -1); - rb_define_method(rb_eSignal, "signo", esignal_signo, 0); + rb_objc_define_method(rb_eSignal, "initialize", esignal_init, -1); + rb_objc_define_method(rb_eSignal, "signo", esignal_signo, 0); rb_alias(rb_eSignal, rb_intern("signm"), rb_intern("message")); - rb_define_method(rb_eInterrupt, "initialize", interrupt_init, -1); + rb_objc_define_method(rb_eInterrupt, "initialize", interrupt_init, -1); install_sighandler(SIGINT, sighandler); #ifdef SIGHUP

1 0

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

20 Mar '09

Revision: 1019 http://trac.macosforge.org/projects/ruby/changeset/1019 Author: lsansonetti(a)apple.com Date: 2009-03-20 10:34:16 -0700 (Fri, 20 Mar 2009) Log Message: ----------- reset self every time the block is taken from the cache Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-20 09:03:34 UTC (rev 1018) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-20 17:34:16 UTC (rev 1019) @@ -4876,7 +4876,6 @@ b->imp = imp; b->node = node; - b->self = self; b->is_lambda = true; b->dvars_size = dvars_size; @@ -4888,6 +4887,7 @@ assert(b->dvars_size == dvars_size); } + b->self = self; if (dvars_size > 0) { va_list ar; va_start(ar, dvars_size);

1 0

[1018] MacRuby/branches/experimental/mspec/lib/mspec
by source_changes＠macosforge.org 20 Mar '09

20 Mar '09

Revision: 1018 http://trac.macosforge.org/projects/ruby/changeset/1018 Author: eloy.de.enige(a)gmail.com Date: 2009-03-20 02:03:34 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Removed File.exist? workaround as it now works in trunk. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb Removed Paths: ------------- MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb Modified: MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb 2009-03-20 09:02:31 UTC (rev 1017) +++ MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb 2009-03-20 09:03:34 UTC (rev 1018) @@ -8,8 +8,6 @@ require 'mspec/helpers/tmp' require 'mspec/runner/actions/timer' -require 'mspec/utils/roxor_helper' - class MSpecMain < MSpecScript def initialize config[:includes] = [] Deleted: MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb 2009-03-20 09:02:31 UTC (rev 1017) +++ MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb 2009-03-20 09:03:34 UTC (rev 1018) @@ -1,5 +0,0 @@ -class File - def self.exist?(path) - NSFileManager.defaultManager.fileExistsAtPath(path) == 1 - end -end \ No newline at end of file

1 0

[1017] MacRuby/branches/experimental/mspec/lib/mspec.rb
by source_changes＠macosforge.org 20 Mar '09

20 Mar '09

Revision: 1017 http://trac.macosforge.org/projects/ruby/changeset/1017 Author: eloy.de.enige(a)gmail.com Date: 2009-03-20 02:02:31 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Don't require pp for the specs. Added a simple replacement, but it's not enabled yet, first need to deal with Signal#trap. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec.rb Modified: MacRuby/branches/experimental/mspec/lib/mspec.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec.rb 2009-03-20 08:49:34 UTC (rev 1016) +++ MacRuby/branches/experimental/mspec/lib/mspec.rb 2009-03-20 09:02:31 UTC (rev 1017) @@ -8,4 +8,11 @@ # If the implementation on which the specs are run cannot # load pp from the standard library, add a pp.rb file that # defines the #pretty_inspect method on Object or Kernel. -require 'pp' \ No newline at end of file +# require 'pp' + +# TODO: Need to check if this is enough. +# module Kernel +# def pretty_inspect(obj) +# puts obj.inspect +# end +# end \ No newline at end of file

1 0

[1016] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Mar '09

20 Mar '09

Revision: 1016 http://trac.macosforge.org/projects/ruby/changeset/1016 Author: eloy.de.enige(a)gmail.com Date: 2009-03-20 01:49:34 -0700 (Fri, 20 Mar 2009) Log Message: ----------- For now run each language spec directly from the Rakefile as roxor is not capable yet of going through the mspec script. Basically the net result would be the same. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec/helpers/ruby_exe.rb MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/mspec/lib/mspec/helpers/ruby_exe.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/helpers/ruby_exe.rb 2009-03-20 08:14:53 UTC (rev 1015) +++ MacRuby/branches/experimental/mspec/lib/mspec/helpers/ruby_exe.rb 2009-03-20 08:49:34 UTC (rev 1016) @@ -114,6 +114,8 @@ end end + RUBY_EXE = './miniruby' + unless Object.const_defined?(:RUBY_EXE) and RUBY_EXE require 'rbconfig' Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-20 08:14:53 UTC (rev 1015) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-20 08:49:34 UTC (rev 1016) @@ -13,6 +13,9 @@ desc "Run language examples" task :language do - sh "#{MSPEC} spec/frozen/language/**/*_spec.rb" + #sh "#{MSPEC} spec/frozen/language/**/*_spec.rb" + Dir.glob('spec/frozen/language/**/*_spec.rb').each do |spec| + sh "#{MSPEC}-run #{spec}" + end end end \ No newline at end of file

1 0

[1015] MacRuby/branches/experimental/mspec/lib/mspec
by source_changes＠macosforge.org 20 Mar '09

20 Mar '09

Revision: 1015 http://trac.macosforge.org/projects/ruby/changeset/1015 Author: eloy.de.enige(a)gmail.com Date: 2009-03-20 01:14:53 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Added roxor_helper.rb which now contains a ruby version of File.exist? which uses NSFileManager to do its work. This is obviously temporarily. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb Added Paths: ----------- MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb Modified: MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb 2009-03-20 07:28:36 UTC (rev 1014) +++ MacRuby/branches/experimental/mspec/lib/mspec/commands/mspec.rb 2009-03-20 08:14:53 UTC (rev 1015) @@ -8,6 +8,7 @@ require 'mspec/helpers/tmp' require 'mspec/runner/actions/timer' +require 'mspec/utils/roxor_helper' class MSpecMain < MSpecScript def initialize Added: MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb (rev 0) +++ MacRuby/branches/experimental/mspec/lib/mspec/utils/roxor_helper.rb 2009-03-20 08:14:53 UTC (rev 1015) @@ -0,0 +1,5 @@ +class File + def self.exist?(path) + NSFileManager.defaultManager.fileExistsAtPath(path) == 1 + end +end \ No newline at end of file

1 0

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

20 Mar '09

Revision: 1014 http://trac.macosforge.org/projects/ruby/changeset/1014 Author: lsansonetti(a)apple.com Date: 2009-03-20 00:28:36 -0700 (Fri, 20 Mar 2009) Log Message: ----------- added failing test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-20 07:23:20 UTC (rev 1013) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-20 07:28:36 UTC (rev 1014) @@ -866,6 +866,8 @@ p $count } + assert '42', "x=42; 1.times { 1.times { 1.times { p x } } }" + end test "exception" do

1 0