* parse.y (parser.utf8): remove unused property.

* parse.y (UTF8_ENC): remove unused macro.

* parse.y (parser_tokadd_utf8): use rb_utf8_encoding() directly.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e6adb6c97..cc8c0c6580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Dec  1 04:07:57 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser.utf8): remove unused property.
+
+	* parse.y (UTF8_ENC): remove unused macro.
+
+	* parse.y (parser_tokadd_utf8): use rb_utf8_encoding() directly.
+
 Sat Dec  1 03:49:45 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* lib/sync.rb (Sync_m#sync_synchronize): add Thread.async_interrupt_timing
diff --git a/parse.y b/parse.y
index ae00b78b64..e458d4ee92 100644
--- a/parse.y
+++ b/parse.y
@@ -267,7 +267,6 @@ struct parser_params {
     char *parser_ruby_sourcefile; /* current source file */
     int parser_ruby_sourceline;	/* current line no. */
     rb_encoding *enc;
-    rb_encoding *utf8;
 
     int parser_yydebug;
 
@@ -296,8 +295,6 @@ struct parser_params {
 #endif
 };
 
-#define UTF8_ENC() (parser->utf8 ? parser->utf8 : \
-		    (parser->utf8 = rb_utf8_encoding()))
 #define STR_NEW(p,n) rb_enc_str_new((p),(n),parser->enc)
 #define STR_NEW0() rb_enc_str_new(0,0,parser->enc)
 #define STR_NEW2(p) rb_enc_str_new((p),strlen(p),parser->enc)
@@ -5687,7 +5684,7 @@ parser_tokadd_utf8(struct parser_params *parser, rb_encoding **encp,
                 tokcopy((int)numlen);
             }
             else if (codepoint >= 0x80) {
-		*encp = UTF8_ENC();
+		*encp = rb_utf8_encoding();
 		if (string_literal) tokaddmbc(codepoint, *encp);
 	    }
 	    else if (string_literal) {
@@ -5714,7 +5711,7 @@ parser_tokadd_utf8(struct parser_params *parser, rb_encoding **encp,
             tokcopy(4);
         }
 	else if (codepoint >= 0x80) {
-	    *encp = UTF8_ENC();
+	    *encp = rb_utf8_encoding();
 	    if (string_literal) tokaddmbc(codepoint, *encp);
 	}
 	else if (string_literal) {