|
61 | 61 | /* nop */ |
62 | 62 |
|
63 | 63 | #define PARAM_NAME_CASES \ |
64 | | -case kBOOL:\ |
65 | | -case kBOT: \ |
66 | | -case kCLASS: \ |
67 | | -case kFALSE: \ |
68 | | -case kINSTANCE: \ |
69 | | -case kINTERFACE: \ |
70 | | -case kNIL: \ |
71 | | -case kSELF: \ |
72 | | -case kSINGLETON: \ |
73 | | -case kTOP: \ |
74 | | -case kTRUE: \ |
75 | | -case kVOID: \ |
76 | | -case kTYPE: \ |
77 | | -case kUNCHECKED: \ |
78 | | -case kIN: \ |
79 | | -case kOUT: \ |
80 | | -case kEND: \ |
81 | | -case kDEF: \ |
82 | | -case kINCLUDE: \ |
83 | | -case kEXTEND: \ |
84 | | -case kPREPEND: \ |
85 | | -case kALIAS: \ |
86 | | -case kMODULE: \ |
87 | | -case kATTRREADER: \ |
88 | | -case kATTRWRITER: \ |
89 | | -case kATTRACCESSOR: \ |
90 | | -case kPUBLIC: \ |
91 | | -case kPRIVATE: \ |
92 | | -case kUNTYPED: \ |
93 | | -case kUSE: \ |
94 | | -case kAS: \ |
95 | | -case k__TODO__: \ |
96 | | -/* nop */ |
| 64 | + case kBOOL: \ |
| 65 | + case kBOT: \ |
| 66 | + case kCLASS: \ |
| 67 | + case kFALSE: \ |
| 68 | + case kINSTANCE: \ |
| 69 | + case kINTERFACE: \ |
| 70 | + case kNIL: \ |
| 71 | + case kSELF: \ |
| 72 | + case kSINGLETON: \ |
| 73 | + case kTOP: \ |
| 74 | + case kTRUE: \ |
| 75 | + case kVOID: \ |
| 76 | + case kTYPE: \ |
| 77 | + case kUNCHECKED: \ |
| 78 | + case kIN: \ |
| 79 | + case kOUT: \ |
| 80 | + case kEND: \ |
| 81 | + case kDEF: \ |
| 82 | + case kINCLUDE: \ |
| 83 | + case kEXTEND: \ |
| 84 | + case kPREPEND: \ |
| 85 | + case kALIAS: \ |
| 86 | + case kMODULE: \ |
| 87 | + case kATTRREADER: \ |
| 88 | + case kATTRWRITER: \ |
| 89 | + case kATTRACCESSOR: \ |
| 90 | + case kPUBLIC: \ |
| 91 | + case kPRIVATE: \ |
| 92 | + case kUNTYPED: \ |
| 93 | + case kUSE: \ |
| 94 | + case kAS: \ |
| 95 | + case k__TODO__: \ |
| 96 | + /* nop */ |
97 | 97 |
|
98 | 98 | #define CHECK_PARSE(call) \ |
99 | 99 | if (!call) { \ |
@@ -3672,42 +3672,42 @@ static bool parse_inline_comment(rbs_parser_t *parser, rbs_location_range *comme |
3672 | 3672 |
|
3673 | 3673 | NODISCARD |
3674 | 3674 | static bool parse_inline_param_type_annotation(rbs_parser_t *parser, rbs_ast_ruby_annotations_t **annotation, rbs_range_t rbs_range) { |
3675 | | - rbs_parser_advance(parser); |
| 3675 | + rbs_parser_advance(parser); |
3676 | 3676 |
|
3677 | | - rbs_location_range name_loc = rbs_location_range_current_token(parser); |
| 3677 | + rbs_location_range name_loc = rbs_location_range_current_token(parser); |
3678 | 3678 |
|
3679 | | - ADVANCE_ASSERT(parser, pCOLON); |
| 3679 | + ADVANCE_ASSERT(parser, pCOLON); |
3680 | 3680 |
|
3681 | | - rbs_location_range colon_loc = rbs_location_range_current_token(parser); |
| 3681 | + rbs_location_range colon_loc = rbs_location_range_current_token(parser); |
3682 | 3682 |
|
3683 | | - rbs_node_t *param_type = NULL; |
3684 | | - if (!rbs_parse_type(parser, ¶m_type, false, true, true)) { |
3685 | | - return false; |
3686 | | - } |
| 3683 | + rbs_node_t *param_type = NULL; |
| 3684 | + if (!rbs_parse_type(parser, ¶m_type, false, true, true)) { |
| 3685 | + return false; |
| 3686 | + } |
3687 | 3687 |
|
3688 | | - rbs_location_range comment_loc = RBS_LOCATION_NULL_RANGE; |
3689 | | - if (!parse_inline_comment(parser, &comment_loc)) { |
3690 | | - return false; |
3691 | | - } |
| 3688 | + rbs_location_range comment_loc = RBS_LOCATION_NULL_RANGE; |
| 3689 | + if (!parse_inline_comment(parser, &comment_loc)) { |
| 3690 | + return false; |
| 3691 | + } |
3692 | 3692 |
|
3693 | | - rbs_location_range full_loc = { |
3694 | | - .start_char = rbs_range.start.char_pos, |
3695 | | - .start_byte = rbs_range.start.byte_pos, |
3696 | | - .end_char = parser->current_token.range.end.char_pos, |
3697 | | - .end_byte = parser->current_token.range.end.byte_pos, |
3698 | | - }; |
| 3693 | + rbs_location_range full_loc = { |
| 3694 | + .start_char = rbs_range.start.char_pos, |
| 3695 | + .start_byte = rbs_range.start.byte_pos, |
| 3696 | + .end_char = parser->current_token.range.end.char_pos, |
| 3697 | + .end_byte = parser->current_token.range.end.byte_pos, |
| 3698 | + }; |
3699 | 3699 |
|
3700 | | - *annotation = (rbs_ast_ruby_annotations_t *) rbs_ast_ruby_annotations_param_type_annotation_new( |
3701 | | - ALLOCATOR(), |
3702 | | - full_loc, |
3703 | | - RBS_RANGE_LEX2AST(rbs_range), |
3704 | | - name_loc, |
3705 | | - colon_loc, |
3706 | | - param_type, |
3707 | | - comment_loc |
3708 | | - ); |
| 3700 | + *annotation = (rbs_ast_ruby_annotations_t *) rbs_ast_ruby_annotations_param_type_annotation_new( |
| 3701 | + ALLOCATOR(), |
| 3702 | + full_loc, |
| 3703 | + RBS_RANGE_LEX2AST(rbs_range), |
| 3704 | + name_loc, |
| 3705 | + colon_loc, |
| 3706 | + param_type, |
| 3707 | + comment_loc |
| 3708 | + ); |
3709 | 3709 |
|
3710 | | - return true; |
| 3710 | + return true; |
3711 | 3711 | } |
3712 | 3712 |
|
3713 | 3713 | NODISCARD |
@@ -3911,10 +3911,9 @@ static bool parse_inline_leading_annotation(rbs_parser_t *parser, rbs_ast_ruby_a |
3911 | 3911 | return true; |
3912 | 3912 | } |
3913 | 3913 | case tLIDENT: |
3914 | | - PARAM_NAME_CASES |
3915 | | - { |
3916 | | - return parse_inline_param_type_annotation(parser, annotation, rbs_range); |
3917 | | - } |
| 3914 | + PARAM_NAME_CASES { |
| 3915 | + return parse_inline_param_type_annotation(parser, annotation, rbs_range); |
| 3916 | + } |
3918 | 3917 | default: { |
3919 | 3918 | rbs_parser_set_error(parser, parser->next_token, true, "unexpected token for @rbs annotation"); |
3920 | 3919 | return false; |
|
0 commit comments