diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-03-11 18:11:24 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-03-11 18:13:40 +0900 |
| commit | f020d340f4eceb2fc809499e3e57924eac4bb75b (patch) | |
| tree | f3638e090e74443f8013d6257d8de62b20cb54d4 /parse.y | |
| parent | 276859e03e8e1adfdd445ce1e1aba2794ee0debe (diff) | |
| download | ruby-f020d340f4eceb2fc809499e3e57924eac4bb75b.tar.gz | |
parse.y: hoisted out new_nil_at
new_nil_at: create NEW_NIL node with zero-width location.
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 58 |
1 files changed, 17 insertions, 41 deletions
@@ -454,6 +454,7 @@ set_line_body(NODE *body, int line) static NODE* cond(struct parser_params *p, NODE *node, const YYLTYPE *loc); static NODE* method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc); #define new_nil(loc) NEW_NIL(loc) +static NODE *new_nil_at(struct parser_params *p, const rb_code_position_t *pos); static NODE *new_if(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*); static NODE *new_unless(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*); static NODE *logop(struct parser_params*,ID,NODE*,NODE*,const YYLTYPE*,const YYLTYPE*); @@ -2215,48 +2216,32 @@ arg : lhs '=' arg_rhs | arg tDOT2 { /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @2.end_pos; - loc.end_pos = @2.end_pos; - value_expr($1); - $$ = NEW_DOT2($1, new_nil(&loc), &@$); + $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$); /*% %*/ /*% ripper: dot2!($1, Qnil) %*/ } | arg tDOT3 { /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @2.end_pos; - loc.end_pos = @2.end_pos; - value_expr($1); - $$ = NEW_DOT3($1, new_nil(&loc), &@$); + $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$); /*% %*/ /*% ripper: dot3!($1, Qnil) %*/ } | tBDOT2 arg { /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @1.beg_pos; - loc.end_pos = @1.beg_pos; - value_expr($2); - $$ = NEW_DOT2(new_nil(&loc), $2, &@$); + $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$); /*% %*/ /*% ripper: dot2!(Qnil, $2) %*/ } | tBDOT3 arg { /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @1.beg_pos; - loc.end_pos = @1.beg_pos; - value_expr($2); - $$ = NEW_DOT3(new_nil(&loc), $2, &@$); + $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$); /*% %*/ /*% ripper: dot3!(Qnil, $2) %*/ } @@ -4192,25 +4177,17 @@ p_value : p_primitive } | p_primitive tDOT2 { - /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @2.end_pos; - loc.end_pos = @2.end_pos; - + /*%%%*/ value_expr($1); - $$ = NEW_DOT2($1, new_nil(&loc), &@$); + $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$); /*% %*/ /*% ripper: dot2!($1, Qnil) %*/ } | p_primitive tDOT3 { /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @2.end_pos; - loc.end_pos = @2.end_pos; - value_expr($1); - $$ = NEW_DOT3($1, new_nil(&loc), &@$); + $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$); /*% %*/ /*% ripper: dot3!($1, Qnil) %*/ } @@ -4220,24 +4197,16 @@ p_value : p_primitive | tBDOT2 p_primitive { /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @1.beg_pos; - loc.end_pos = @1.beg_pos; - value_expr($2); - $$ = NEW_DOT2(new_nil(&loc), $2, &@$); + $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$); /*% %*/ /*% ripper: dot2!(Qnil, $2) %*/ } | tBDOT3 p_primitive { /*%%%*/ - YYLTYPE loc; - loc.beg_pos = @1.beg_pos; - loc.end_pos = @1.beg_pos; - value_expr($2); - $$ = NEW_DOT3(new_nil(&loc), $2, &@$); + $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$); /*% %*/ /*% ripper: dot3!(Qnil, $2) %*/ } @@ -11158,6 +11127,13 @@ method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc) } static NODE* +new_nil_at(struct parser_params *p, const rb_code_position_t *pos) +{ + YYLTYPE loc = {*pos, *pos}; + return NEW_NIL(&loc); +} + +static NODE* new_if(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc) { if (!cc) return right; |