1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (fname, string_dvar, sym, dsym, f_arglist): removed

Browse Source 
duplications.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-08-15 01:40:10 +00:00
parent 19b24f499b
commit f93bdaed62
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Aug 15 10:39:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (fname, string_dvar, sym, dsym, f_arglist): removed
duplications.
Fri Aug 14 20:03:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Aug 14 20:03:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (rb_check_safe_str): deprecated. * include/ruby/ruby.h (rb_check_safe_str): deprecated.

20
parse.y
View File

@ -1705,21 +1705,19 @@ fname : tIDENTIFIER
| tFID | tFID
| op | op
{ {
/*%%%*/
lex_state = EXPR_END; lex_state = EXPR_END;
/*%%%*/
$$ = $1; $$ = $1;
/*% /*%
lex_state = EXPR_END;
$$ = $1; $$ = $1;
%*/ %*/
} }
| reswords | reswords
{ {
/*%%%*/
lex_state = EXPR_END; lex_state = EXPR_END;
/*%%%*/
$$ = $<id>1; $$ = $<id>1;
/*% /*%
lex_state = EXPR_END;
$$ = $1; $$ = $1;
%*/ %*/
} }
@ -4041,11 +4039,10 @@ string_dvar : tGVAR
symbol : tSYMBEG sym symbol : tSYMBEG sym
{ {
/*%%%*/
lex_state = EXPR_END; lex_state = EXPR_END;
/*%%%*/
$$ = $2; $$ = $2;
/*% /*%
lex_state = EXPR_END;
$$ = dispatch1(symbol, $2); $$ = dispatch1(symbol, $2);
%*/ %*/
} }
@ -4059,8 +4056,8 @@ sym : fname
dsym : tSYMBEG xstring_contents tSTRING_END dsym : tSYMBEG xstring_contents tSTRING_END
{ {
/*%%%*/
lex_state = EXPR_END; lex_state = EXPR_END;
/*%%%*/
if (!($$ = $2)) { if (!($$ = $2)) {
$$ = NEW_LIT(ID2SYM(rb_intern(""))); $$ = NEW_LIT(ID2SYM(rb_intern("")));
} }
@ -4082,7 +4079,6 @@ dsym : tSYMBEG xstring_contents tSTRING_END
} }
} }
/*% /*%
lex_state = EXPR_END;
$$ = dispatch1(dyna_symbol, $2); $$ = dispatch1(dyna_symbol, $2);
%*/ %*/
} }
@ -4178,13 +4174,11 @@ f_arglist : '(' f_args rparen
{ {
/*%%%*/ /*%%%*/
$$ = $2; $$ = $2;
lex_state = EXPR_BEG;
command_start = Qtrue;
/*% /*%
$$ = dispatch1(paren, $2); $$ = dispatch1(paren, $2);
%*/
lex_state = EXPR_BEG; lex_state = EXPR_BEG;
command_start = Qtrue; command_start = Qtrue;
%*/
} }
| f_args term | f_args term
{ {
@ -8916,7 +8910,7 @@ static void
reg_fragment_check_gen(struct parser_params* parser, VALUE str, int options) reg_fragment_check_gen(struct parser_params* parser, VALUE str, int options)
{ {
VALUE err; VALUE err;
reg_fragment_setenc_gen(parser, str, options); reg_fragment_setenc(str, options);
err = rb_reg_check_preprocess(str); err = rb_reg_check_preprocess(str);
if (err != Qnil) { if (err != Qnil) {
err = rb_obj_as_string(err); err = rb_obj_as_string(err);
@ -10084,7 +10078,7 @@ ripper_id2sym(ID id)
if (!name) { if (!name) {
rb_bug("cannot convert ID to string: %ld", (unsigned long)id); rb_bug("cannot convert ID to string: %ld", (unsigned long)id);
} }
break; return ID2SYM(id);
} }
return ID2SYM(rb_intern(name)); return ID2SYM(rb_intern(name));
} }