Permalink
Browse files

* parse.y (ENC_SINGLE): Unused macro removed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 92a5ebb commit 537ee14ff4cde6b765640a86217b7442090d1e76 @authorNari authorNari committed Mar 7, 2014
Showing with 7 additions and 4 deletions.
  1. +4 −0 ChangeLog
  2. +3 −4 parse.y
View
@@ -1,3 +1,7 @@
+Fri Mar 7 14:48:17 2014 Narihiro Nakamura <authornari@gmail.com>
+
+ * parse.y (ENC_SINGLE): Unused macro removed.
+
Fri Mar 7 12:06:19 2014 Martin Bosslet <Martin.Bosslet@gmail.com>
* test/openssl/test_ssl.rb: Reuse TLS default options from
View
@@ -301,8 +301,7 @@ struct parser_params {
#define STR_NEW0() rb_enc_str_new(0,0,current_enc)
#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),current_enc)
#define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),current_enc)
-#define ENC_SINGLE(cr) ((cr)==ENC_CODERANGE_7BIT)
-#define TOK_INTERN(mb) rb_intern3(tok(), toklen(), current_enc)
+#define TOK_INTERN() rb_intern3(tok(), toklen(), current_enc)
static int parser_yyerror(struct parser_params*, const char*);
#define yyerror(msg) parser_yyerror(parser, (msg))
@@ -8150,7 +8149,7 @@ parser_yylex(struct parser_params *parser)
if (IS_LABEL_SUFFIX(0)) {
lex_state = EXPR_BEG;
nextc();
- set_yylval_name(TOK_INTERN(!ENC_SINGLE(mb)));
+ set_yylval_name(TOK_INTERN());
return tLABEL;
}
}
@@ -8208,7 +8207,7 @@ parser_yylex(struct parser_params *parser)
}
}
{
- ID ident = TOK_INTERN(!ENC_SINGLE(mb));
+ ID ident = TOK_INTERN();
set_yylval_name(ident);
if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) &&

0 comments on commit 537ee14

Please sign in to comment.