Skip to content

Commit 6bc2633

Browse files
matkladmatklad
committed
Align parser names with grammar
1 parent 1b0c770 commit 6bc2633

File tree

17 files changed

+124
-223
lines changed

17 files changed

+124
-223
lines changed

‎crates/parser/src/grammar.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,19 @@ pub(crate) fn reparser(
142142
) -> Option<fn(&mut Parser)> {
143143
let res = match node {
144144
BLOCK_EXPR => expressions::block_expr,
145-
RECORD_FIELD_LIST => items::record_field_def_list,
146-
RECORD_EXPR_FIELD_LIST => items::record_field_list,
147-
VARIANT_LIST => items::enum_variant_list,
145+
RECORD_FIELD_LIST => items::record_field_list,
146+
RECORD_EXPR_FIELD_LIST => items::record_expr_field_list,
147+
VARIANT_LIST => items::variant_list,
148148
MATCH_ARM_LIST => items::match_arm_list,
149149
USE_TREE_LIST => items::use_tree_list,
150150
EXTERN_ITEM_LIST => items::extern_item_list,
151151
TOKEN_TREE if first_child? == T!['{'] => items::token_tree,
152152
ASSOC_ITEM_LIST => match parent? {
153-
IMPL => items::impl_item_list,
154-
TRAIT => items::trait_item_list,
153+
IMPL => items::assoc_item_list,
154+
TRAIT => items::assoc_item_list,
155155
_ => return None,
156156
},
157-
ITEM_LIST => items::mod_item_list,
157+
ITEM_LIST => items::item_list,
158158
_ => return None,
159159
};
160160
Some(res)
@@ -217,7 +217,7 @@ fn opt_visibility(p: &mut Parser) -> bool {
217217
true
218218
}
219219

220-
fn opt_alias(p: &mut Parser) {
220+
fn opt_rename(p: &mut Parser) {
221221
if p.at(T![as]) {
222222
let m = p.start();
223223
p.bump(T![as]);
@@ -239,7 +239,7 @@ fn abi(p: &mut Parser) {
239239
abi.complete(p, ABI);
240240
}
241241

242-
fn opt_fn_ret_type(p: &mut Parser) -> bool {
242+
fn opt_ret_type(p: &mut Parser) -> bool {
243243
if p.at(T![->]) {
244244
let m = p.start();
245245
p.bump(T![->]);

‎crates/parser/src/grammar/attributes.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
33
use super::*;
44

5-
pub(super) fn inner_attributes(p: &mut Parser) {
5+
pub(super) fn inner_attrs(p: &mut Parser) {
66
while p.at(T![#]) && p.nth(1) == T![!] {
7-
attribute(p, true)
7+
attr(p, true)
88
}
99
}
1010

11-
pub(super) fn outer_attributes(p: &mut Parser) {
11+
pub(super) fn outer_attrs(p: &mut Parser) {
1212
while p.at(T![#]) {
13-
attribute(p, false)
13+
attr(p, false)
1414
}
1515
}
1616

17-
fn attribute(p: &mut Parser, inner: bool) {
17+
fn attr(p: &mut Parser, inner: bool) {
1818
let attr = p.start();
1919
assert!(p.at(T![#]));
2020
p.bump(T![#]);

‎crates/parser/src/grammar/expressions.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(super) fn expr(p: &mut Parser) -> (Option<CompletedMarker>, BlockLike) {
2222
pub(super) fn expr_with_attrs(p: &mut Parser) -> bool {
2323
let m = p.start();
2424
let has_attrs = p.at(T![#]);
25-
attributes::outer_attributes(p);
25+
attributes::outer_attrs(p);
2626

2727
let (cm, _block_like) = expr(p);
2828
let success = cm.is_some();
@@ -64,7 +64,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
6464
// #[D] return ();
6565
// }
6666
let has_attrs = p.at(T![#]);
67-
attributes::outer_attributes(p);
67+
attributes::outer_attrs(p);
6868

6969
if p.at(T![let]) {
7070
let_stmt(p, m, with_semi);
@@ -175,7 +175,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
175175

176176
pub(super) fn expr_block_contents(p: &mut Parser) {
177177
// This is checked by a validator
178-
attributes::inner_attributes(p);
178+
attributes::inner_attrs(p);
179179

180180
while !p.at(EOF) && !p.at(T!['}']) {
181181
// test nocontentexpr
@@ -489,7 +489,7 @@ fn method_call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
489489
let m = lhs.precede(p);
490490
p.bump_any();
491491
name_ref(p);
492-
type_args::opt_type_arg_list(p, true);
492+
type_args::opt_generic_arg_list(p, true);
493493
if p.at(T!['(']) {
494494
arg_list(p);
495495
}
@@ -585,7 +585,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) {
585585
paths::expr_path(p);
586586
match p.current() {
587587
T!['{'] if !r.forbid_structs => {
588-
record_field_list(p);
588+
record_expr_field_list(p);
589589
(m.complete(p, RECORD_EXPR), BlockLike::NotBlock)
590590
}
591591
T![!] if !p.at(T![!=]) => {
@@ -603,7 +603,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) {
603603
// S { x, y: 32, ..Default::default() };
604604
// TupleStruct { 0: 1 };
605605
// }
606-
pub(crate) fn record_field_list(p: &mut Parser) {
606+
pub(crate) fn record_expr_field_list(p: &mut Parser) {
607607
assert!(p.at(T!['{']));
608608
let m = p.start();
609609
p.bump(T!['{']);
@@ -613,7 +613,7 @@ pub(crate) fn record_field_list(p: &mut Parser) {
613613
// fn main() {
614614
// S { #[cfg(test)] field: 1 }
615615
// }
616-
attributes::outer_attributes(p);
616+
attributes::outer_attrs(p);
617617

618618
match p.current() {
619619
IDENT | INT_NUMBER => {

‎crates/parser/src/grammar/expressions/atom.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
7575
T!['('] => tuple_expr(p),
7676
T!['['] => array_expr(p),
7777
L_DOLLAR => meta_var_expr(p),
78-
T![|] => lambda_expr(p),
79-
T![move] if la == T![|] => lambda_expr(p),
80-
T![async] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => lambda_expr(p),
78+
T![|] => closure_expr(p),
79+
T![move] if la == T![|] => closure_expr(p),
80+
T![async] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p),
8181
T![if] => if_expr(p),
8282

8383
T![loop] => loop_expr(p, None),
@@ -228,7 +228,7 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
228228
// move || {};
229229
// async move || {};
230230
// }
231-
fn lambda_expr(p: &mut Parser) -> CompletedMarker {
231+
fn closure_expr(p: &mut Parser) -> CompletedMarker {
232232
assert!(
233233
p.at(T![|])
234234
|| (p.at(T![move]) && p.nth(1) == T![|])
@@ -239,7 +239,7 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
239239
p.eat(T![async]);
240240
p.eat(T![move]);
241241
params::param_list_closure(p);
242-
if opt_fn_ret_type(p) {
242+
if opt_ret_type(p) {
243243
// test lambda_ret_block
244244
// fn main() { || -> i32 { 92 }(); }
245245
block_expr(p);
@@ -265,7 +265,7 @@ fn if_expr(p: &mut Parser) -> CompletedMarker {
265265
assert!(p.at(T![if]));
266266
let m = p.start();
267267
p.bump(T![if]);
268-
cond(p);
268+
condition(p);
269269
block_expr(p);
270270
if p.at(T![else]) {
271271
p.bump(T![else]);
@@ -314,7 +314,7 @@ fn while_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
314314
assert!(p.at(T![while]));
315315
let m = m.unwrap_or_else(|| p.start());
316316
p.bump(T![while]);
317-
cond(p);
317+
condition(p);
318318
block_expr(p);
319319
m.complete(p, WHILE_EXPR)
320320
}
@@ -342,7 +342,7 @@ fn for_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
342342
// while let Some(_) | Some(_) = None {}
343343
// while let | Some(_) = None {}
344344
// }
345-
fn cond(p: &mut Parser) {
345+
fn condition(p: &mut Parser) {
346346
let m = p.start();
347347
if p.eat(T![let]) {
348348
patterns::pattern_top(p);
@@ -386,7 +386,7 @@ pub(crate) fn match_arm_list(p: &mut Parser) {
386386
// _ => (),
387387
// }
388388
// }
389-
attributes::inner_attributes(p);
389+
attributes::inner_attrs(p);
390390

391391
while !p.at(EOF) && !p.at(T!['}']) {
392392
if p.at(T!['{']) {
@@ -437,7 +437,7 @@ fn match_arm(p: &mut Parser) -> BlockLike {
437437
// _ => (),
438438
// }
439439
// }
440-
attributes::outer_attributes(p);
440+
attributes::outer_attrs(p);
441441

442442
patterns::pattern_top_r(p, TokenSet::EMPTY);
443443
if p.at(T![if]) {

‎crates/parser/src/grammar/items.rs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ mod traits;
66
mod use_item;
77

88
pub(crate) use self::{
9-
adt::{enum_variant_list, record_field_def_list},
10-
expressions::{match_arm_list, record_field_list},
11-
traits::{impl_item_list, trait_item_list},
9+
adt::{record_field_list, variant_list},
10+
expressions::{match_arm_list, record_expr_field_list},
11+
traits::assoc_item_list,
1212
use_item::use_tree_list,
1313
};
1414
use super::*;
@@ -20,7 +20,7 @@ use super::*;
2020
// super::baz! {}
2121
// struct S;
2222
pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
23-
attributes::inner_attributes(p);
23+
attributes::inner_attrs(p);
2424
while !(stop_on_r_curly && p.at(T!['}']) || p.at(EOF)) {
2525
item_or_macro(p, stop_on_r_curly)
2626
}
@@ -33,7 +33,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![
3333

3434
pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) {
3535
let m = p.start();
36-
attributes::outer_attributes(p);
36+
attributes::outer_attrs(p);
3737
let m = match maybe_item(p, m) {
3838
Ok(()) => {
3939
if p.at(T![;]) {
@@ -144,30 +144,30 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker) -> Result<(), Marker> {
144144
// test fn
145145
// fn foo() {}
146146
T![fn] => {
147-
fn_def(p);
147+
fn_(p);
148148
m.complete(p, FN);
149149
}
150150

151151
// test trait
152152
// trait T {}
153153
T![trait] => {
154-
traits::trait_def(p);
154+
traits::trait_(p);
155155
m.complete(p, TRAIT);
156156
}
157157

158158
T![const] => {
159-
consts::const_def(p, m);
159+
consts::konst(p, m);
160160
}
161161

162162
// test impl
163163
// impl T for S {}
164164
T![impl] => {
165-
traits::impl_def(p);
165+
traits::impl_(p);
166166
m.complete(p, IMPL);
167167
}
168168

169169
T![type] => {
170-
type_def(p, m);
170+
type_alias(p, m);
171171
}
172172
_ => {
173173
if !has_visibility && !has_mods {
@@ -190,9 +190,9 @@ fn items_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
190190
match p.current() {
191191
// test extern_crate
192192
// extern crate foo;
193-
T![extern] if la == T![crate] => extern_crate_item(p, m),
193+
T![extern] if la == T![crate] => extern_crate(p, m),
194194
T![type] => {
195-
type_def(p, m);
195+
type_alias(p, m);
196196
}
197197
T![mod] => mod_item(p, m),
198198
T![struct] => {
@@ -205,7 +205,7 @@ fn items_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
205205
// a: i32,
206206
// b: f32,
207207
// }
208-
adt::struct_def(p, m);
208+
adt::strukt(p, m);
209209
}
210210
// test pub_macro_def
211211
// pub macro m($:ident) {}
@@ -219,12 +219,12 @@ fn items_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
219219
// a: i32,
220220
// b: f32,
221221
// }
222-
adt::union_def(p, m);
222+
adt::union(p, m);
223223
}
224-
T![enum] => adt::enum_def(p, m),
225-
T![use] => use_item::use_item(p, m),
226-
T![const] if (la == IDENT || la == T![_] || la == T![mut]) => consts::const_def(p, m),
227-
T![static] => consts::static_def(p, m),
224+
T![enum] => adt::enum_(p, m),
225+
T![use] => use_item::use_(p, m),
226+
T![const] if (la == IDENT || la == T![_] || la == T![mut]) => consts::konst(p, m),
227+
T![static] => consts::static_(p, m),
228228
// test extern_block
229229
// extern {}
230230
T![extern]
@@ -239,7 +239,7 @@ fn items_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
239239
Ok(())
240240
}
241241

242-
fn extern_crate_item(p: &mut Parser, m: Marker) {
242+
fn extern_crate(p: &mut Parser, m: Marker) {
243243
assert!(p.at(T![extern]));
244244
p.bump(T![extern]);
245245
assert!(p.at(T![crate]));
@@ -251,7 +251,7 @@ fn extern_crate_item(p: &mut Parser, m: Marker) {
251251
name_ref(p);
252252
}
253253

254-
opt_alias(p);
254+
opt_rename(p);
255255
p.expect(T![;]);
256256
m.complete(p, EXTERN_CRATE);
257257
}
@@ -265,14 +265,14 @@ pub(crate) fn extern_item_list(p: &mut Parser) {
265265
m.complete(p, EXTERN_ITEM_LIST);
266266
}
267267

268-
fn fn_def(p: &mut Parser) {
268+
fn fn_(p: &mut Parser) {
269269
assert!(p.at(T![fn]));
270270
p.bump(T![fn]);
271271

272272
name_r(p, ITEM_RECOVERY_SET);
273273
// test function_type_params
274274
// fn foo<T: Clone + Copy>(){}
275-
type_params::opt_type_param_list(p);
275+
type_params::opt_generic_param_list(p);
276276

277277
if p.at(T!['(']) {
278278
params::param_list_fn_def(p);
@@ -282,7 +282,7 @@ fn fn_def(p: &mut Parser) {
282282
// test function_ret_type
283283
// fn foo() {}
284284
// fn bar() -> () {}
285-
opt_fn_ret_type(p);
285+
opt_ret_type(p);
286286

287287
// test function_where_clause
288288
// fn foo<T>() where T: Copy {}
@@ -299,15 +299,15 @@ fn fn_def(p: &mut Parser) {
299299

300300
// test type_item
301301
// type Foo = Bar;
302-
fn type_def(p: &mut Parser, m: Marker) {
302+
fn type_alias(p: &mut Parser, m: Marker) {
303303
assert!(p.at(T![type]));
304304
p.bump(T![type]);
305305

306306
name(p);
307307

308308
// test type_item_type_params
309309
// type Result<T> = ();
310-
type_params::opt_type_param_list(p);
310+
type_params::opt_generic_param_list(p);
311311

312312
if p.at(T![:]) {
313313
type_params::bounds(p);
@@ -329,14 +329,14 @@ pub(crate) fn mod_item(p: &mut Parser, m: Marker) {
329329

330330
name(p);
331331
if p.at(T!['{']) {
332-
mod_item_list(p);
332+
item_list(p);
333333
} else if !p.eat(T![;]) {
334334
p.error("expected `;` or `{`");
335335
}
336336
m.complete(p, MODULE);
337337
}
338338

339-
pub(crate) fn mod_item_list(p: &mut Parser) {
339+
pub(crate) fn item_list(p: &mut Parser) {
340340
assert!(p.at(T!['{']));
341341
let m = p.start();
342342
p.bump(T!['{']);

0 commit comments

Comments
 (0)