diff options
Diffstat (limited to 'crates/libsyntax2/src/grammar')
-rw-r--r-- | crates/libsyntax2/src/grammar/attributes.rs | 79 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/expressions/atom.rs | 348 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/expressions/mod.rs | 379 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/items/consts.rs | 21 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/items/mod.rs | 332 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/items/structs.rs | 116 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/items/traits.rs | 87 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/items/use_item.rs | 66 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/mod.rs | 161 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/params.rs | 116 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/paths.rs | 86 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/patterns.rs | 204 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/type_args.rs | 48 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/type_params.rs | 127 | ||||
-rw-r--r-- | crates/libsyntax2/src/grammar/types.rs | 212 |
15 files changed, 2382 insertions, 0 deletions
diff --git a/crates/libsyntax2/src/grammar/attributes.rs b/crates/libsyntax2/src/grammar/attributes.rs new file mode 100644 index 000000000..c411d4d7f --- /dev/null +++ b/crates/libsyntax2/src/grammar/attributes.rs | |||
@@ -0,0 +1,79 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn inner_attributes(p: &mut Parser) { | ||
4 | while p.current() == POUND && p.nth(1) == EXCL { | ||
5 | attribute(p, true) | ||
6 | } | ||
7 | } | ||
8 | |||
9 | pub(super) fn outer_attributes(p: &mut Parser) { | ||
10 | while p.at(POUND) { | ||
11 | attribute(p, false) | ||
12 | } | ||
13 | } | ||
14 | |||
15 | fn attribute(p: &mut Parser, inner: bool) { | ||
16 | let attr = p.start(); | ||
17 | assert!(p.at(POUND)); | ||
18 | p.bump(); | ||
19 | |||
20 | if inner { | ||
21 | assert!(p.at(EXCL)); | ||
22 | p.bump(); | ||
23 | } | ||
24 | |||
25 | if p.expect(L_BRACK) { | ||
26 | meta_item(p); | ||
27 | p.expect(R_BRACK); | ||
28 | } | ||
29 | attr.complete(p, ATTR); | ||
30 | } | ||
31 | |||
32 | fn meta_item(p: &mut Parser) { | ||
33 | if p.at(IDENT) { | ||
34 | let meta_item = p.start(); | ||
35 | p.bump(); | ||
36 | match p.current() { | ||
37 | EQ => { | ||
38 | p.bump(); | ||
39 | if expressions::literal(p).is_none() { | ||
40 | p.error("expected literal"); | ||
41 | } | ||
42 | } | ||
43 | L_PAREN => meta_item_arg_list(p), | ||
44 | _ => (), | ||
45 | } | ||
46 | meta_item.complete(p, META_ITEM); | ||
47 | } else { | ||
48 | p.error("expected attribute value"); | ||
49 | } | ||
50 | } | ||
51 | |||
52 | fn meta_item_arg_list(p: &mut Parser) { | ||
53 | assert!(p.at(L_PAREN)); | ||
54 | p.bump(); | ||
55 | loop { | ||
56 | match p.current() { | ||
57 | EOF | R_PAREN => break, | ||
58 | IDENT => meta_item(p), | ||
59 | c => if expressions::literal(p).is_none() { | ||
60 | let message = "expected attribute"; | ||
61 | |||
62 | if items::ITEM_FIRST.contains(c) { | ||
63 | p.error(message); | ||
64 | return; | ||
65 | } | ||
66 | |||
67 | let err = p.start(); | ||
68 | p.error(message); | ||
69 | p.bump(); | ||
70 | err.complete(p, ERROR); | ||
71 | continue; | ||
72 | }, | ||
73 | } | ||
74 | if !p.at(R_PAREN) { | ||
75 | p.expect(COMMA); | ||
76 | } | ||
77 | } | ||
78 | p.expect(R_PAREN); | ||
79 | } | ||
diff --git a/crates/libsyntax2/src/grammar/expressions/atom.rs b/crates/libsyntax2/src/grammar/expressions/atom.rs new file mode 100644 index 000000000..af9f47c5e --- /dev/null +++ b/crates/libsyntax2/src/grammar/expressions/atom.rs | |||
@@ -0,0 +1,348 @@ | |||
1 | use super::*; | ||
2 | |||
3 | // test expr_literals | ||
4 | // fn foo() { | ||
5 | // let _ = true; | ||
6 | // let _ = false; | ||
7 | // let _ = 1; | ||
8 | // let _ = 2.0; | ||
9 | // let _ = b'a'; | ||
10 | // let _ = 'b'; | ||
11 | // let _ = "c"; | ||
12 | // let _ = r"d"; | ||
13 | // let _ = b"e"; | ||
14 | // let _ = br"f"; | ||
15 | // } | ||
16 | const LITERAL_FIRST: TokenSet = | ||
17 | token_set![TRUE_KW, FALSE_KW, INT_NUMBER, FLOAT_NUMBER, BYTE, CHAR, | ||
18 | STRING, RAW_STRING, BYTE_STRING, RAW_BYTE_STRING]; | ||
19 | |||
20 | pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { | ||
21 | if !LITERAL_FIRST.contains(p.current()) { | ||
22 | return None; | ||
23 | } | ||
24 | let m = p.start(); | ||
25 | p.bump(); | ||
26 | Some(m.complete(p, LITERAL)) | ||
27 | } | ||
28 | |||
29 | pub(super) const ATOM_EXPR_FIRST: TokenSet = | ||
30 | token_set_union![ | ||
31 | LITERAL_FIRST, | ||
32 | token_set![L_PAREN, PIPE, MOVE_KW, IF_KW, WHILE_KW, MATCH_KW, UNSAFE_KW, L_CURLY, RETURN_KW, | ||
33 | IDENT, SELF_KW, SUPER_KW, COLONCOLON ], | ||
34 | ]; | ||
35 | |||
36 | pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> { | ||
37 | match literal(p) { | ||
38 | Some(m) => return Some(m), | ||
39 | None => (), | ||
40 | } | ||
41 | if paths::is_path_start(p) { | ||
42 | return Some(path_expr(p, r)); | ||
43 | } | ||
44 | let la = p.nth(1); | ||
45 | let done = match p.current() { | ||
46 | L_PAREN => tuple_expr(p), | ||
47 | L_BRACK => array_expr(p), | ||
48 | PIPE => lambda_expr(p), | ||
49 | MOVE_KW if la == PIPE => lambda_expr(p), | ||
50 | IF_KW => if_expr(p), | ||
51 | WHILE_KW => while_expr(p), | ||
52 | LOOP_KW => loop_expr(p), | ||
53 | FOR_KW => for_expr(p), | ||
54 | MATCH_KW => match_expr(p), | ||
55 | UNSAFE_KW if la == L_CURLY => block_expr(p), | ||
56 | L_CURLY => block_expr(p), | ||
57 | RETURN_KW => return_expr(p), | ||
58 | _ => { | ||
59 | p.err_and_bump("expected expression"); | ||
60 | return None; | ||
61 | } | ||
62 | }; | ||
63 | Some(done) | ||
64 | } | ||
65 | |||
66 | // test tuple_expr | ||
67 | // fn foo() { | ||
68 | // (); | ||
69 | // (1); | ||
70 | // (1,); | ||
71 | // } | ||
72 | fn tuple_expr(p: &mut Parser) -> CompletedMarker { | ||
73 | assert!(p.at(L_PAREN)); | ||
74 | let m = p.start(); | ||
75 | p.expect(L_PAREN); | ||
76 | |||
77 | let mut saw_comma = false; | ||
78 | let mut saw_expr = false; | ||
79 | while !p.at(EOF) && !p.at(R_PAREN) { | ||
80 | saw_expr = true; | ||
81 | expr(p); | ||
82 | if !p.at(R_PAREN) { | ||
83 | saw_comma = true; | ||
84 | p.expect(COMMA); | ||
85 | } | ||
86 | } | ||
87 | p.expect(R_PAREN); | ||
88 | m.complete(p, if saw_expr && !saw_comma { PAREN_EXPR } else { TUPLE_EXPR }) | ||
89 | } | ||
90 | |||
91 | // test array_expr | ||
92 | // fn foo() { | ||
93 | // []; | ||
94 | // [1]; | ||
95 | // [1, 2,]; | ||
96 | // [1; 2]; | ||
97 | // } | ||
98 | fn array_expr(p: &mut Parser) -> CompletedMarker { | ||
99 | assert!(p.at(L_BRACK)); | ||
100 | let m = p.start(); | ||
101 | p.bump(); | ||
102 | if p.eat(R_BRACK) { | ||
103 | return m.complete(p, ARRAY_EXPR); | ||
104 | } | ||
105 | expr(p); | ||
106 | if p.eat(SEMI) { | ||
107 | expr(p); | ||
108 | p.expect(R_BRACK); | ||
109 | return m.complete(p, ARRAY_EXPR); | ||
110 | } | ||
111 | while !p.at(EOF) && !p.at(R_BRACK) { | ||
112 | p.expect(COMMA); | ||
113 | if !p.at(R_BRACK) { | ||
114 | expr(p); | ||
115 | } | ||
116 | } | ||
117 | p.expect(R_BRACK); | ||
118 | m.complete(p, ARRAY_EXPR) | ||
119 | } | ||
120 | |||
121 | // test lambda_expr | ||
122 | // fn foo() { | ||
123 | // || (); | ||
124 | // || -> i32 { 92 }; | ||
125 | // |x| x; | ||
126 | // move |x: i32,| x; | ||
127 | // } | ||
128 | fn lambda_expr(p: &mut Parser) -> CompletedMarker { | ||
129 | assert!(p.at(PIPE) || (p.at(MOVE_KW) && p.nth(1) == PIPE)); | ||
130 | let m = p.start(); | ||
131 | p.eat(MOVE_KW); | ||
132 | params::param_list_opt_types(p); | ||
133 | if fn_ret_type(p) { | ||
134 | block(p); | ||
135 | } else { | ||
136 | expr(p); | ||
137 | } | ||
138 | m.complete(p, LAMBDA_EXPR) | ||
139 | } | ||
140 | |||
141 | // test if_expr | ||
142 | // fn foo() { | ||
143 | // if true {}; | ||
144 | // if true {} else {}; | ||
145 | // if true {} else if false {} else {}; | ||
146 | // if S {}; | ||
147 | // } | ||
148 | fn if_expr(p: &mut Parser) -> CompletedMarker { | ||
149 | assert!(p.at(IF_KW)); | ||
150 | let m = p.start(); | ||
151 | p.bump(); | ||
152 | cond(p); | ||
153 | block(p); | ||
154 | if p.at(ELSE_KW) { | ||
155 | p.bump(); | ||
156 | if p.at(IF_KW) { | ||
157 | if_expr(p); | ||
158 | } else { | ||
159 | block(p); | ||
160 | } | ||
161 | } | ||
162 | m.complete(p, IF_EXPR) | ||
163 | } | ||
164 | |||
165 | // test while_expr | ||
166 | // fn foo() { | ||
167 | // while true {}; | ||
168 | // while let Some(x) = it.next() {}; | ||
169 | // } | ||
170 | fn while_expr(p: &mut Parser) -> CompletedMarker { | ||
171 | assert!(p.at(WHILE_KW)); | ||
172 | let m = p.start(); | ||
173 | p.bump(); | ||
174 | cond(p); | ||
175 | block(p); | ||
176 | m.complete(p, WHILE_EXPR) | ||
177 | } | ||
178 | |||
179 | // test loop_expr | ||
180 | // fn foo() { | ||
181 | // loop {}; | ||
182 | // } | ||
183 | fn loop_expr(p: &mut Parser) -> CompletedMarker { | ||
184 | assert!(p.at(LOOP_KW)); | ||
185 | let m = p.start(); | ||
186 | p.bump(); | ||
187 | block(p); | ||
188 | m.complete(p, LOOP_EXPR) | ||
189 | } | ||
190 | |||
191 | // test for_expr | ||
192 | // fn foo() { | ||
193 | // for x in [] {}; | ||
194 | // } | ||
195 | fn for_expr(p: &mut Parser) -> CompletedMarker { | ||
196 | assert!(p.at(FOR_KW)); | ||
197 | let m = p.start(); | ||
198 | p.bump(); | ||
199 | patterns::pattern(p); | ||
200 | p.expect(IN_KW); | ||
201 | expr_no_struct(p); | ||
202 | block(p); | ||
203 | m.complete(p, FOR_EXPR) | ||
204 | } | ||
205 | |||
206 | // test cond | ||
207 | // fn foo() { if let Some(_) = None {} } | ||
208 | fn cond(p: &mut Parser) { | ||
209 | if p.eat(LET_KW) { | ||
210 | patterns::pattern(p); | ||
211 | p.expect(EQ); | ||
212 | } | ||
213 | expr_no_struct(p) | ||
214 | } | ||
215 | |||
216 | // test match_expr | ||
217 | // fn foo() { | ||
218 | // match () { }; | ||
219 | // match S {}; | ||
220 | // } | ||
221 | fn match_expr(p: &mut Parser) -> CompletedMarker { | ||
222 | assert!(p.at(MATCH_KW)); | ||
223 | let m = p.start(); | ||
224 | p.bump(); | ||
225 | expr_no_struct(p); | ||
226 | p.eat(L_CURLY); | ||
227 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
228 | // test match_arms_commas | ||
229 | // fn foo() { | ||
230 | // match () { | ||
231 | // _ => (), | ||
232 | // _ => {} | ||
233 | // _ => () | ||
234 | // } | ||
235 | // } | ||
236 | if match_arm(p).is_block() { | ||
237 | p.eat(COMMA); | ||
238 | } else if !p.at(R_CURLY) { | ||
239 | p.expect(COMMA); | ||
240 | } | ||
241 | } | ||
242 | p.expect(R_CURLY); | ||
243 | m.complete(p, MATCH_EXPR) | ||
244 | } | ||
245 | |||
246 | // test match_arm | ||
247 | // fn foo() { | ||
248 | // match () { | ||
249 | // _ => (), | ||
250 | // X | Y if Z => (), | ||
251 | // }; | ||
252 | // } | ||
253 | fn match_arm(p: &mut Parser) -> BlockLike { | ||
254 | let m = p.start(); | ||
255 | loop { | ||
256 | patterns::pattern(p); | ||
257 | if !p.eat(PIPE) { | ||
258 | break; | ||
259 | } | ||
260 | } | ||
261 | if p.eat(IF_KW) { | ||
262 | expr_no_struct(p); | ||
263 | } | ||
264 | p.expect(FAT_ARROW); | ||
265 | let ret = expr_stmt(p); | ||
266 | m.complete(p, MATCH_ARM); | ||
267 | ret | ||
268 | } | ||
269 | |||
270 | // test block_expr | ||
271 | // fn foo() { | ||
272 | // {}; | ||
273 | // unsafe {}; | ||
274 | // } | ||
275 | pub(super) fn block_expr(p: &mut Parser) -> CompletedMarker { | ||
276 | assert!(p.at(L_CURLY) || p.at(UNSAFE_KW) && p.nth(1) == L_CURLY); | ||
277 | let m = p.start(); | ||
278 | p.eat(UNSAFE_KW); | ||
279 | p.bump(); | ||
280 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
281 | match p.current() { | ||
282 | LET_KW => let_stmt(p), | ||
283 | _ => { | ||
284 | // test block_items | ||
285 | // fn a() { fn b() {} } | ||
286 | let m = p.start(); | ||
287 | match items::maybe_item(p) { | ||
288 | items::MaybeItem::Item(kind) => { | ||
289 | m.complete(p, kind); | ||
290 | } | ||
291 | items::MaybeItem::Modifiers => { | ||
292 | m.abandon(p); | ||
293 | p.error("expected an item"); | ||
294 | } | ||
295 | // test pub_expr | ||
296 | // fn foo() { pub 92; } //FIXME | ||
297 | items::MaybeItem::None => { | ||
298 | let is_blocklike = expressions::expr_stmt(p) == BlockLike::Block; | ||
299 | if p.eat(SEMI) || (is_blocklike && !p.at(R_CURLY)) { | ||
300 | m.complete(p, EXPR_STMT); | ||
301 | } else { | ||
302 | m.abandon(p); | ||
303 | } | ||
304 | } | ||
305 | } | ||
306 | } | ||
307 | } | ||
308 | } | ||
309 | p.expect(R_CURLY); | ||
310 | m.complete(p, BLOCK_EXPR) | ||
311 | } | ||
312 | |||
313 | // test let_stmt; | ||
314 | // fn foo() { | ||
315 | // let a; | ||
316 | // let b: i32; | ||
317 | // let c = 92; | ||
318 | // let d: i32 = 92; | ||
319 | // } | ||
320 | fn let_stmt(p: &mut Parser) { | ||
321 | assert!(p.at(LET_KW)); | ||
322 | let m = p.start(); | ||
323 | p.bump(); | ||
324 | patterns::pattern(p); | ||
325 | if p.at(COLON) { | ||
326 | types::ascription(p); | ||
327 | } | ||
328 | if p.eat(EQ) { | ||
329 | expressions::expr(p); | ||
330 | } | ||
331 | p.expect(SEMI); | ||
332 | m.complete(p, LET_STMT); | ||
333 | } | ||
334 | |||
335 | // test return_expr | ||
336 | // fn foo() { | ||
337 | // return; | ||
338 | // return 92; | ||
339 | // } | ||
340 | fn return_expr(p: &mut Parser) -> CompletedMarker { | ||
341 | assert!(p.at(RETURN_KW)); | ||
342 | let m = p.start(); | ||
343 | p.bump(); | ||
344 | if EXPR_FIRST.contains(p.current()) { | ||
345 | expr(p); | ||
346 | } | ||
347 | m.complete(p, RETURN_EXPR) | ||
348 | } | ||
diff --git a/crates/libsyntax2/src/grammar/expressions/mod.rs b/crates/libsyntax2/src/grammar/expressions/mod.rs new file mode 100644 index 000000000..dcbb1e2a8 --- /dev/null +++ b/crates/libsyntax2/src/grammar/expressions/mod.rs | |||
@@ -0,0 +1,379 @@ | |||
1 | mod atom; | ||
2 | |||
3 | use super::*; | ||
4 | pub(super) use self::atom::literal; | ||
5 | |||
6 | const EXPR_FIRST: TokenSet = LHS_FIRST; | ||
7 | |||
8 | pub(super) fn expr(p: &mut Parser) -> BlockLike { | ||
9 | let r = Restrictions { forbid_structs: false, prefer_stmt: false }; | ||
10 | expr_bp(p, r, 1) | ||
11 | } | ||
12 | |||
13 | pub(super) fn expr_stmt(p: &mut Parser) -> BlockLike { | ||
14 | let r = Restrictions { forbid_structs: false, prefer_stmt: true }; | ||
15 | expr_bp(p, r, 1) | ||
16 | } | ||
17 | |||
18 | fn expr_no_struct(p: &mut Parser) { | ||
19 | let r = Restrictions { forbid_structs: true, prefer_stmt: false }; | ||
20 | expr_bp(p, r, 1); | ||
21 | } | ||
22 | |||
23 | // test block | ||
24 | // fn a() {} | ||
25 | // fn b() { let _ = 1; } | ||
26 | // fn c() { 1; 2; } | ||
27 | // fn d() { 1; 2 } | ||
28 | pub(super) fn block(p: &mut Parser) { | ||
29 | if !p.at(L_CURLY) { | ||
30 | p.error("expected block"); | ||
31 | return; | ||
32 | } | ||
33 | atom::block_expr(p); | ||
34 | } | ||
35 | |||
36 | #[derive(Clone, Copy)] | ||
37 | struct Restrictions { | ||
38 | forbid_structs: bool, | ||
39 | prefer_stmt: bool, | ||
40 | } | ||
41 | |||
42 | enum Op { | ||
43 | Simple, | ||
44 | Composite(SyntaxKind, u8), | ||
45 | } | ||
46 | |||
47 | fn current_op(p: &Parser) -> (u8, Op) { | ||
48 | if p.at_compound2(PLUS, EQ) { | ||
49 | return (1, Op::Composite(PLUSEQ, 2)); | ||
50 | } | ||
51 | if p.at_compound2(MINUS, EQ) { | ||
52 | return (1, Op::Composite(MINUSEQ, 2)); | ||
53 | } | ||
54 | if p.at_compound3(L_ANGLE, L_ANGLE, EQ) { | ||
55 | return (1, Op::Composite(SHLEQ, 3)); | ||
56 | } | ||
57 | if p.at_compound3(R_ANGLE, R_ANGLE, EQ) { | ||
58 | return (1, Op::Composite(SHREQ, 3)); | ||
59 | } | ||
60 | if p.at_compound2(PIPE, PIPE) { | ||
61 | return (3, Op::Composite(PIPEPIPE, 2)); | ||
62 | } | ||
63 | if p.at_compound2(AMP, AMP) { | ||
64 | return (4, Op::Composite(AMPAMP, 2)); | ||
65 | } | ||
66 | if p.at_compound2(L_ANGLE, EQ) { | ||
67 | return (5, Op::Composite(LTEQ, 2)); | ||
68 | } | ||
69 | if p.at_compound2(R_ANGLE, EQ) { | ||
70 | return (5, Op::Composite(GTEQ, 2)); | ||
71 | } | ||
72 | if p.at_compound2(L_ANGLE, L_ANGLE) { | ||
73 | return (9, Op::Composite(SHL, 2)); | ||
74 | } | ||
75 | if p.at_compound2(R_ANGLE, R_ANGLE) { | ||
76 | return (9, Op::Composite(SHR, 2)); | ||
77 | } | ||
78 | |||
79 | let bp = match p.current() { | ||
80 | EQ => 1, | ||
81 | DOTDOT => 2, | ||
82 | EQEQ | NEQ | L_ANGLE | R_ANGLE => 5, | ||
83 | PIPE => 6, | ||
84 | CARET => 7, | ||
85 | AMP => 8, | ||
86 | MINUS | PLUS => 10, | ||
87 | STAR | SLASH | PERCENT => 11, | ||
88 | _ => 0, | ||
89 | }; | ||
90 | (bp, Op::Simple) | ||
91 | } | ||
92 | |||
93 | // Parses expression with binding power of at least bp. | ||
94 | fn expr_bp(p: &mut Parser, r: Restrictions, bp: u8) -> BlockLike { | ||
95 | let mut lhs = match lhs(p, r) { | ||
96 | Some(lhs) => { | ||
97 | // test stmt_bin_expr_ambiguity | ||
98 | // fn foo() { | ||
99 | // let _ = {1} & 2; | ||
100 | // {1} &2; | ||
101 | // } | ||
102 | if r.prefer_stmt && is_block(lhs.kind()) { | ||
103 | return BlockLike::Block; | ||
104 | } | ||
105 | lhs | ||
106 | } | ||
107 | None => return BlockLike::NotBlock, | ||
108 | }; | ||
109 | |||
110 | loop { | ||
111 | let is_range = p.current() == DOTDOT; | ||
112 | let (op_bp, op) = current_op(p); | ||
113 | if op_bp < bp { | ||
114 | break; | ||
115 | } | ||
116 | let m = lhs.precede(p); | ||
117 | match op { | ||
118 | Op::Simple => p.bump(), | ||
119 | Op::Composite(kind, n) => { | ||
120 | p.bump_compound(kind, n); | ||
121 | } | ||
122 | } | ||
123 | expr_bp(p, r, op_bp + 1); | ||
124 | lhs = m.complete(p, if is_range { RANGE_EXPR } else { BIN_EXPR }); | ||
125 | } | ||
126 | BlockLike::NotBlock | ||
127 | } | ||
128 | |||
129 | // test no_semi_after_block | ||
130 | // fn foo() { | ||
131 | // if true {} | ||
132 | // loop {} | ||
133 | // match () {} | ||
134 | // while true {} | ||
135 | // for _ in () {} | ||
136 | // {} | ||
137 | // {} | ||
138 | // } | ||
139 | fn is_block(kind: SyntaxKind) -> bool { | ||
140 | match kind { | ||
141 | IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR => true, | ||
142 | _ => false, | ||
143 | } | ||
144 | } | ||
145 | |||
146 | const LHS_FIRST: TokenSet = | ||
147 | token_set_union![ | ||
148 | token_set![AMP, STAR, EXCL, DOTDOT, MINUS], | ||
149 | atom::ATOM_EXPR_FIRST, | ||
150 | ]; | ||
151 | |||
152 | fn lhs(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> { | ||
153 | let m; | ||
154 | let kind = match p.current() { | ||
155 | // test ref_expr | ||
156 | // fn foo() { | ||
157 | // let _ = &1; | ||
158 | // let _ = &mut &f(); | ||
159 | // } | ||
160 | AMP => { | ||
161 | m = p.start(); | ||
162 | p.bump(); | ||
163 | p.eat(MUT_KW); | ||
164 | REF_EXPR | ||
165 | } | ||
166 | // test unary_expr | ||
167 | // fn foo() { | ||
168 | // **&1; | ||
169 | // !!true; | ||
170 | // --1; | ||
171 | // } | ||
172 | STAR | EXCL | MINUS => { | ||
173 | m = p.start(); | ||
174 | p.bump(); | ||
175 | PREFIX_EXPR | ||
176 | } | ||
177 | DOTDOT => { | ||
178 | m = p.start(); | ||
179 | p.bump(); | ||
180 | expr_bp(p, r, 2); | ||
181 | return Some(m.complete(p, RANGE_EXPR)); | ||
182 | } | ||
183 | _ => { | ||
184 | let lhs = atom::atom_expr(p, r)?; | ||
185 | return Some(postfix_expr(p, r, lhs)); | ||
186 | } | ||
187 | }; | ||
188 | expr_bp(p, r, 255); | ||
189 | Some(m.complete(p, kind)) | ||
190 | } | ||
191 | |||
192 | fn postfix_expr(p: &mut Parser, r: Restrictions, mut lhs: CompletedMarker) -> CompletedMarker { | ||
193 | let mut allow_calls = !r.prefer_stmt || !is_block(lhs.kind()); | ||
194 | loop { | ||
195 | lhs = match p.current() { | ||
196 | // test stmt_postfix_expr_ambiguity | ||
197 | // fn foo() { | ||
198 | // match () { | ||
199 | // _ => {} | ||
200 | // () => {} | ||
201 | // [] => {} | ||
202 | // } | ||
203 | // } | ||
204 | L_PAREN if allow_calls => call_expr(p, lhs), | ||
205 | L_BRACK if allow_calls => index_expr(p, lhs), | ||
206 | DOT if p.nth(1) == IDENT => if p.nth(2) == L_PAREN || p.nth(2) == COLONCOLON { | ||
207 | method_call_expr(p, lhs) | ||
208 | } else { | ||
209 | field_expr(p, lhs) | ||
210 | }, | ||
211 | DOT if p.nth(1) == INT_NUMBER => field_expr(p, lhs), | ||
212 | // test postfix_range | ||
213 | // fn foo() { let x = 1..; } | ||
214 | DOTDOT if !EXPR_FIRST.contains(p.nth(1)) => { | ||
215 | let m = lhs.precede(p); | ||
216 | p.bump(); | ||
217 | m.complete(p, RANGE_EXPR) | ||
218 | } | ||
219 | QUESTION => try_expr(p, lhs), | ||
220 | AS_KW => cast_expr(p, lhs), | ||
221 | _ => break, | ||
222 | }; | ||
223 | allow_calls = true | ||
224 | } | ||
225 | lhs | ||
226 | } | ||
227 | |||
228 | // test call_expr | ||
229 | // fn foo() { | ||
230 | // let _ = f(); | ||
231 | // let _ = f()(1)(1, 2,); | ||
232 | // } | ||
233 | fn call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | ||
234 | assert!(p.at(L_PAREN)); | ||
235 | let m = lhs.precede(p); | ||
236 | arg_list(p); | ||
237 | m.complete(p, CALL_EXPR) | ||
238 | } | ||
239 | |||
240 | // test index_expr | ||
241 | // fn foo() { | ||
242 | // x[1][2]; | ||
243 | // } | ||
244 | fn index_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | ||
245 | assert!(p.at(L_BRACK)); | ||
246 | let m = lhs.precede(p); | ||
247 | p.bump(); | ||
248 | expr(p); | ||
249 | p.expect(R_BRACK); | ||
250 | m.complete(p, INDEX_EXPR) | ||
251 | } | ||
252 | |||
253 | // test method_call_expr | ||
254 | // fn foo() { | ||
255 | // x.foo(); | ||
256 | // y.bar::<T>(1, 2,); | ||
257 | // } | ||
258 | fn method_call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | ||
259 | assert!( | ||
260 | p.at(DOT) && p.nth(1) == IDENT | ||
261 | && (p.nth(2) == L_PAREN || p.nth(2) == COLONCOLON) | ||
262 | ); | ||
263 | let m = lhs.precede(p); | ||
264 | p.bump(); | ||
265 | name_ref(p); | ||
266 | type_args::type_arg_list(p, true); | ||
267 | arg_list(p); | ||
268 | m.complete(p, METHOD_CALL_EXPR) | ||
269 | } | ||
270 | |||
271 | // test field_expr | ||
272 | // fn foo() { | ||
273 | // x.foo; | ||
274 | // x.0.bar; | ||
275 | // } | ||
276 | fn field_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | ||
277 | assert!(p.at(DOT) && (p.nth(1) == IDENT || p.nth(1) == INT_NUMBER)); | ||
278 | let m = lhs.precede(p); | ||
279 | p.bump(); | ||
280 | if p.at(IDENT) { | ||
281 | name_ref(p) | ||
282 | } else { | ||
283 | p.bump() | ||
284 | } | ||
285 | m.complete(p, FIELD_EXPR) | ||
286 | } | ||
287 | |||
288 | // test try_expr | ||
289 | // fn foo() { | ||
290 | // x?; | ||
291 | // } | ||
292 | fn try_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | ||
293 | assert!(p.at(QUESTION)); | ||
294 | let m = lhs.precede(p); | ||
295 | p.bump(); | ||
296 | m.complete(p, TRY_EXPR) | ||
297 | } | ||
298 | |||
299 | // test cast_expr | ||
300 | // fn foo() { | ||
301 | // 82 as i32; | ||
302 | // } | ||
303 | fn cast_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | ||
304 | assert!(p.at(AS_KW)); | ||
305 | let m = lhs.precede(p); | ||
306 | p.bump(); | ||
307 | types::type_(p); | ||
308 | m.complete(p, CAST_EXPR) | ||
309 | } | ||
310 | |||
311 | fn arg_list(p: &mut Parser) { | ||
312 | assert!(p.at(L_PAREN)); | ||
313 | let m = p.start(); | ||
314 | p.bump(); | ||
315 | while !p.at(R_PAREN) && !p.at(EOF) { | ||
316 | expr(p); | ||
317 | if !p.at(R_PAREN) && !p.expect(COMMA) { | ||
318 | break; | ||
319 | } | ||
320 | } | ||
321 | p.eat(R_PAREN); | ||
322 | m.complete(p, ARG_LIST); | ||
323 | } | ||
324 | |||
325 | // test path_expr | ||
326 | // fn foo() { | ||
327 | // let _ = a; | ||
328 | // let _ = a::b; | ||
329 | // let _ = ::a::<b>; | ||
330 | // let _ = format!(); | ||
331 | // } | ||
332 | fn path_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker { | ||
333 | assert!(paths::is_path_start(p)); | ||
334 | let m = p.start(); | ||
335 | paths::expr_path(p); | ||
336 | match p.current() { | ||
337 | L_CURLY if !r.forbid_structs => { | ||
338 | struct_lit(p); | ||
339 | m.complete(p, STRUCT_LIT) | ||
340 | } | ||
341 | EXCL => { | ||
342 | items::macro_call_after_excl(p); | ||
343 | m.complete(p, MACRO_CALL) | ||
344 | } | ||
345 | _ => m.complete(p, PATH_EXPR) | ||
346 | } | ||
347 | } | ||
348 | |||
349 | // test struct_lit | ||
350 | // fn foo() { | ||
351 | // S {}; | ||
352 | // S { x, y: 32, }; | ||
353 | // S { x, y: 32, ..Default::default() }; | ||
354 | // } | ||
355 | fn struct_lit(p: &mut Parser) { | ||
356 | assert!(p.at(L_CURLY)); | ||
357 | p.bump(); | ||
358 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
359 | match p.current() { | ||
360 | IDENT => { | ||
361 | let m = p.start(); | ||
362 | name_ref(p); | ||
363 | if p.eat(COLON) { | ||
364 | expr(p); | ||
365 | } | ||
366 | m.complete(p, STRUCT_LIT_FIELD); | ||
367 | } | ||
368 | DOTDOT => { | ||
369 | p.bump(); | ||
370 | expr(p); | ||
371 | } | ||
372 | _ => p.err_and_bump("expected identifier"), | ||
373 | } | ||
374 | if !p.at(R_CURLY) { | ||
375 | p.expect(COMMA); | ||
376 | } | ||
377 | } | ||
378 | p.expect(R_CURLY); | ||
379 | } | ||
diff --git a/crates/libsyntax2/src/grammar/items/consts.rs b/crates/libsyntax2/src/grammar/items/consts.rs new file mode 100644 index 000000000..b11949b49 --- /dev/null +++ b/crates/libsyntax2/src/grammar/items/consts.rs | |||
@@ -0,0 +1,21 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn static_item(p: &mut Parser) { | ||
4 | const_or_static(p, STATIC_KW) | ||
5 | } | ||
6 | |||
7 | pub(super) fn const_item(p: &mut Parser) { | ||
8 | const_or_static(p, CONST_KW) | ||
9 | } | ||
10 | |||
11 | fn const_or_static(p: &mut Parser, kw: SyntaxKind) { | ||
12 | assert!(p.at(kw)); | ||
13 | p.bump(); | ||
14 | p.eat(MUT_KW); // TODO: validator to forbid const mut | ||
15 | name(p); | ||
16 | types::ascription(p); | ||
17 | if p.eat(EQ) { | ||
18 | expressions::expr(p); | ||
19 | } | ||
20 | p.expect(SEMI); | ||
21 | } | ||
diff --git a/crates/libsyntax2/src/grammar/items/mod.rs b/crates/libsyntax2/src/grammar/items/mod.rs new file mode 100644 index 000000000..3bf906f85 --- /dev/null +++ b/crates/libsyntax2/src/grammar/items/mod.rs | |||
@@ -0,0 +1,332 @@ | |||
1 | use super::*; | ||
2 | |||
3 | mod consts; | ||
4 | mod structs; | ||
5 | mod traits; | ||
6 | mod use_item; | ||
7 | |||
8 | // test mod_contents | ||
9 | // fn foo() {} | ||
10 | // macro_rules! foo {} | ||
11 | // foo::bar!(); | ||
12 | // super::baz! {} | ||
13 | // struct S; | ||
14 | pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { | ||
15 | attributes::inner_attributes(p); | ||
16 | while !p.at(EOF) && !(stop_on_r_curly && p.at(R_CURLY)) { | ||
17 | item_or_macro(p, stop_on_r_curly) | ||
18 | } | ||
19 | } | ||
20 | |||
21 | pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) { | ||
22 | let m = p.start(); | ||
23 | match maybe_item(p) { | ||
24 | MaybeItem::Item(kind) => { | ||
25 | m.complete(p, kind); | ||
26 | } | ||
27 | MaybeItem::None => { | ||
28 | if paths::is_path_start(p) { | ||
29 | match macro_call(p) { | ||
30 | BlockLike::Block => (), | ||
31 | BlockLike::NotBlock => { | ||
32 | p.expect(SEMI); | ||
33 | } | ||
34 | } | ||
35 | m.complete(p, MACRO_CALL); | ||
36 | } else { | ||
37 | m.abandon(p); | ||
38 | if p.at(L_CURLY) { | ||
39 | error_block(p, "expected an item"); | ||
40 | } else if !p.at(EOF) && !(stop_on_r_curly && p.at(R_CURLY)) { | ||
41 | p.err_and_bump("expected an item"); | ||
42 | } else { | ||
43 | p.error("expected an item"); | ||
44 | } | ||
45 | } | ||
46 | } | ||
47 | MaybeItem::Modifiers => { | ||
48 | p.error("expected fn, trait or impl"); | ||
49 | m.complete(p, ERROR); | ||
50 | } | ||
51 | } | ||
52 | } | ||
53 | |||
54 | pub(super) const ITEM_FIRST: TokenSet = | ||
55 | token_set![EXTERN_KW, MOD_KW, USE_KW, STRUCT_KW, ENUM_KW, FN_KW, PUB_KW, POUND]; | ||
56 | |||
57 | pub(super) enum MaybeItem { | ||
58 | None, | ||
59 | Item(SyntaxKind), | ||
60 | Modifiers, | ||
61 | } | ||
62 | |||
63 | pub(super) fn maybe_item(p: &mut Parser) -> MaybeItem { | ||
64 | attributes::outer_attributes(p); | ||
65 | visibility(p); | ||
66 | if let Some(kind) = items_without_modifiers(p) { | ||
67 | return MaybeItem::Item(kind); | ||
68 | } | ||
69 | |||
70 | let mut has_mods = false; | ||
71 | // modifiers | ||
72 | has_mods |= p.eat(CONST_KW); | ||
73 | |||
74 | // test unsafe_block_in_mod | ||
75 | // fn foo(){} unsafe { } fn bar(){} | ||
76 | if p.at(UNSAFE_KW) && p.nth(1) != L_CURLY { | ||
77 | p.eat(UNSAFE_KW); | ||
78 | has_mods = true; | ||
79 | } | ||
80 | if p.at(EXTERN_KW) { | ||
81 | has_mods = true; | ||
82 | abi(p); | ||
83 | } | ||
84 | if p.at(IDENT) && p.at_contextual_kw("auto") && p.nth(1) == TRAIT_KW { | ||
85 | p.bump_remap(AUTO_KW); | ||
86 | has_mods = true; | ||
87 | } | ||
88 | if p.at(IDENT) && p.at_contextual_kw("default") && p.nth(1) == IMPL_KW { | ||
89 | p.bump_remap(DEFAULT_KW); | ||
90 | has_mods = true; | ||
91 | } | ||
92 | |||
93 | // items | ||
94 | let kind = match p.current() { | ||
95 | // test extern_fn | ||
96 | // extern fn foo() {} | ||
97 | |||
98 | // test const_fn | ||
99 | // const fn foo() {} | ||
100 | |||
101 | // test const_unsafe_fn | ||
102 | // const unsafe fn foo() {} | ||
103 | |||
104 | // test unsafe_extern_fn | ||
105 | // unsafe extern "C" fn foo() {} | ||
106 | |||
107 | // test unsafe_fn | ||
108 | // unsafe fn foo() {} | ||
109 | FN_KW => { | ||
110 | function(p); | ||
111 | FUNCTION | ||
112 | } | ||
113 | |||
114 | // test unsafe_trait | ||
115 | // unsafe trait T {} | ||
116 | |||
117 | // test auto_trait | ||
118 | // auto trait T {} | ||
119 | |||
120 | // test unsafe_auto_trait | ||
121 | // unsafe auto trait T {} | ||
122 | TRAIT_KW => { | ||
123 | traits::trait_item(p); | ||
124 | TRAIT_ITEM | ||
125 | } | ||
126 | |||
127 | // test unsafe_impl | ||
128 | // unsafe impl Foo {} | ||
129 | |||
130 | // test default_impl | ||
131 | // default impl Foo {} | ||
132 | |||
133 | // test unsafe_default_impl | ||
134 | // unsafe default impl Foo {} | ||
135 | IMPL_KW => { | ||
136 | traits::impl_item(p); | ||
137 | IMPL_ITEM | ||
138 | } | ||
139 | _ => return if has_mods { | ||
140 | MaybeItem::Modifiers | ||
141 | } else { | ||
142 | MaybeItem::None | ||
143 | } | ||
144 | }; | ||
145 | |||
146 | MaybeItem::Item(kind) | ||
147 | } | ||
148 | |||
149 | fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> { | ||
150 | let la = p.nth(1); | ||
151 | let kind = match p.current() { | ||
152 | // test extern_crate | ||
153 | // extern crate foo; | ||
154 | EXTERN_KW if la == CRATE_KW => { | ||
155 | extern_crate_item(p); | ||
156 | EXTERN_CRATE_ITEM | ||
157 | } | ||
158 | TYPE_KW => { | ||
159 | type_item(p); | ||
160 | TYPE_ITEM | ||
161 | } | ||
162 | MOD_KW => { | ||
163 | mod_item(p); | ||
164 | MOD_ITEM | ||
165 | } | ||
166 | STRUCT_KW => { | ||
167 | structs::struct_item(p); | ||
168 | if p.at(SEMI) { | ||
169 | p.err_and_bump( | ||
170 | "expected item, found `;`\n\ | ||
171 | consider removing this semicolon" | ||
172 | ); | ||
173 | } | ||
174 | STRUCT_ITEM | ||
175 | } | ||
176 | ENUM_KW => { | ||
177 | structs::enum_item(p); | ||
178 | ENUM_ITEM | ||
179 | } | ||
180 | USE_KW => { | ||
181 | use_item::use_item(p); | ||
182 | USE_ITEM | ||
183 | } | ||
184 | CONST_KW if (la == IDENT || la == MUT_KW) => { | ||
185 | consts::const_item(p); | ||
186 | CONST_ITEM | ||
187 | } | ||
188 | STATIC_KW => { | ||
189 | consts::static_item(p); | ||
190 | STATIC_ITEM | ||
191 | } | ||
192 | // test extern_block | ||
193 | // extern {} | ||
194 | EXTERN_KW if la == L_CURLY || ((la == STRING || la == RAW_STRING) && p.nth(2) == L_CURLY) => { | ||
195 | abi(p); | ||
196 | extern_block(p); | ||
197 | EXTERN_BLOCK_EXPR | ||
198 | } | ||
199 | _ => return None, | ||
200 | }; | ||
201 | Some(kind) | ||
202 | } | ||
203 | |||
204 | fn extern_crate_item(p: &mut Parser) { | ||
205 | assert!(p.at(EXTERN_KW)); | ||
206 | p.bump(); | ||
207 | assert!(p.at(CRATE_KW)); | ||
208 | p.bump(); | ||
209 | name(p); | ||
210 | alias(p); | ||
211 | p.expect(SEMI); | ||
212 | } | ||
213 | |||
214 | fn extern_block(p: &mut Parser) { | ||
215 | assert!(p.at(L_CURLY)); | ||
216 | p.bump(); | ||
217 | p.expect(R_CURLY); | ||
218 | } | ||
219 | |||
220 | fn function(p: &mut Parser) { | ||
221 | assert!(p.at(FN_KW)); | ||
222 | p.bump(); | ||
223 | |||
224 | name(p); | ||
225 | // test function_type_params | ||
226 | // fn foo<T: Clone + Copy>(){} | ||
227 | type_params::type_param_list(p); | ||
228 | |||
229 | if p.at(L_PAREN) { | ||
230 | params::param_list(p); | ||
231 | } else { | ||
232 | p.error("expected function arguments"); | ||
233 | } | ||
234 | // test function_ret_type | ||
235 | // fn foo() {} | ||
236 | // fn bar() -> () {} | ||
237 | fn_ret_type(p); | ||
238 | |||
239 | // test function_where_clause | ||
240 | // fn foo<T>() where T: Copy {} | ||
241 | type_params::where_clause(p); | ||
242 | |||
243 | // test fn_decl | ||
244 | // trait T { fn foo(); } | ||
245 | if !p.eat(SEMI) { | ||
246 | expressions::block(p); | ||
247 | } | ||
248 | } | ||
249 | |||
250 | // test type_item | ||
251 | // type Foo = Bar; | ||
252 | fn type_item(p: &mut Parser) { | ||
253 | assert!(p.at(TYPE_KW)); | ||
254 | p.bump(); | ||
255 | |||
256 | name(p); | ||
257 | |||
258 | // test type_item_type_params | ||
259 | // type Result<T> = (); | ||
260 | type_params::type_param_list(p); | ||
261 | |||
262 | if p.at(COLON) { | ||
263 | type_params::bounds(p); | ||
264 | } | ||
265 | |||
266 | // test type_item_where_clause | ||
267 | // type Foo where Foo: Copy = (); | ||
268 | type_params::where_clause(p); | ||
269 | |||
270 | if p.eat(EQ) { | ||
271 | types::type_(p); | ||
272 | } | ||
273 | p.expect(SEMI); | ||
274 | } | ||
275 | |||
276 | fn mod_item(p: &mut Parser) { | ||
277 | assert!(p.at(MOD_KW)); | ||
278 | p.bump(); | ||
279 | |||
280 | name(p); | ||
281 | if !p.eat(SEMI) { | ||
282 | if p.expect(L_CURLY) { | ||
283 | mod_contents(p, true); | ||
284 | p.expect(R_CURLY); | ||
285 | } | ||
286 | } | ||
287 | } | ||
288 | |||
289 | fn macro_call(p: &mut Parser) -> BlockLike { | ||
290 | assert!(paths::is_path_start(p)); | ||
291 | paths::use_path(p); | ||
292 | macro_call_after_excl(p) | ||
293 | } | ||
294 | |||
295 | pub(super) fn macro_call_after_excl(p: &mut Parser) -> BlockLike { | ||
296 | p.expect(EXCL); | ||
297 | p.eat(IDENT); | ||
298 | let flavor = match p.current() { | ||
299 | L_CURLY => { | ||
300 | token_tree(p); | ||
301 | BlockLike::Block | ||
302 | } | ||
303 | L_PAREN | L_BRACK => { | ||
304 | token_tree(p); | ||
305 | BlockLike::NotBlock | ||
306 | } | ||
307 | _ => { | ||
308 | p.error("expected `{`, `[`, `(`"); | ||
309 | BlockLike::NotBlock | ||
310 | }, | ||
311 | }; | ||
312 | |||
313 | flavor | ||
314 | } | ||
315 | |||
316 | fn token_tree(p: &mut Parser) { | ||
317 | let closing_paren_kind = match p.current() { | ||
318 | L_CURLY => R_CURLY, | ||
319 | L_PAREN => R_PAREN, | ||
320 | L_BRACK => R_BRACK, | ||
321 | _ => unreachable!(), | ||
322 | }; | ||
323 | p.bump(); | ||
324 | while !p.at(EOF) && !p.at(closing_paren_kind) { | ||
325 | match p.current() { | ||
326 | L_CURLY | L_PAREN | L_BRACK => token_tree(p), | ||
327 | R_CURLY | R_PAREN | R_BRACK => p.err_and_bump("unmatched brace"), | ||
328 | _ => p.bump() | ||
329 | } | ||
330 | }; | ||
331 | p.expect(closing_paren_kind); | ||
332 | } | ||
diff --git a/crates/libsyntax2/src/grammar/items/structs.rs b/crates/libsyntax2/src/grammar/items/structs.rs new file mode 100644 index 000000000..67616eaad --- /dev/null +++ b/crates/libsyntax2/src/grammar/items/structs.rs | |||
@@ -0,0 +1,116 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn struct_item(p: &mut Parser) { | ||
4 | assert!(p.at(STRUCT_KW)); | ||
5 | p.bump(); | ||
6 | |||
7 | name(p); | ||
8 | type_params::type_param_list(p); | ||
9 | match p.current() { | ||
10 | WHERE_KW => { | ||
11 | type_params::where_clause(p); | ||
12 | match p.current() { | ||
13 | SEMI => { | ||
14 | p.bump(); | ||
15 | return; | ||
16 | } | ||
17 | L_CURLY => named_fields(p), | ||
18 | _ => { | ||
19 | //TODO: special case `(` error message | ||
20 | p.error("expected `;` or `{`"); | ||
21 | return; | ||
22 | } | ||
23 | } | ||
24 | } | ||
25 | SEMI => { | ||
26 | p.bump(); | ||
27 | return; | ||
28 | } | ||
29 | L_CURLY => named_fields(p), | ||
30 | L_PAREN => { | ||
31 | pos_fields(p); | ||
32 | p.expect(SEMI); | ||
33 | } | ||
34 | _ => { | ||
35 | p.error("expected `;`, `{`, or `(`"); | ||
36 | return; | ||
37 | } | ||
38 | } | ||
39 | } | ||
40 | |||
41 | pub(super) fn enum_item(p: &mut Parser) { | ||
42 | assert!(p.at(ENUM_KW)); | ||
43 | p.bump(); | ||
44 | name(p); | ||
45 | type_params::type_param_list(p); | ||
46 | type_params::where_clause(p); | ||
47 | if p.expect(L_CURLY) { | ||
48 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
49 | let var = p.start(); | ||
50 | attributes::outer_attributes(p); | ||
51 | if p.at(IDENT) { | ||
52 | name(p); | ||
53 | match p.current() { | ||
54 | L_CURLY => named_fields(p), | ||
55 | L_PAREN => pos_fields(p), | ||
56 | EQ => { | ||
57 | p.bump(); | ||
58 | expressions::expr(p); | ||
59 | } | ||
60 | _ => (), | ||
61 | } | ||
62 | var.complete(p, ENUM_VARIANT); | ||
63 | } else { | ||
64 | var.abandon(p); | ||
65 | p.err_and_bump("expected enum variant"); | ||
66 | } | ||
67 | if !p.at(R_CURLY) { | ||
68 | p.expect(COMMA); | ||
69 | } | ||
70 | } | ||
71 | p.expect(R_CURLY); | ||
72 | } | ||
73 | } | ||
74 | |||
75 | fn named_fields(p: &mut Parser) { | ||
76 | assert!(p.at(L_CURLY)); | ||
77 | p.bump(); | ||
78 | while !p.at(R_CURLY) && !p.at(EOF) { | ||
79 | named_field(p); | ||
80 | if !p.at(R_CURLY) { | ||
81 | p.expect(COMMA); | ||
82 | } | ||
83 | } | ||
84 | p.expect(R_CURLY); | ||
85 | |||
86 | fn named_field(p: &mut Parser) { | ||
87 | let field = p.start(); | ||
88 | visibility(p); | ||
89 | if p.at(IDENT) { | ||
90 | name(p); | ||
91 | p.expect(COLON); | ||
92 | types::type_(p); | ||
93 | field.complete(p, NAMED_FIELD); | ||
94 | } else { | ||
95 | field.abandon(p); | ||
96 | p.err_and_bump("expected field declaration"); | ||
97 | } | ||
98 | } | ||
99 | } | ||
100 | |||
101 | fn pos_fields(p: &mut Parser) { | ||
102 | if !p.expect(L_PAREN) { | ||
103 | return; | ||
104 | } | ||
105 | while !p.at(R_PAREN) && !p.at(EOF) { | ||
106 | let pos_field = p.start(); | ||
107 | visibility(p); | ||
108 | types::type_(p); | ||
109 | pos_field.complete(p, POS_FIELD); | ||
110 | |||
111 | if !p.at(R_PAREN) { | ||
112 | p.expect(COMMA); | ||
113 | } | ||
114 | } | ||
115 | p.expect(R_PAREN); | ||
116 | } | ||
diff --git a/crates/libsyntax2/src/grammar/items/traits.rs b/crates/libsyntax2/src/grammar/items/traits.rs new file mode 100644 index 000000000..0b9fb2b0b --- /dev/null +++ b/crates/libsyntax2/src/grammar/items/traits.rs | |||
@@ -0,0 +1,87 @@ | |||
1 | use super::*; | ||
2 | |||
3 | // test trait_item | ||
4 | // trait T<U>: Hash + Clone where U: Copy {} | ||
5 | pub(super) fn trait_item(p: &mut Parser) { | ||
6 | assert!(p.at(TRAIT_KW)); | ||
7 | p.bump(); | ||
8 | name(p); | ||
9 | type_params::type_param_list(p); | ||
10 | if p.at(COLON) { | ||
11 | type_params::bounds(p); | ||
12 | } | ||
13 | type_params::where_clause(p); | ||
14 | p.expect(L_CURLY); | ||
15 | // test trait_item_items | ||
16 | // impl F { | ||
17 | // type A: Clone; | ||
18 | // const B: i32; | ||
19 | // fn foo() {} | ||
20 | // fn bar(&self); | ||
21 | // } | ||
22 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
23 | item_or_macro(p, true); | ||
24 | } | ||
25 | p.expect(R_CURLY); | ||
26 | } | ||
27 | |||
28 | // test impl_item | ||
29 | // impl Foo {} | ||
30 | pub(super) fn impl_item(p: &mut Parser) { | ||
31 | assert!(p.at(IMPL_KW)); | ||
32 | p.bump(); | ||
33 | if choose_type_params_over_qpath(p) { | ||
34 | type_params::type_param_list(p); | ||
35 | } | ||
36 | |||
37 | // TODO: never type | ||
38 | // impl ! {} | ||
39 | |||
40 | // test impl_item_neg | ||
41 | // impl !Send for X {} | ||
42 | p.eat(EXCL); | ||
43 | types::type_(p); | ||
44 | if p.eat(FOR_KW) { | ||
45 | types::type_(p); | ||
46 | } | ||
47 | type_params::where_clause(p); | ||
48 | p.expect(L_CURLY); | ||
49 | |||
50 | // test impl_item_items | ||
51 | // impl F { | ||
52 | // type A = i32; | ||
53 | // const B: i32 = 92; | ||
54 | // fn foo() {} | ||
55 | // fn bar(&self) {} | ||
56 | // } | ||
57 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
58 | item_or_macro(p, true); | ||
59 | } | ||
60 | p.expect(R_CURLY); | ||
61 | } | ||
62 | |||
63 | fn choose_type_params_over_qpath(p: &Parser) -> bool { | ||
64 | // There's an ambiguity between generic parameters and qualified paths in impls. | ||
65 | // If we see `<` it may start both, so we have to inspect some following tokens. | ||
66 | // The following combinations can only start generics, | ||
67 | // but not qualified paths (with one exception): | ||
68 | // `<` `>` - empty generic parameters | ||
69 | // `<` `#` - generic parameters with attributes | ||
70 | // `<` (LIFETIME|IDENT) `>` - single generic parameter | ||
71 | // `<` (LIFETIME|IDENT) `,` - first generic parameter in a list | ||
72 | // `<` (LIFETIME|IDENT) `:` - generic parameter with bounds | ||
73 | // `<` (LIFETIME|IDENT) `=` - generic parameter with a default | ||
74 | // The only truly ambiguous case is | ||
75 | // `<` IDENT `>` `::` IDENT ... | ||
76 | // we disambiguate it in favor of generics (`impl<T> ::absolute::Path<T> { ... }`) | ||
77 | // because this is what almost always expected in practice, qualified paths in impls | ||
78 | // (`impl <Type>::AssocTy { ... }`) aren't even allowed by type checker at the moment. | ||
79 | if !p.at(L_ANGLE) { | ||
80 | return false; | ||
81 | } | ||
82 | if p.nth(1) == POUND || p.nth(1) == R_ANGLE { | ||
83 | return true; | ||
84 | } | ||
85 | (p.nth(1) == LIFETIME || p.nth(1) == IDENT) | ||
86 | && (p.nth(2) == R_ANGLE || p.nth(2) == COMMA || p.nth(2) == COLON || p.nth(2) == EQ) | ||
87 | } | ||
diff --git a/crates/libsyntax2/src/grammar/items/use_item.rs b/crates/libsyntax2/src/grammar/items/use_item.rs new file mode 100644 index 000000000..a3f7f0da8 --- /dev/null +++ b/crates/libsyntax2/src/grammar/items/use_item.rs | |||
@@ -0,0 +1,66 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn use_item(p: &mut Parser) { | ||
4 | assert!(p.at(USE_KW)); | ||
5 | p.bump(); | ||
6 | use_tree(p); | ||
7 | p.expect(SEMI); | ||
8 | } | ||
9 | |||
10 | fn use_tree(p: &mut Parser) { | ||
11 | let la = p.nth(1); | ||
12 | let m = p.start(); | ||
13 | match (p.current(), la) { | ||
14 | (STAR, _) => p.bump(), | ||
15 | (COLONCOLON, STAR) => { | ||
16 | p.bump(); | ||
17 | p.bump(); | ||
18 | } | ||
19 | (L_CURLY, _) | (COLONCOLON, L_CURLY) => { | ||
20 | if p.at(COLONCOLON) { | ||
21 | p.bump(); | ||
22 | } | ||
23 | nested_trees(p); | ||
24 | } | ||
25 | _ if paths::is_path_start(p) => { | ||
26 | paths::use_path(p); | ||
27 | match p.current() { | ||
28 | AS_KW => { | ||
29 | alias(p); | ||
30 | } | ||
31 | COLONCOLON => { | ||
32 | p.bump(); | ||
33 | match p.current() { | ||
34 | STAR => { | ||
35 | p.bump(); | ||
36 | } | ||
37 | L_CURLY => nested_trees(p), | ||
38 | _ => { | ||
39 | // is this unreachable? | ||
40 | p.error("expected `{` or `*`"); | ||
41 | } | ||
42 | } | ||
43 | } | ||
44 | _ => (), | ||
45 | } | ||
46 | } | ||
47 | _ => { | ||
48 | m.abandon(p); | ||
49 | p.err_and_bump("expected one of `*`, `::`, `{`, `self`, `super`, `indent`"); | ||
50 | return; | ||
51 | } | ||
52 | } | ||
53 | m.complete(p, USE_TREE); | ||
54 | } | ||
55 | |||
56 | fn nested_trees(p: &mut Parser) { | ||
57 | assert!(p.at(L_CURLY)); | ||
58 | p.bump(); | ||
59 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
60 | use_tree(p); | ||
61 | if !p.at(R_CURLY) { | ||
62 | p.expect(COMMA); | ||
63 | } | ||
64 | } | ||
65 | p.expect(R_CURLY); | ||
66 | } | ||
diff --git a/crates/libsyntax2/src/grammar/mod.rs b/crates/libsyntax2/src/grammar/mod.rs new file mode 100644 index 000000000..e1329044d --- /dev/null +++ b/crates/libsyntax2/src/grammar/mod.rs | |||
@@ -0,0 +1,161 @@ | |||
1 | //! This is the actual "grammar" of the Rust language. | ||
2 | //! | ||
3 | //! Each function in this module and its children corresponds | ||
4 | //! to a production of the format grammar. Submodules roughly | ||
5 | //! correspond to different *areas* of the grammar. By convention, | ||
6 | //! each submodule starts with `use super::*` import and exports | ||
7 | //! "public" productions via `pub(super)`. | ||
8 | //! | ||
9 | //! See docs for `Parser` to learn about API, available to the grammar, | ||
10 | //! and see docs for `Event` to learn how this actually manages to | ||
11 | //! produce parse trees. | ||
12 | //! | ||
13 | //! Code in this module also contains inline tests, which start with | ||
14 | //! `// test name-of-the-test` comment and look like this: | ||
15 | //! | ||
16 | //! ``` | ||
17 | //! // test function_with_zero_parameters | ||
18 | //! // fn foo() {} | ||
19 | //! ``` | ||
20 | //! | ||
21 | //! After adding a new inline-test, run `cargo collect-tests` to extract | ||
22 | //! it as a standalone text-fixture into `tests/data/parser/inline`, and | ||
23 | //! run `cargo test` once to create the "gold" value. | ||
24 | mod attributes; | ||
25 | mod expressions; | ||
26 | mod items; | ||
27 | mod params; | ||
28 | mod paths; | ||
29 | mod patterns; | ||
30 | mod type_args; | ||
31 | mod type_params; | ||
32 | mod types; | ||
33 | |||
34 | use { | ||
35 | parser_api::{CompletedMarker, Parser, TokenSet}, | ||
36 | SyntaxKind::{self, *}, | ||
37 | }; | ||
38 | |||
39 | pub(crate) fn file(p: &mut Parser) { | ||
40 | let file = p.start(); | ||
41 | p.eat(SHEBANG); | ||
42 | items::mod_contents(p, false); | ||
43 | file.complete(p, FILE); | ||
44 | } | ||
45 | |||
46 | |||
47 | #[derive(Clone, Copy, PartialEq, Eq)] | ||
48 | enum BlockLike { | ||
49 | Block, | ||
50 | NotBlock, | ||
51 | } | ||
52 | |||
53 | impl BlockLike { | ||
54 | fn is_block(self) -> bool { self == BlockLike::Block } | ||
55 | } | ||
56 | |||
57 | fn visibility(p: &mut Parser) { | ||
58 | match p.current() { | ||
59 | PUB_KW => { | ||
60 | let m = p.start(); | ||
61 | p.bump(); | ||
62 | if p.at(L_PAREN) { | ||
63 | match p.nth(1) { | ||
64 | // test crate_visibility | ||
65 | // pub(crate) struct S; | ||
66 | // pub(self) struct S; | ||
67 | // pub(self) struct S; | ||
68 | // pub(self) struct S; | ||
69 | CRATE_KW | SELF_KW | SUPER_KW => { | ||
70 | p.bump(); | ||
71 | p.bump(); | ||
72 | p.expect(R_PAREN); | ||
73 | } | ||
74 | IN_KW => { | ||
75 | p.bump(); | ||
76 | p.bump(); | ||
77 | paths::use_path(p); | ||
78 | p.expect(R_PAREN); | ||
79 | } | ||
80 | _ => (), | ||
81 | } | ||
82 | } | ||
83 | m.complete(p, VISIBILITY); | ||
84 | } | ||
85 | // test crate_keyword_vis | ||
86 | // crate fn main() { } | ||
87 | CRATE_KW => { | ||
88 | let m = p.start(); | ||
89 | p.bump(); | ||
90 | m.complete(p, VISIBILITY); | ||
91 | } | ||
92 | _ => (), | ||
93 | } | ||
94 | } | ||
95 | fn alias(p: &mut Parser) -> bool { | ||
96 | if p.at(AS_KW) { | ||
97 | let alias = p.start(); | ||
98 | p.bump(); | ||
99 | name(p); | ||
100 | alias.complete(p, ALIAS); | ||
101 | } | ||
102 | true //FIXME: return false if three are errors | ||
103 | } | ||
104 | |||
105 | fn abi(p: &mut Parser) { | ||
106 | assert!(p.at(EXTERN_KW)); | ||
107 | let abi = p.start(); | ||
108 | p.bump(); | ||
109 | match p.current() { | ||
110 | STRING | RAW_STRING => p.bump(), | ||
111 | _ => (), | ||
112 | } | ||
113 | abi.complete(p, ABI); | ||
114 | } | ||
115 | |||
116 | fn fn_ret_type(p: &mut Parser) -> bool { | ||
117 | if p.at(THIN_ARROW) { | ||
118 | p.bump(); | ||
119 | types::type_(p); | ||
120 | true | ||
121 | } else { | ||
122 | false | ||
123 | } | ||
124 | } | ||
125 | |||
126 | fn name(p: &mut Parser) { | ||
127 | if p.at(IDENT) { | ||
128 | let m = p.start(); | ||
129 | p.bump(); | ||
130 | m.complete(p, NAME); | ||
131 | } else { | ||
132 | p.error("expected a name"); | ||
133 | } | ||
134 | } | ||
135 | |||
136 | fn name_ref(p: &mut Parser) { | ||
137 | if p.at(IDENT) { | ||
138 | let m = p.start(); | ||
139 | p.bump(); | ||
140 | m.complete(p, NAME_REF); | ||
141 | } else { | ||
142 | p.error("expected identifier"); | ||
143 | } | ||
144 | } | ||
145 | |||
146 | fn error_block(p: &mut Parser, message: &str) { | ||
147 | assert!(p.at(L_CURLY)); | ||
148 | let err = p.start(); | ||
149 | p.error(message); | ||
150 | p.bump(); | ||
151 | let mut level: u32 = 1; | ||
152 | while level > 0 && !p.at(EOF) { | ||
153 | match p.current() { | ||
154 | L_CURLY => level += 1, | ||
155 | R_CURLY => level -= 1, | ||
156 | _ => (), | ||
157 | } | ||
158 | p.bump(); | ||
159 | } | ||
160 | err.complete(p, ERROR); | ||
161 | } | ||
diff --git a/crates/libsyntax2/src/grammar/params.rs b/crates/libsyntax2/src/grammar/params.rs new file mode 100644 index 000000000..32e905cb2 --- /dev/null +++ b/crates/libsyntax2/src/grammar/params.rs | |||
@@ -0,0 +1,116 @@ | |||
1 | use super::*; | ||
2 | |||
3 | // test param_list | ||
4 | // fn a() {} | ||
5 | // fn b(x: i32) {} | ||
6 | // fn c(x: i32, ) {} | ||
7 | // fn d(x: i32, y: ()) {} | ||
8 | pub(super) fn param_list(p: &mut Parser) { | ||
9 | list_(p, Flavor::Normal) | ||
10 | } | ||
11 | |||
12 | // test param_list_opt_patterns | ||
13 | // fn foo<F: FnMut(&mut Foo<'a>)>(){} | ||
14 | pub(super) fn param_list_opt_patterns(p: &mut Parser) { | ||
15 | list_(p, Flavor::OptionalPattern) | ||
16 | } | ||
17 | |||
18 | pub(super) fn param_list_opt_types(p: &mut Parser) { | ||
19 | list_(p, Flavor::OptionalType) | ||
20 | } | ||
21 | |||
22 | #[derive(Clone, Copy, Eq, PartialEq)] | ||
23 | enum Flavor { | ||
24 | OptionalType, | ||
25 | OptionalPattern, | ||
26 | Normal, | ||
27 | } | ||
28 | |||
29 | impl Flavor { | ||
30 | fn type_required(self) -> bool { | ||
31 | match self { | ||
32 | Flavor::OptionalType => false, | ||
33 | _ => true, | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | |||
38 | fn list_(p: &mut Parser, flavor: Flavor) { | ||
39 | let (bra, ket) = if flavor.type_required() { | ||
40 | (L_PAREN, R_PAREN) | ||
41 | } else { | ||
42 | (PIPE, PIPE) | ||
43 | }; | ||
44 | assert!(p.at(bra)); | ||
45 | let m = p.start(); | ||
46 | p.bump(); | ||
47 | if flavor.type_required() { | ||
48 | self_param(p); | ||
49 | } | ||
50 | while !p.at(EOF) && !p.at(ket) { | ||
51 | value_parameter(p, flavor); | ||
52 | if !p.at(ket) { | ||
53 | p.expect(COMMA); | ||
54 | } | ||
55 | } | ||
56 | p.expect(ket); | ||
57 | m.complete(p, PARAM_LIST); | ||
58 | } | ||
59 | |||
60 | fn value_parameter(p: &mut Parser, flavor: Flavor) { | ||
61 | let m = p.start(); | ||
62 | match flavor { | ||
63 | Flavor::OptionalType | Flavor::Normal => { | ||
64 | patterns::pattern(p); | ||
65 | if p.at(COLON) || flavor.type_required() { | ||
66 | types::ascription(p) | ||
67 | } | ||
68 | }, | ||
69 | // test value_parameters_no_patterns | ||
70 | // type F = Box<Fn(a: i32, &b: &i32, &mut c: &i32, ())>; | ||
71 | Flavor::OptionalPattern => { | ||
72 | let la0 = p.current(); | ||
73 | let la1 = p.nth(1); | ||
74 | let la2 = p.nth(2); | ||
75 | let la3 = p.nth(3); | ||
76 | if la0 == IDENT && la1 == COLON | ||
77 | || la0 == AMP && la1 == IDENT && la2 == COLON | ||
78 | || la0 == AMP && la1 == MUT_KW && la2 == IDENT && la3 == COLON { | ||
79 | patterns::pattern(p); | ||
80 | types::ascription(p); | ||
81 | } else { | ||
82 | types::type_(p); | ||
83 | } | ||
84 | }, | ||
85 | } | ||
86 | m.complete(p, PARAM); | ||
87 | } | ||
88 | |||
89 | // test self_param | ||
90 | // impl S { | ||
91 | // fn a(self) {} | ||
92 | // fn b(&self,) {} | ||
93 | // fn c(&'a self,) {} | ||
94 | // fn d(&'a mut self, x: i32) {} | ||
95 | // } | ||
96 | fn self_param(p: &mut Parser) { | ||
97 | let la1 = p.nth(1); | ||
98 | let la2 = p.nth(2); | ||
99 | let la3 = p.nth(3); | ||
100 | let n_toks = match (p.current(), la1, la2, la3) { | ||
101 | (SELF_KW, _, _, _) => 1, | ||
102 | (AMP, SELF_KW, _, _) => 2, | ||
103 | (AMP, MUT_KW, SELF_KW, _) => 3, | ||
104 | (AMP, LIFETIME, SELF_KW, _) => 3, | ||
105 | (AMP, LIFETIME, MUT_KW, SELF_KW) => 4, | ||
106 | _ => return, | ||
107 | }; | ||
108 | let m = p.start(); | ||
109 | for _ in 0..n_toks { | ||
110 | p.bump(); | ||
111 | } | ||
112 | m.complete(p, SELF_PARAM); | ||
113 | if !p.at(R_PAREN) { | ||
114 | p.expect(COMMA); | ||
115 | } | ||
116 | } | ||
diff --git a/crates/libsyntax2/src/grammar/paths.rs b/crates/libsyntax2/src/grammar/paths.rs new file mode 100644 index 000000000..c277e2a6b --- /dev/null +++ b/crates/libsyntax2/src/grammar/paths.rs | |||
@@ -0,0 +1,86 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn is_path_start(p: &Parser) -> bool { | ||
4 | match p.current() { | ||
5 | IDENT | SELF_KW | SUPER_KW | COLONCOLON => true, | ||
6 | _ => false, | ||
7 | } | ||
8 | } | ||
9 | |||
10 | pub(super) fn use_path(p: &mut Parser) { | ||
11 | path(p, Mode::Use) | ||
12 | } | ||
13 | |||
14 | pub(super) fn type_path(p: &mut Parser) { | ||
15 | path(p, Mode::Type) | ||
16 | } | ||
17 | |||
18 | pub(super) fn expr_path(p: &mut Parser) { | ||
19 | path(p, Mode::Expr) | ||
20 | } | ||
21 | |||
22 | #[derive(Clone, Copy, Eq, PartialEq)] | ||
23 | enum Mode { | ||
24 | Use, | ||
25 | Type, | ||
26 | Expr, | ||
27 | } | ||
28 | |||
29 | fn path(p: &mut Parser, mode: Mode) { | ||
30 | if !is_path_start(p) { | ||
31 | return; | ||
32 | } | ||
33 | let path = p.start(); | ||
34 | path_segment(p, mode, true); | ||
35 | let mut qual = path.complete(p, PATH); | ||
36 | loop { | ||
37 | let use_tree = match p.nth(1) { | ||
38 | STAR | L_CURLY => true, | ||
39 | _ => false, | ||
40 | }; | ||
41 | if p.at(COLONCOLON) && !use_tree { | ||
42 | let path = qual.precede(p); | ||
43 | p.bump(); | ||
44 | path_segment(p, mode, false); | ||
45 | let path = path.complete(p, PATH); | ||
46 | qual = path; | ||
47 | } else { | ||
48 | break; | ||
49 | } | ||
50 | } | ||
51 | } | ||
52 | |||
53 | fn path_segment(p: &mut Parser, mode: Mode, first: bool) { | ||
54 | let segment = p.start(); | ||
55 | if first { | ||
56 | p.eat(COLONCOLON); | ||
57 | } | ||
58 | match p.current() { | ||
59 | IDENT => { | ||
60 | name_ref(p); | ||
61 | path_generic_args(p, mode); | ||
62 | } | ||
63 | SELF_KW | SUPER_KW => p.bump(), | ||
64 | _ => { | ||
65 | p.error("expected identifier"); | ||
66 | } | ||
67 | }; | ||
68 | segment.complete(p, PATH_SEGMENT); | ||
69 | } | ||
70 | |||
71 | fn path_generic_args(p: &mut Parser, mode: Mode) { | ||
72 | match mode { | ||
73 | Mode::Use => return, | ||
74 | Mode::Type => { | ||
75 | // test path_fn_trait_args | ||
76 | // type F = Box<Fn(x: i32) -> ()>; | ||
77 | if p.at(L_PAREN) { | ||
78 | params::param_list_opt_patterns(p); | ||
79 | fn_ret_type(p); | ||
80 | } else { | ||
81 | type_args::type_arg_list(p, false) | ||
82 | } | ||
83 | }, | ||
84 | Mode::Expr => type_args::type_arg_list(p, true), | ||
85 | } | ||
86 | } | ||
diff --git a/crates/libsyntax2/src/grammar/patterns.rs b/crates/libsyntax2/src/grammar/patterns.rs new file mode 100644 index 000000000..436f3b26d --- /dev/null +++ b/crates/libsyntax2/src/grammar/patterns.rs | |||
@@ -0,0 +1,204 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn pattern(p: &mut Parser) { | ||
4 | if let Some(lhs) = atom_pat(p) { | ||
5 | // test range_pat | ||
6 | // fn main() { | ||
7 | // match 92 { 0 ... 100 => () } | ||
8 | // } | ||
9 | if p.at(DOTDOTDOT) { | ||
10 | let m = lhs.precede(p); | ||
11 | p.bump(); | ||
12 | atom_pat(p); | ||
13 | m.complete(p, RANGE_PAT); | ||
14 | } | ||
15 | } | ||
16 | } | ||
17 | |||
18 | fn atom_pat(p: &mut Parser) -> Option<CompletedMarker> { | ||
19 | let la0 = p.nth(0); | ||
20 | let la1 = p.nth(1); | ||
21 | if la0 == REF_KW || la0 == MUT_KW | ||
22 | || (la0 == IDENT && !(la1 == COLONCOLON || la1 == L_PAREN || la1 == L_CURLY)) { | ||
23 | return Some(bind_pat(p, true)); | ||
24 | } | ||
25 | if paths::is_path_start(p) { | ||
26 | return Some(path_pat(p)); | ||
27 | } | ||
28 | |||
29 | // test literal_pattern | ||
30 | // fn main() { | ||
31 | // match () { | ||
32 | // 92 => (), | ||
33 | // 'c' => (), | ||
34 | // "hello" => (), | ||
35 | // } | ||
36 | // } | ||
37 | match expressions::literal(p) { | ||
38 | Some(m) => return Some(m), | ||
39 | None => (), | ||
40 | } | ||
41 | |||
42 | let m = match la0 { | ||
43 | UNDERSCORE => placeholder_pat(p), | ||
44 | AMP => ref_pat(p), | ||
45 | L_PAREN => tuple_pat(p), | ||
46 | L_BRACK => slice_pat(p), | ||
47 | _ => { | ||
48 | p.err_and_bump("expected pattern"); | ||
49 | return None; | ||
50 | } | ||
51 | }; | ||
52 | Some(m) | ||
53 | } | ||
54 | |||
55 | // test path_part | ||
56 | // fn foo() { | ||
57 | // let foo::Bar = (); | ||
58 | // let ::Bar = (); | ||
59 | // let Bar { .. } = (); | ||
60 | // let Bar(..) = (); | ||
61 | // } | ||
62 | fn path_pat(p: &mut Parser) -> CompletedMarker { | ||
63 | let m = p.start(); | ||
64 | paths::expr_path(p); | ||
65 | let kind = match p.current() { | ||
66 | L_PAREN => { | ||
67 | tuple_pat_fields(p); | ||
68 | TUPLE_STRUCT_PAT | ||
69 | } | ||
70 | L_CURLY => { | ||
71 | struct_pat_fields(p); | ||
72 | STRUCT_PAT | ||
73 | } | ||
74 | _ => PATH_PAT | ||
75 | }; | ||
76 | m.complete(p, kind) | ||
77 | } | ||
78 | |||
79 | // test tuple_pat_fields | ||
80 | // fn foo() { | ||
81 | // let S() = (); | ||
82 | // let S(_) = (); | ||
83 | // let S(_,) = (); | ||
84 | // let S(_, .. , x) = (); | ||
85 | // } | ||
86 | fn tuple_pat_fields(p: &mut Parser) { | ||
87 | assert!(p.at(L_PAREN)); | ||
88 | p.bump(); | ||
89 | while !p.at(EOF) && !p.at(R_PAREN) { | ||
90 | match p.current() { | ||
91 | DOTDOT => p.bump(), | ||
92 | _ => pattern(p), | ||
93 | } | ||
94 | if !p.at(R_PAREN) { | ||
95 | p.expect(COMMA); | ||
96 | } | ||
97 | } | ||
98 | p.expect(R_PAREN); | ||
99 | } | ||
100 | |||
101 | // test struct_pat_fields | ||
102 | // fn foo() { | ||
103 | // let S {} = (); | ||
104 | // let S { f, ref mut g } = (); | ||
105 | // let S { h: _, ..} = (); | ||
106 | // let S { h: _, } = (); | ||
107 | // } | ||
108 | fn struct_pat_fields(p: &mut Parser) { | ||
109 | assert!(p.at(L_CURLY)); | ||
110 | p.bump(); | ||
111 | while !p.at(EOF) && !p.at(R_CURLY) { | ||
112 | match p.current() { | ||
113 | DOTDOT => p.bump(), | ||
114 | IDENT if p.nth(1) == COLON => { | ||
115 | p.bump(); | ||
116 | p.bump(); | ||
117 | pattern(p); | ||
118 | } | ||
119 | _ => { | ||
120 | bind_pat(p, false); | ||
121 | } | ||
122 | } | ||
123 | if !p.at(R_CURLY) { | ||
124 | p.expect(COMMA); | ||
125 | } | ||
126 | } | ||
127 | p.expect(R_CURLY); | ||
128 | } | ||
129 | |||
130 | // test placeholder_pat | ||
131 | // fn main() { let _ = (); } | ||
132 | fn placeholder_pat(p: &mut Parser) -> CompletedMarker { | ||
133 | assert!(p.at(UNDERSCORE)); | ||
134 | let m = p.start(); | ||
135 | p.bump(); | ||
136 | m.complete(p, PLACEHOLDER_PAT) | ||
137 | } | ||
138 | |||
139 | // test ref_pat | ||
140 | // fn main() { | ||
141 | // let &a = (); | ||
142 | // let &mut b = (); | ||
143 | // } | ||
144 | fn ref_pat(p: &mut Parser) -> CompletedMarker { | ||
145 | assert!(p.at(AMP)); | ||
146 | let m = p.start(); | ||
147 | p.bump(); | ||
148 | p.eat(MUT_KW); | ||
149 | pattern(p); | ||
150 | m.complete(p, REF_PAT) | ||
151 | } | ||
152 | |||
153 | // test tuple_pat | ||
154 | // fn main() { | ||
155 | // let (a, b, ..) = (); | ||
156 | // } | ||
157 | fn tuple_pat(p: &mut Parser) -> CompletedMarker { | ||
158 | assert!(p.at(L_PAREN)); | ||
159 | let m = p.start(); | ||
160 | tuple_pat_fields(p); | ||
161 | m.complete(p, TUPLE_PAT) | ||
162 | } | ||
163 | |||
164 | // test slice_pat | ||
165 | // fn main() { | ||
166 | // let [a, b, ..] = []; | ||
167 | // } | ||
168 | fn slice_pat(p: &mut Parser) -> CompletedMarker { | ||
169 | assert!(p.at(L_BRACK)); | ||
170 | let m = p.start(); | ||
171 | p.bump(); | ||
172 | while !p.at(EOF) && !p.at(R_BRACK) { | ||
173 | match p.current() { | ||
174 | DOTDOT => p.bump(), | ||
175 | _ => pattern(p), | ||
176 | } | ||
177 | if !p.at(R_BRACK) { | ||
178 | p.expect(COMMA); | ||
179 | } | ||
180 | } | ||
181 | p.expect(R_BRACK); | ||
182 | |||
183 | m.complete(p, SLICE_PAT) | ||
184 | } | ||
185 | |||
186 | // test bind_pat | ||
187 | // fn main() { | ||
188 | // let a = (); | ||
189 | // let mut b = (); | ||
190 | // let ref c = (); | ||
191 | // let ref mut d = (); | ||
192 | // let e @ _ = (); | ||
193 | // let ref mut f @ g @ _ = (); | ||
194 | // } | ||
195 | fn bind_pat(p: &mut Parser, with_at: bool) -> CompletedMarker { | ||
196 | let m = p.start(); | ||
197 | p.eat(REF_KW); | ||
198 | p.eat(MUT_KW); | ||
199 | name(p); | ||
200 | if with_at && p.eat(AT) { | ||
201 | pattern(p); | ||
202 | } | ||
203 | m.complete(p, BIND_PAT) | ||
204 | } | ||
diff --git a/crates/libsyntax2/src/grammar/type_args.rs b/crates/libsyntax2/src/grammar/type_args.rs new file mode 100644 index 000000000..5b960f10b --- /dev/null +++ b/crates/libsyntax2/src/grammar/type_args.rs | |||
@@ -0,0 +1,48 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn type_arg_list(p: &mut Parser, colon_colon_required: bool) { | ||
4 | let m; | ||
5 | match (colon_colon_required, p.nth(0), p.nth(1)) { | ||
6 | (_, COLONCOLON, L_ANGLE) => { | ||
7 | m = p.start(); | ||
8 | p.bump(); | ||
9 | p.bump(); | ||
10 | } | ||
11 | (false, L_ANGLE, _) => { | ||
12 | m = p.start(); | ||
13 | p.bump(); | ||
14 | } | ||
15 | _ => return, | ||
16 | }; | ||
17 | |||
18 | while !p.at(EOF) && !p.at(R_ANGLE) { | ||
19 | type_arg(p); | ||
20 | if !p.at(R_ANGLE) && !p.expect(COMMA) { | ||
21 | break; | ||
22 | } | ||
23 | } | ||
24 | p.expect(R_ANGLE); | ||
25 | m.complete(p, TYPE_ARG_LIST); | ||
26 | } | ||
27 | |||
28 | // test type_arg | ||
29 | // type A = B<'static, i32, Item=u64> | ||
30 | fn type_arg(p: &mut Parser) { | ||
31 | let m = p.start(); | ||
32 | match p.current() { | ||
33 | LIFETIME => { | ||
34 | p.bump(); | ||
35 | m.complete(p, LIFETIME_ARG); | ||
36 | } | ||
37 | IDENT if p.nth(1) == EQ => { | ||
38 | name_ref(p); | ||
39 | p.bump(); | ||
40 | types::type_(p); | ||
41 | m.complete(p, ASSOC_TYPE_ARG); | ||
42 | } | ||
43 | _ => { | ||
44 | types::type_(p); | ||
45 | m.complete(p, TYPE_ARG); | ||
46 | } | ||
47 | } | ||
48 | } | ||
diff --git a/crates/libsyntax2/src/grammar/type_params.rs b/crates/libsyntax2/src/grammar/type_params.rs new file mode 100644 index 000000000..0a3e8fd07 --- /dev/null +++ b/crates/libsyntax2/src/grammar/type_params.rs | |||
@@ -0,0 +1,127 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn type_param_list(p: &mut Parser) { | ||
4 | if !p.at(L_ANGLE) { | ||
5 | return; | ||
6 | } | ||
7 | let m = p.start(); | ||
8 | p.bump(); | ||
9 | |||
10 | while !p.at(EOF) && !p.at(R_ANGLE) { | ||
11 | match p.current() { | ||
12 | LIFETIME => lifetime_param(p), | ||
13 | IDENT => type_param(p), | ||
14 | _ => p.err_and_bump("expected type parameter"), | ||
15 | } | ||
16 | if !p.at(R_ANGLE) && !p.expect(COMMA) { | ||
17 | break; | ||
18 | } | ||
19 | } | ||
20 | p.expect(R_ANGLE); | ||
21 | m.complete(p, TYPE_PARAM_LIST); | ||
22 | |||
23 | fn lifetime_param(p: &mut Parser) { | ||
24 | assert!(p.at(LIFETIME)); | ||
25 | let m = p.start(); | ||
26 | p.bump(); | ||
27 | if p.at(COLON) { | ||
28 | lifetime_bounds(p); | ||
29 | } | ||
30 | m.complete(p, LIFETIME_PARAM); | ||
31 | } | ||
32 | |||
33 | fn type_param(p: &mut Parser) { | ||
34 | assert!(p.at(IDENT)); | ||
35 | let m = p.start(); | ||
36 | name(p); | ||
37 | if p.at(COLON) { | ||
38 | bounds(p); | ||
39 | } | ||
40 | // test type_param_default | ||
41 | // struct S<T = i32>; | ||
42 | if p.at(EQ) { | ||
43 | p.bump(); | ||
44 | types::type_(p) | ||
45 | } | ||
46 | m.complete(p, TYPE_PARAM); | ||
47 | } | ||
48 | } | ||
49 | |||
50 | // test type_param_bounds | ||
51 | // struct S<T: 'a + ?Sized + (Copy)>; | ||
52 | pub(super) fn bounds(p: &mut Parser) { | ||
53 | assert!(p.at(COLON)); | ||
54 | p.bump(); | ||
55 | bounds_without_colon(p); | ||
56 | } | ||
57 | |||
58 | fn lifetime_bounds(p: &mut Parser) { | ||
59 | assert!(p.at(COLON)); | ||
60 | p.bump(); | ||
61 | while p.at(LIFETIME) { | ||
62 | p.bump(); | ||
63 | if !p.eat(PLUS) { | ||
64 | break; | ||
65 | } | ||
66 | } | ||
67 | } | ||
68 | |||
69 | pub(super) fn bounds_without_colon(p: &mut Parser) { | ||
70 | loop { | ||
71 | let has_paren = p.eat(L_PAREN); | ||
72 | p.eat(QUESTION); | ||
73 | if p.at(FOR_KW) { | ||
74 | //TODO | ||
75 | } | ||
76 | if p.at(LIFETIME) { | ||
77 | p.bump(); | ||
78 | } else if paths::is_path_start(p) { | ||
79 | paths::type_path(p); | ||
80 | } else { | ||
81 | break; | ||
82 | } | ||
83 | if has_paren { | ||
84 | p.expect(R_PAREN); | ||
85 | } | ||
86 | if !p.eat(PLUS) { | ||
87 | break; | ||
88 | } | ||
89 | } | ||
90 | } | ||
91 | |||
92 | // test where_clause | ||
93 | // fn foo() | ||
94 | // where | ||
95 | // 'a: 'b + 'c, | ||
96 | // T: Clone + Copy + 'static, | ||
97 | // Iterator::Item: 'a, | ||
98 | // {} | ||
99 | pub(super) fn where_clause(p: &mut Parser) { | ||
100 | if !p.at(WHERE_KW) { | ||
101 | return; | ||
102 | } | ||
103 | let m = p.start(); | ||
104 | p.bump(); | ||
105 | loop { | ||
106 | if !(paths::is_path_start(p) || p.current() == LIFETIME) { | ||
107 | break | ||
108 | } | ||
109 | where_predicate(p); | ||
110 | if p.current() != L_CURLY && p.current() != SEMI { | ||
111 | p.expect(COMMA); | ||
112 | } | ||
113 | } | ||
114 | m.complete(p, WHERE_CLAUSE); | ||
115 | } | ||
116 | |||
117 | fn where_predicate(p: &mut Parser) { | ||
118 | let m = p.start(); | ||
119 | if p.at(LIFETIME) { | ||
120 | p.eat(LIFETIME); | ||
121 | lifetime_bounds(p) | ||
122 | } else { | ||
123 | types::path_type(p); | ||
124 | bounds(p); | ||
125 | } | ||
126 | m.complete(p, WHERE_PRED); | ||
127 | } | ||
diff --git a/crates/libsyntax2/src/grammar/types.rs b/crates/libsyntax2/src/grammar/types.rs new file mode 100644 index 000000000..0d8c6bfba --- /dev/null +++ b/crates/libsyntax2/src/grammar/types.rs | |||
@@ -0,0 +1,212 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn type_(p: &mut Parser) { | ||
4 | match p.current() { | ||
5 | L_PAREN => paren_or_tuple_type(p), | ||
6 | EXCL => never_type(p), | ||
7 | STAR => pointer_type(p), | ||
8 | L_BRACK => array_or_slice_type(p), | ||
9 | AMP => reference_type(p), | ||
10 | UNDERSCORE => placeholder_type(p), | ||
11 | FN_KW | UNSAFE_KW | EXTERN_KW => fn_pointer_type(p), | ||
12 | FOR_KW => for_type(p), | ||
13 | IMPL_KW => impl_trait_type(p), | ||
14 | _ if paths::is_path_start(p) => path_type(p), | ||
15 | _ => { | ||
16 | p.error("expected type"); | ||
17 | } | ||
18 | } | ||
19 | } | ||
20 | |||
21 | pub(super) fn ascription(p: &mut Parser) { | ||
22 | p.expect(COLON); | ||
23 | type_(p) | ||
24 | } | ||
25 | |||
26 | fn type_no_plus(p: &mut Parser) { | ||
27 | type_(p); | ||
28 | } | ||
29 | |||
30 | fn paren_or_tuple_type(p: &mut Parser) { | ||
31 | assert!(p.at(L_PAREN)); | ||
32 | let m = p.start(); | ||
33 | p.bump(); | ||
34 | let mut n_types: u32 = 0; | ||
35 | let mut trailing_comma: bool = false; | ||
36 | while !p.at(EOF) && !p.at(R_PAREN) { | ||
37 | n_types += 1; | ||
38 | type_(p); | ||
39 | if p.eat(COMMA) { | ||
40 | trailing_comma = true; | ||
41 | } else { | ||
42 | trailing_comma = false; | ||
43 | break; | ||
44 | } | ||
45 | } | ||
46 | p.expect(R_PAREN); | ||
47 | |||
48 | let kind = if n_types == 1 && !trailing_comma { | ||
49 | // test paren_type | ||
50 | // type T = (i32); | ||
51 | PAREN_TYPE | ||
52 | } else { | ||
53 | // test unit_type | ||
54 | // type T = (); | ||
55 | |||
56 | // test singleton_tuple_type | ||
57 | // type T = (i32,); | ||
58 | TUPLE_TYPE | ||
59 | }; | ||
60 | m.complete(p, kind); | ||
61 | } | ||
62 | |||
63 | // test never_type | ||
64 | // type Never = !; | ||
65 | fn never_type(p: &mut Parser) { | ||
66 | assert!(p.at(EXCL)); | ||
67 | let m = p.start(); | ||
68 | p.bump(); | ||
69 | m.complete(p, NEVER_TYPE); | ||
70 | } | ||
71 | |||
72 | fn pointer_type(p: &mut Parser) { | ||
73 | assert!(p.at(STAR)); | ||
74 | let m = p.start(); | ||
75 | p.bump(); | ||
76 | |||
77 | match p.current() { | ||
78 | // test pointer_type_mut | ||
79 | // type M = *mut (); | ||
80 | // type C = *mut (); | ||
81 | MUT_KW | CONST_KW => p.bump(), | ||
82 | _ => { | ||
83 | // test pointer_type_no_mutability | ||
84 | // type T = *(); | ||
85 | p.error( | ||
86 | "expected mut or const in raw pointer type \ | ||
87 | (use `*mut T` or `*const T` as appropriate)", | ||
88 | ); | ||
89 | } | ||
90 | }; | ||
91 | |||
92 | type_no_plus(p); | ||
93 | m.complete(p, POINTER_TYPE); | ||
94 | } | ||
95 | |||
96 | fn array_or_slice_type(p: &mut Parser) { | ||
97 | assert!(p.at(L_BRACK)); | ||
98 | let m = p.start(); | ||
99 | p.bump(); | ||
100 | |||
101 | type_(p); | ||
102 | let kind = match p.current() { | ||
103 | // test slice_type | ||
104 | // type T = [()]; | ||
105 | R_BRACK => { | ||
106 | p.bump(); | ||
107 | SLICE_TYPE | ||
108 | } | ||
109 | |||
110 | // test array_type | ||
111 | // type T = [(); 92]; | ||
112 | SEMI => { | ||
113 | p.bump(); | ||
114 | expressions::expr(p); | ||
115 | p.expect(R_BRACK); | ||
116 | ARRAY_TYPE | ||
117 | } | ||
118 | // test array_type_missing_semi | ||
119 | // type T = [() 92]; | ||
120 | _ => { | ||
121 | p.error("expected `;` or `]`"); | ||
122 | SLICE_TYPE | ||
123 | } | ||
124 | }; | ||
125 | m.complete(p, kind); | ||
126 | } | ||
127 | |||
128 | // test reference_type; | ||
129 | // type A = &(); | ||
130 | // type B = &'static (); | ||
131 | // type C = &mut (); | ||
132 | fn reference_type(p: &mut Parser) { | ||
133 | assert!(p.at(AMP)); | ||
134 | let m = p.start(); | ||
135 | p.bump(); | ||
136 | p.eat(LIFETIME); | ||
137 | p.eat(MUT_KW); | ||
138 | type_no_plus(p); | ||
139 | m.complete(p, REFERENCE_TYPE); | ||
140 | } | ||
141 | |||
142 | // test placeholder_type | ||
143 | // type Placeholder = _; | ||
144 | fn placeholder_type(p: &mut Parser) { | ||
145 | assert!(p.at(UNDERSCORE)); | ||
146 | let m = p.start(); | ||
147 | p.bump(); | ||
148 | m.complete(p, PLACEHOLDER_TYPE); | ||
149 | } | ||
150 | |||
151 | // test fn_pointer_type | ||
152 | // type A = fn(); | ||
153 | // type B = unsafe fn(); | ||
154 | // type C = unsafe extern "C" fn(); | ||
155 | fn fn_pointer_type(p: &mut Parser) { | ||
156 | let m = p.start(); | ||
157 | p.eat(UNSAFE_KW); | ||
158 | if p.at(EXTERN_KW) { | ||
159 | abi(p); | ||
160 | } | ||
161 | // test fn_pointer_type_missing_fn | ||
162 | // type F = unsafe (); | ||
163 | if !p.eat(FN_KW) { | ||
164 | m.abandon(p); | ||
165 | p.error("expected `fn`"); | ||
166 | return; | ||
167 | } | ||
168 | |||
169 | params::param_list_opt_patterns(p); | ||
170 | // test fn_pointer_type_with_ret | ||
171 | // type F = fn() -> (); | ||
172 | fn_ret_type(p); | ||
173 | m.complete(p, FN_POINTER_TYPE); | ||
174 | } | ||
175 | |||
176 | // test for_type | ||
177 | // type A = for<'a> fn() -> (); | ||
178 | fn for_type(p: &mut Parser) { | ||
179 | assert!(p.at(FOR_KW)); | ||
180 | let m = p.start(); | ||
181 | p.bump(); | ||
182 | type_params::type_param_list(p); | ||
183 | type_(p); | ||
184 | m.complete(p, FOR_TYPE); | ||
185 | } | ||
186 | |||
187 | // test impl_trait_type | ||
188 | // type A = impl Iterator<Item=Foo<'a>> + 'a; | ||
189 | fn impl_trait_type(p: &mut Parser) { | ||
190 | assert!(p.at(IMPL_KW)); | ||
191 | let m = p.start(); | ||
192 | p.bump(); | ||
193 | type_params::bounds_without_colon(p); | ||
194 | m.complete(p, IMPL_TRAIT_TYPE); | ||
195 | } | ||
196 | |||
197 | // test path_type | ||
198 | // type A = Foo; | ||
199 | // type B = ::Foo; | ||
200 | // type C = self::Foo; | ||
201 | // type D = super::Foo; | ||
202 | pub(super) fn path_type(p: &mut Parser) { | ||
203 | assert!(paths::is_path_start(p)); | ||
204 | let m = p.start(); | ||
205 | paths::type_path(p); | ||
206 | // test path_type_with_bounds | ||
207 | // fn foo() -> Box<T + 'f> {} | ||
208 | if p.eat(PLUS) { | ||
209 | type_params::bounds_without_colon(p); | ||
210 | } | ||
211 | m.complete(p, PATH_TYPE); | ||
212 | } | ||