[前][次][番号順一覧][スレッド一覧]

ruby-changes:15884

From: yugui <ko1@a...>
Date: Sun, 16 May 2010 20:36:22 +0900 (JST)
Subject: [ruby-changes:15884] Ruby:r27829 (ruby_1_9_2): merges r27728 from trunk into ruby_1_9_2.

yugui	2010-05-16 20:35:49 +0900 (Sun, 16 May 2010)

  New Revision: 27829

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27829

  Log:
    merges r27728 from trunk into ruby_1_9_2.
    --
    * ext/psych/parser.c (PSYCH_TRANSCODE): get rid of bare use of gcc
      extension.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/psych/parser.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27828)
+++ ruby_1_9_2/ChangeLog	(revision 27829)
@@ -1,3 +1,8 @@
+Tue May 11 09:53:07 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/psych/parser.c (PSYCH_TRANSCODE): get rid of bare use of gcc
+	  extension.
+
 Mon May 10 02:58:33 2010  Yusuke Endoh  <mame@t...>
 
 	* compile.c (iseq_compile_each), vm_insnhelper.c (vm_invoke_block,
Index: ruby_1_9_2/ext/psych/parser.c
===================================================================
--- ruby_1_9_2/ext/psych/parser.c	(revision 27828)
+++ ruby_1_9_2/ext/psych/parser.c	(revision 27829)
@@ -16,14 +16,12 @@
 static ID id_start_mapping;
 static ID id_end_mapping;
 
-#ifdef __GNUC__
 #define PSYCH_TRANSCODE(_str, _yaml_enc, _internal_enc) \
-  ({ \
+  do { \
     rb_enc_associate_index(_str, _yaml_enc); \
     if(_internal_enc) \
       _str = rb_str_export_to_enc(_str, _internal_enc); \
-    _str; \
-  })
+  } while (0)
 
 static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
 {
@@ -134,14 +132,14 @@
 			if(start->handle) {
 			    handle = rb_str_new2((const char *)start->handle);
 #ifdef HAVE_RUBY_ENCODING_H
-			    handle = PSYCH_TRANSCODE(handle, encoding, internal_enc);
+			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
 #endif
 			}
 
 			if(start->prefix) {
 			    prefix = rb_str_new2((const char *)start->prefix);
 #ifdef HAVE_RUBY_ENCODING_H
-			    prefix = PSYCH_TRANSCODE(prefix, encoding, internal_enc);
+			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
 #endif
 			}
 
@@ -165,7 +163,7 @@
 		if(event.data.alias.anchor) {
 		    alias = rb_str_new2((const char *)event.data.alias.anchor);
 #ifdef HAVE_RUBY_ENCODING_H
-		    alias = PSYCH_TRANSCODE(alias, encoding, internal_enc);
+		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
 #endif
 		}
 
@@ -183,20 +181,20 @@
 		    );
 
 #ifdef HAVE_RUBY_ENCODING_H
-		val = PSYCH_TRANSCODE(val, encoding, internal_enc);
+		PSYCH_TRANSCODE(val, encoding, internal_enc);
 #endif
 
 		if(event.data.scalar.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
 #ifdef HAVE_RUBY_ENCODING_H
-		    anchor = PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
 #endif
 		}
 
 		if(event.data.scalar.tag) {
 		    tag = rb_str_new2((const char *)event.data.scalar.tag);
 #ifdef HAVE_RUBY_ENCODING_H
-		    tag = PSYCH_TRANSCODE(tag, encoding, internal_enc);
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
 #endif
 		}
 
@@ -220,7 +218,7 @@
 		if(event.data.sequence_start.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
 #ifdef HAVE_RUBY_ENCODING_H
-		    anchor = PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
 #endif
 		}
 
@@ -228,7 +226,7 @@
 		if(event.data.sequence_start.tag) {
 		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
 #ifdef HAVE_RUBY_ENCODING_H
-		    tag = PSYCH_TRANSCODE(tag, encoding, internal_enc);
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
 #endif
 		}
 
@@ -252,14 +250,14 @@
 		if(event.data.mapping_start.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
 #ifdef HAVE_RUBY_ENCODING_H
-		    anchor = PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
 #endif
 		}
 
 		if(event.data.mapping_start.tag) {
 		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
 #ifdef HAVE_RUBY_ENCODING_H
-		    tag = PSYCH_TRANSCODE(tag, encoding, internal_enc);
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
 #endif
 		}
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]