From: Yukihiro Matz Matsumoto <matz@ruby-lang.org>
Date: Sat, 23 Mar 2013 02:08:18 +0000 (+0900)
Subject: resolve conflict regarding backtick
X-Git-Tag: 1.0.0~665
X-Git-Url: https://repo.or.cz/mruby.git/commitdiff_plain/04d9c5ea6bfbdaf425526cf3556704f6b9fd0971

resolve conflict regarding backtick
---

04d9c5ea6bfbdaf425526cf3556704f6b9fd0971
diff --cc src/parse.y
index 7694644a9,dcddb24ae..29ea34c59
--- a/src/parse.y
+++ b/src/parse.y
@@@ -1589,35 -1589,34 +1603,35 @@@ undef_list	: fsy
  		    }
  		;
  
- op		: '|'		{ $$ = intern("|"); }
- 		| '^'		{ $$ = intern("^"); }
- 		| '&'		{ $$ = intern("&"); }
- 		| tCMP		{ $$ = intern("<=>"); }
- 		| tEQ		{ $$ = intern("=="); }
- 		| tEQQ		{ $$ = intern("==="); }
- 		| tMATCH	{ $$ = intern("=~"); }
- 		| tNMATCH	{ $$ = intern("!~"); }
- 		| '>'		{ $$ = intern(">"); }
- 		| tGEQ		{ $$ = intern(">="); }
- 		| '<'		{ $$ = intern("<"); }
- 		| tLEQ		{ $$ = intern("<="); }
- 		| tNEQ		{ $$ = intern("!="); }
- 		| tLSHFT	{ $$ = intern("<<"); }
- 		| tRSHFT	{ $$ = intern(">>"); }
- 		| '+'		{ $$ = intern("+"); }
- 		| '-'		{ $$ = intern("-"); }
- 		| '*'		{ $$ = intern("*"); }
- 		| tSTAR		{ $$ = intern("*"); }
- 		| '/'		{ $$ = intern("/"); }
- 		| '%'		{ $$ = intern("%"); }
- 		| tPOW		{ $$ = intern("**"); }
- 		| '!'		{ $$ = intern("!"); }
- 		| '~'		{ $$ = intern("~"); }
- 		| tUPLUS	{ $$ = intern("+@"); }
- 		| tUMINUS	{ $$ = intern("-@"); }
- 		| tAREF		{ $$ = intern("[]"); }
- 		| tASET		{ $$ = intern("[]="); }
- 		| '`'		{ $$ = intern("`"); }
+ op		: '|'		{ $$ = intern_c('|'); }
+ 		| '^'		{ $$ = intern_c('^'); }
+ 		| '&'		{ $$ = intern_c('&'); }
+ 		| tCMP		{ $$ = intern2("<=>",3); }
+ 		| tEQ		{ $$ = intern2("==",2); }
+ 		| tEQQ		{ $$ = intern2("===",3); }
+ 		| tMATCH	{ $$ = intern2("=~",2); }
+ 		| tNMATCH	{ $$ = intern2("!~",2); }
+ 		| '>'		{ $$ = intern_c('>'); }
+ 		| tGEQ		{ $$ = intern2(">=",2); }
+ 		| '<'		{ $$ = intern_c('<'); }
+ 		| tLEQ		{ $$ = intern2("<=",2); }
+ 		| tNEQ		{ $$ = intern2("!=",2); }
+ 		| tLSHFT	{ $$ = intern2("<<",2); }
+ 		| tRSHFT	{ $$ = intern2(">>",2); }
+ 		| '+'		{ $$ = intern_c('+'); }
+ 		| '-'		{ $$ = intern_c('-'); }
+ 		| '*'		{ $$ = intern_c('*'); }
+ 		| tSTAR		{ $$ = intern_c('*'); }
+ 		| '/'		{ $$ = intern_c('/'); }
+ 		| '%'		{ $$ = intern_c('%'); }
+ 		| tPOW		{ $$ = intern2("**",2); }
+ 		| '!'		{ $$ = intern_c('!'); }
+ 		| '~'		{ $$ = intern_c('~'); }
+ 		| tUPLUS	{ $$ = intern2("+@",2); }
+ 		| tUMINUS	{ $$ = intern2("-@",2); }
+ 		| tAREF		{ $$ = intern2("[]",2); }
+ 		| tASET		{ $$ = intern2("[]=",3); }
++		| '`'		{ $$ = intern_c('`'); }
  		;
  
  reswords	: keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__