- lib/implicit.re: Using the 'tag' URI rather than 'taguri'.

README.BYTECODE

@@ -119,7 +119,7 @@ codes:
           is a fully qualified URL, with a semicolon.  The transfer
           method applies only to the node immediately following, 
           and thus it can be seen as a modifier like the anchor.
-          For example, "Ttaguri:yaml.org,2002:str\nSstring\n" is 
+          For example, "Ttag:yaml.org,2002:str\nSstring\n" is 
           normalized, "T!str\nSstring\n" is not. 
   #
   # Formatting bytecodes (lower case)

ext/ruby/ext/syck/rubyext.c

@@ -613,7 +613,7 @@ rb_syck_bad_anchor_handler(p, a)
     char *a;
 {
     SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), rb_str_new2( a ) );
-    badanc->type_id = syck_strndup( "taguri:ruby.yaml.org,2002:object:YAML::Syck::BadAlias", 53 );
+    badanc->type_id = syck_strndup( "tag:ruby.yaml.org,2002:object:YAML::Syck::BadAlias", 53 );
     return badanc;
 }
 
@@ -933,7 +933,7 @@ syck_loader_transfer( self, type, val )
         int transferred = 0;
         VALUE scheme, name, type_hash, domain = Qnil, type_proc = Qnil;
         VALUE type_uri = rb_str_new2( taguri );
-        VALUE str_taguri = rb_str_new2("taguri");
+        VALUE str_taguri = rb_str_new2("tag");
         VALUE str_xprivate = rb_str_new2("x-private");
         VALUE str_yaml_domain = rb_str_new2(YAML_DOMAIN);
         VALUE parts = rb_str_split( type_uri, ":" );

ext/ruby/lib/okay.rb

@@ -23,7 +23,7 @@ class Error < StandardError; end
     # Transfer methods for okay types
     TRANSFER_TYPES = {}
     OKAY_TYPE_DOMAIN = 'okay.yaml.org,2002'
-    OKAY_TYPE_REGEXP = /^taguri:#{ Regexp::quote( OKAY_TYPE_DOMAIN ) }:([^;]+)((?:;\w+)*)$/
+    OKAY_TYPE_REGEXP = /^tag:#{ Regexp::quote( OKAY_TYPE_DOMAIN ) }:([^;]+)((?:;\w+)*)$/
 
     #
     # Base class for Okay types
@@ -138,7 +138,7 @@ def Okay.node_vs_schema( schema, node, depth, head )
     end
 
     def Okay.make_schema_flexhash( type_root )
-        type_root = YAML::transfer( 'taguri:ruby.yaml.org,2002:flexhash', type_root )
+        type_root = YAML::transfer( 'tag:ruby.yaml.org,2002:flexhash', type_root )
         type_root.collect! { |e|
             if Hash === e[1]
                 e[1].each { |k,v|

lib/Makefile.am

@@ -21,5 +21,5 @@ libsyck_a_SOURCES = \
 
 REC = re2c
 .re.c:
-	$(REC) $< > $@.new && mv $@.new $@
+	$(REC) -s $< > $@.new && mv $@.new $@
 

lib/handler.c

@@ -140,7 +140,7 @@ syck_taguri( char *domain, char *type_id, int type_len )
 {
     char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
     uri[0] = '\0';
-    strcat( uri, "taguri:" );
+    strcat( uri, "tag:" );
     strcat( uri, domain );
     strcat( uri, ":" );
     strncat( uri, type_id, type_len );