[macruby-changes] [2176] MacRuby/branches/experimental

[source_changes at macosforge.org]

Revision: 2176
          http://trac.macosforge.org/projects/ruby/changeset/2176
Author:   pthomson at apple.com
Date:     2009-08-03 10:45:50 -0700 (Mon, 03 Aug 2009)
Log Message:
-----------
Got rid of a really egrigious bug in the IO read handler.

Modified Paths:
--------------
    MacRuby/branches/experimental/ext/libyaml/rubyext.c
    MacRuby/branches/experimental/lib/yaml.rb

Modified: MacRuby/branches/experimental/ext/libyaml/rubyext.c
===================================================================
--- MacRuby/branches/experimental/ext/libyaml/rubyext.c	2009-08-03 17:45:49 UTC (rev 2175)
+++ MacRuby/branches/experimental/ext/libyaml/rubyext.c	2009-08-03 17:45:50 UTC (rev 2176)
@@ -55,11 +55,6 @@
 	{
 		return 0;
 	}
-	if (rb_io_eof(io, 0) == Qtrue)
-	{
-		*size_read = 0;
-		return 1;
-	}
 	*size_read = result;
 	return 1;
 }
@@ -344,6 +339,7 @@
 		}
 		
 		case YAML_NO_NODE:
+		default:
 		break;
 	}
 	return Qnil;

Modified: MacRuby/branches/experimental/lib/yaml.rb
===================================================================
--- MacRuby/branches/experimental/lib/yaml.rb	2009-08-03 17:45:49 UTC (rev 2175)
+++ MacRuby/branches/experimental/lib/yaml.rb	2009-08-03 17:45:50 UTC (rev 2176)
@@ -31,7 +31,7 @@
   end
   
   def YAML.load_file(path)
-
+    File.open(path) { |f| load(f) }
   end
   
   def YAML.parse(io)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090803/3da1b19a/attachment.html>