Changeset 231 for trunk/ext

Timestamp:

11/13/2005 17:43:56 (3 years ago)

Author:

why

Message:

Fixes from Ruby 1.8.4 development, patches from matz, nobu, ocean and the guys.

Location:

trunk/ext/ruby

Files:

• ext/syck/rubyext.c (modified) (3 diffs)
• lib/yaml.rb (modified) (2 diffs)
• lib/yaml/basenode.rb (modified) (1 diff)
• lib/yaml/rubytypes.rb (modified) (1 diff)
• lib/yaml/tag.rb (modified) (2 diffs)
• lib/yaml/types.rb (modified) (5 diffs)

trunk/ext/ruby/ext/syck/rubyext.c

@@ -84 +84 @@
 void rb_syck_emitter_handler _((SyckEmitter *, st_data_t));
 int syck_parser_assign_io _((SyckParser *, VALUE));
+VALUE syck_scalar_alloc _((VALUE class));
+VALUE syck_seq_alloc _((VALUE class));
+VALUE syck_map_alloc _((VALUE class));
 
 struct parser_xtra {
@@ -775 +778 @@
     }
     rb_ivar_set(self, s_options, options);
+    rb_ivar_set(self, s_input, Qnil);
     return self;
 }
@@ -1344 +1348 @@
 VALUE
 syck_domaintype_initialize( self, domain, type_id, val )
-    VALUE self, type_id, val;
+    VALUE self, domain, type_id, val;
 {
     rb_iv_set( self, "@domain", domain );

trunk/ext/ruby/lib/yaml.rb

@@ -13 +13 @@
 require 'yaml/tag'
 require 'yaml/stream'
+require 'yaml/constants'
 
 # == YAML
@@ -393 +394 @@
 require 'yaml/types'
 
-module Kernel # :nodoc:
+module Kernel
     #
     # ryan:: You know how Kernel.p is a really convenient way to dump ruby

trunk/ext/ruby/lib/yaml/basenode.rb

@@ -149 +149 @@
                 case pred
                 when /^\.=/
-                    pred = $'
+                    pred = $'   # '
                     match_nodes.reject! { |n|
                         n.last.value != pred

trunk/ext/ruby/lib/yaml/rubytypes.rb

@@ -185 +185 @@
     def Symbol.yaml_new( klass, tag, val )
         if String === val
+            val = YAML::load( val ) if val =~ /\A(["']).*\1\z/
             val.intern
         else

trunk/ext/ruby/lib/yaml/tag.rb

@@ -56 +56 @@
     # taguris.
     def yaml_as( tag, sc = true )
-        class_eval <<-"end;"
-            attr_accessor :taguri
+        verbose, $VERBOSE = $VERBOSE, nil
+        class_eval <<-"end;", __FILE__, __LINE__+1
+            attr_writer :taguri
             def taguri
                 if respond_to? :to_yaml_type
                     YAML::tagurize( to_yaml_type[1..-1] )
                 else
-                    return @taguri if @taguri
+                    return @taguri if defined?(@taguri) and @taguri
                     tag = #{ tag.dump }
                     if self.class.yaml_tag_subclasses? and self.class != YAML::tagged_classes[tag]
@@ -73 +74 @@
         end;
         YAML::tag_class tag, self
+    ensure
+        $VERBOSE = verbose
     end
     # Transforms the subclass name into a name suitable for display

trunk/ext/ruby/lib/yaml/types.rb

@@ +1 @@
+# -*- mode: ruby; ruby-indent-level: 4 -*- vim: sw=4
 #
 # Classes required by the full core typeset
@@ -6 +7 @@
 module YAML
 
-        #
-        # Default private type
-        #
-        class PrivateType
+    #
+    # Default private type
+    #
+    class PrivateType
         def self.tag_subclasses?; false; end
-        old_init = instance_method(:initialize)
-        define_method(:initialize) do |*args|
-            old_init.call(*args)
+        attr_accessor :type_id, :value
+        verbose, $VERBOSE = $VERBOSE, nil
+        def initialize( type, val )
+            @type_id = type; @value = val
             @value.taguri = "x-private:#{ @type_id }"
-                end
-                def to_yaml( opts = {} )
+        end
+        def to_yaml( opts = {} )
             @value.to_yaml( opts )
-                end
-        end
+        end
+    ensure
+        $VERBOSE = verbose
+    end
 
     #
@@ -26 +30 @@
     class DomainType
         def self.tag_subclasses?; false; end
-                attr_accessor :domain, :type_id, :value
-        old_init = instance_method(:initialize)
-        define_method(:initialize) do |*args|
-            old_init.call(*args)
+        attr_accessor :domain, :type_id, :value
+        verbose, $VERBOSE = $VERBOSE, nil
+        def initialize( domain, type, val )
+            @domain = domain; @type_id = type; @value = val
             @value.taguri = "tag:#{ @domain }:#{ @type_id }"
-                end
-                def to_yaml( opts = {} )
+        end
+        def to_yaml( opts = {} )
             @value.to_yaml( opts )
-                end
-        end
+        end
+    ensure
+        $VERBOSE = verbose
+    end
 
     #
@@ -42 +48 @@
     class Object
         def self.tag_subclasses?; false; end
-                def to_yaml( opts = {} )
+        def to_yaml( opts = {} )
             YAML::quick_emit( object_id, opts ) do |out|
                 out.map( "tag:ruby.yaml.org,2002:object:#{ @class }", to_yaml_style ) do |map|
@@ -50 +56 @@
                 end
             end
-                end
-        end
+        end
+    end
 
-        #
-        # YAML Hash class to support comments and defaults
-        #
-        class SpecialHash < ::Hash 
-                attr_accessor :default
+    #
+    # YAML Hash class to support comments and defaults
+    #
+    class SpecialHash < ::Hash 
+        attr_accessor :default
         def inspect
             self.default.to_s
         end
-                def to_s
-                        self.default.to_s
-                end
-                def update( h )
-                        if YAML::SpecialHash === h
-                                @default = h.default if h.default
-                        end
-                        super( h )
-                end
+        def to_s
+            self.default.to_s
+        end
+        def update( h )
+            if YAML::SpecialHash === h
+                @default = h.default if h.default
+            end
+            super( h )
+        end
         def to_yaml( opts = {} )
             opts[:DefaultKey] = self.default
             super( opts )
         end
-        end
+    end
 
     #