diff options
author | Aleksey Kladov <[email protected]> | 2018-01-28 14:46:30 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-01-28 18:18:24 +0000 |
commit | 7e55b2693f17afdae91c492c6f79c9ba4020d893 (patch) | |
tree | 1c639fbb06731440a2545b84f63de711296595e3 /src/parser/event_parser/grammar | |
parent | 08def60f16a222895b242d907163d914348894c7 (diff) |
Move struct parsing to a separate module
Diffstat (limited to 'src/parser/event_parser/grammar')
-rw-r--r-- | src/parser/event_parser/grammar/items/mod.rs (renamed from src/parser/event_parser/grammar/items.rs) | 86 | ||||
-rw-r--r-- | src/parser/event_parser/grammar/items/structs.rs | 83 |
2 files changed, 86 insertions, 83 deletions
diff --git a/src/parser/event_parser/grammar/items.rs b/src/parser/event_parser/grammar/items/mod.rs index 56e3208ac..867776415 100644 --- a/src/parser/event_parser/grammar/items.rs +++ b/src/parser/event_parser/grammar/items/mod.rs | |||
@@ -1,5 +1,7 @@ | |||
1 | use super::*; | 1 | use super::*; |
2 | 2 | ||
3 | mod structs; | ||
4 | |||
3 | pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { | 5 | pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { |
4 | attributes::inner_attributes(p); | 6 | attributes::inner_attributes(p); |
5 | while !p.at(EOF) && !(stop_on_r_curly && p.at(R_CURLY)) { | 7 | while !p.at(EOF) && !(stop_on_r_curly && p.at(R_CURLY)) { |
@@ -29,7 +31,7 @@ fn item(p: &mut Parser) { | |||
29 | USE_ITEM | 31 | USE_ITEM |
30 | } | 32 | } |
31 | STRUCT_KW => { | 33 | STRUCT_KW => { |
32 | struct_item(p); | 34 | structs::struct_item(p); |
33 | STRUCT_ITEM | 35 | STRUCT_ITEM |
34 | } | 36 | } |
35 | FN_KW => { | 37 | FN_KW => { |
@@ -57,88 +59,6 @@ fn item(p: &mut Parser) { | |||
57 | item.complete(p, item_kind); | 59 | item.complete(p, item_kind); |
58 | } | 60 | } |
59 | 61 | ||
60 | fn struct_item(p: &mut Parser) { | ||
61 | assert!(p.at(STRUCT_KW)); | ||
62 | p.bump(); | ||
63 | |||
64 | if !p.expect(IDENT) { | ||
65 | return; | ||
66 | } | ||
67 | generic_parameters(p); | ||
68 | match p.current() { | ||
69 | WHERE_KW => { | ||
70 | where_clause(p); | ||
71 | match p.current() { | ||
72 | SEMI => { | ||
73 | p.bump(); | ||
74 | return; | ||
75 | } | ||
76 | L_CURLY => named_fields(p), | ||
77 | _ => { | ||
78 | //TODO: special case `(` error message | ||
79 | p.error().message("expected `;` or `{`").emit(); | ||
80 | return; | ||
81 | } | ||
82 | } | ||
83 | } | ||
84 | SEMI => { | ||
85 | p.bump(); | ||
86 | return; | ||
87 | } | ||
88 | L_CURLY => named_fields(p), | ||
89 | L_PAREN => { | ||
90 | pos_fields(p); | ||
91 | p.expect(SEMI); | ||
92 | } | ||
93 | _ => { | ||
94 | p.error().message("expected `;`, `{`, or `(`").emit(); | ||
95 | return; | ||
96 | } | ||
97 | } | ||
98 | } | ||
99 | |||
100 | fn named_fields(p: &mut Parser) { | ||
101 | assert!(p.at(L_CURLY)); | ||
102 | p.bump(); | ||
103 | while !p.at(R_CURLY) && !p.at(EOF) { | ||
104 | named_field(p); | ||
105 | if !p.at(R_CURLY) { | ||
106 | p.expect(COMMA); | ||
107 | } | ||
108 | } | ||
109 | p.expect(R_CURLY); | ||
110 | |||
111 | fn named_field(p: &mut Parser) { | ||
112 | let field = p.start(); | ||
113 | visibility(p); | ||
114 | if p.expect(IDENT) { | ||
115 | p.expect(COLON); | ||
116 | types::type_ref(p); | ||
117 | field.complete(p, NAMED_FIELD); | ||
118 | } else { | ||
119 | field.abandon(p); | ||
120 | p.err_and_bump("expected field declaration"); | ||
121 | } | ||
122 | } | ||
123 | } | ||
124 | |||
125 | fn pos_fields(p: &mut Parser) { | ||
126 | if !p.expect(L_PAREN) { | ||
127 | return; | ||
128 | } | ||
129 | while !p.at(R_PAREN) && !p.at(EOF) { | ||
130 | let pos_field = p.start(); | ||
131 | visibility(p); | ||
132 | types::type_ref(p); | ||
133 | pos_field.complete(p, POS_FIELD); | ||
134 | |||
135 | if !p.at(R_PAREN) { | ||
136 | p.expect(COMMA); | ||
137 | } | ||
138 | } | ||
139 | p.expect(R_PAREN); | ||
140 | } | ||
141 | |||
142 | fn generic_parameters(_: &mut Parser) {} | 62 | fn generic_parameters(_: &mut Parser) {} |
143 | 63 | ||
144 | fn where_clause(_: &mut Parser) {} | 64 | fn where_clause(_: &mut Parser) {} |
diff --git a/src/parser/event_parser/grammar/items/structs.rs b/src/parser/event_parser/grammar/items/structs.rs new file mode 100644 index 000000000..b31cf18df --- /dev/null +++ b/src/parser/event_parser/grammar/items/structs.rs | |||
@@ -0,0 +1,83 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn struct_item(p: &mut Parser) { | ||
4 | assert!(p.at(STRUCT_KW)); | ||
5 | p.bump(); | ||
6 | |||
7 | if !p.expect(IDENT) { | ||
8 | return; | ||
9 | } | ||
10 | generic_parameters(p); | ||
11 | match p.current() { | ||
12 | WHERE_KW => { | ||
13 | where_clause(p); | ||
14 | match p.current() { | ||
15 | SEMI => { | ||
16 | p.bump(); | ||
17 | return; | ||
18 | } | ||
19 | L_CURLY => named_fields(p), | ||
20 | _ => { | ||
21 | //TODO: special case `(` error message | ||
22 | p.error().message("expected `;` or `{`").emit(); | ||
23 | return; | ||
24 | } | ||
25 | } | ||
26 | } | ||
27 | SEMI => { | ||
28 | p.bump(); | ||
29 | return; | ||
30 | } | ||
31 | L_CURLY => named_fields(p), | ||
32 | L_PAREN => { | ||
33 | pos_fields(p); | ||
34 | p.expect(SEMI); | ||
35 | } | ||
36 | _ => { | ||
37 | p.error().message("expected `;`, `{`, or `(`").emit(); | ||
38 | return; | ||
39 | } | ||
40 | } | ||
41 | } | ||
42 | |||
43 | fn named_fields(p: &mut Parser) { | ||
44 | assert!(p.at(L_CURLY)); | ||
45 | p.bump(); | ||
46 | while !p.at(R_CURLY) && !p.at(EOF) { | ||
47 | named_field(p); | ||
48 | if !p.at(R_CURLY) { | ||
49 | p.expect(COMMA); | ||
50 | } | ||
51 | } | ||
52 | p.expect(R_CURLY); | ||
53 | |||
54 | fn named_field(p: &mut Parser) { | ||
55 | let field = p.start(); | ||
56 | visibility(p); | ||
57 | if p.expect(IDENT) { | ||
58 | p.expect(COLON); | ||
59 | types::type_ref(p); | ||
60 | field.complete(p, NAMED_FIELD); | ||
61 | } else { | ||
62 | field.abandon(p); | ||
63 | p.err_and_bump("expected field declaration"); | ||
64 | } | ||
65 | } | ||
66 | } | ||
67 | |||
68 | fn pos_fields(p: &mut Parser) { | ||
69 | if !p.expect(L_PAREN) { | ||
70 | return; | ||
71 | } | ||
72 | while !p.at(R_PAREN) && !p.at(EOF) { | ||
73 | let pos_field = p.start(); | ||
74 | visibility(p); | ||
75 | types::type_ref(p); | ||
76 | pos_field.complete(p, POS_FIELD); | ||
77 | |||
78 | if !p.at(R_PAREN) { | ||
79 | p.expect(COMMA); | ||
80 | } | ||
81 | } | ||
82 | p.expect(R_PAREN); | ||
83 | } | ||