rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix block structure in enums

Browse Source
This commit is contained in:
Aleksey Kladov
2018-09-08 10:55:09 +03:00
parent 749907d330
commit f48b9d9be7
5 changed files with 274 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/libsyntax2/src/grammar/items/mod.rs
View File

@@ -1,11 +1,11 @@
mod consts;
mod structs;
mod nominal;
mod traits;
mod use_item;
use super::*;
pub(crate) use self::structs::named_field_def_list;
pub(crate) use self::nominal::named_field_def_list;
// test mod_contents
// fn foo() {}
@@ -176,7 +176,7 @@ fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> {
MODULE
}
STRUCT_KW => {
structs::struct_def(p);
nominal::struct_def(p);
if p.at(SEMI) {
p.err_and_bump(
"expected item, found `;`\n\
@@ -186,7 +186,7 @@ fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> {
STRUCT_DEF
}
ENUM_KW => {
structs::enum_def(p);
nominal::enum_def(p);
ENUM_DEF
}
USE_KW => {

13
crates/libsyntax2/src/grammar/items/structs.rs → crates/libsyntax2/src/grammar/items/nominal.rs
View File

@@ -91,6 +91,10 @@ pub(crate) fn named_field_def_list(p: &mut Parser) {
let m = p.start();
p.bump();
while !p.at(R_CURLY) && !p.at(EOF) {
if p.at(L_CURLY) {
error_block(p, "expected field");
continue;
}
named_field_def(p);
if !p.at(R_CURLY) {
p.expect(COMMA);
@@ -127,10 +131,15 @@ fn pos_field_list(p: &mut Parser) {
return;
}
while !p.at(R_PAREN) && !p.at(EOF) {
let pos_field = p.start();
let m = p.start();
opt_visibility(p);
if !p.at_ts(types::TYPE_FIRST) {
p.error("expected a type");
m.complete(p, ERROR);
break;
}
types::type_(p);
pos_field.complete(p, POS_FIELD);
m.complete(p, POS_FIELD);
if !p.at(R_PAREN) {
p.expect(COMMA);