Merge #31

31: Parse enums r=matklad a=matklad

Author: bors[bot]

grammar.ron

@@ -74,6 +74,8 @@ Grammar(
     nodes: [
         "FILE",
         "STRUCT_ITEM",
+        "ENUM_ITEM",
+        "ENUM_VARIANT",
         "NAMED_FIELD",
         "POS_FIELD",
         "FN_ITEM",

src/parser/event_parser/grammar/expressions.rs

@@ -12,3 +12,9 @@ pub(super) fn literal(p: &mut Parser) -> bool {
         _ => false,
     }
 }
+
+pub(super) fn expr(p: &mut Parser) {
+    if !literal(p) {
+        p.error().message("expected expression").emit();
+    }
+}

src/parser/event_parser/grammar/items/mod.rs

@@ -9,8 +9,9 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
     }
 }
 
-pub(super) const ITEM_FIRST: TokenSet =
-    token_set![EXTERN_KW, MOD_KW, USE_KW, STRUCT_KW, FN_KW, PUB_KW, POUND,];
+pub(super) const ITEM_FIRST: TokenSet = token_set![
+    EXTERN_KW, MOD_KW, USE_KW, STRUCT_KW, ENUM_KW, FN_KW, PUB_KW, POUND
+];
 
 fn item(p: &mut Parser) {
     let item = p.start();
@@ -34,6 +35,10 @@ fn item(p: &mut Parser) {
             structs::struct_item(p);
             STRUCT_ITEM
         }
+        ENUM_KW => {
+            structs::enum_item(p);
+            ENUM_ITEM
+        }
         FN_KW => {
             fn_item(p);
             FN_ITEM

src/parser/event_parser/grammar/items/structs.rs

@@ -40,6 +40,40 @@ pub(super) fn struct_item(p: &mut Parser) {
     }
 }
 
+pub(super) fn enum_item(p: &mut Parser) {
+    assert!(p.at(ENUM_KW));
+    p.bump();
+    p.expect(IDENT);
+    type_param_list(p);
+    where_clause(p);
+    if p.expect(L_CURLY) {
+        while !p.at(EOF) && !p.at(R_CURLY) {
+            let var = p.start();
+            attributes::outer_attributes(p);
+            if p.at(IDENT) {
+                p.bump();
+                match p.current() {
+                    L_CURLY => named_fields(p),
+                    L_PAREN => pos_fields(p),
+                    EQ => {
+                        p.bump();
+                        expressions::expr(p);
+                    }
+                    _ => (),
+                }
+                var.complete(p, ENUM_VARIANT);
+            } else {
+                var.abandon(p);
+                p.err_and_bump("expected enum variant");
+            }
+            if !p.at(R_CURLY) {
+                p.expect(COMMA);
+            }
+        }
+        p.expect(R_CURLY);
+    }
+}
+
 fn named_fields(p: &mut Parser) {
     assert!(p.at(L_CURLY));
     p.bump();

src/syntax_kinds.rs

@@ -76,6 +76,8 @@ pub enum SyntaxKind {
     SHEBANG,
     FILE,
     STRUCT_ITEM,
+    ENUM_ITEM,
+    ENUM_VARIANT,
     NAMED_FIELD,
     POS_FIELD,
     FN_ITEM,
@@ -176,6 +178,8 @@ impl SyntaxKind {
             SHEBANG => &SyntaxInfo { name: "SHEBANG" },
             FILE => &SyntaxInfo { name: "FILE" },
             STRUCT_ITEM => &SyntaxInfo { name: "STRUCT_ITEM" },
+            ENUM_ITEM => &SyntaxInfo { name: "ENUM_ITEM" },
+            ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" },
             NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" },
             POS_FIELD => &SyntaxInfo { name: "POS_FIELD" },
             FN_ITEM => &SyntaxInfo { name: "FN_ITEM" },

src/tree/mod.rs

@@ -106,7 +106,19 @@ impl<'f> Node<'f> {
 
 impl<'f> fmt::Debug for Node<'f> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{:?}@{:?}", self.kind(), self.range())
+        write!(fmt, "{:?}@{:?}", self.kind(), self.range())?;
+        if has_short_text(self.kind()) {
+            write!(fmt, " \"{}\"", self.text())?;
+        }
+        Ok(())
+    }
+}
+
+fn has_short_text(kind: SyntaxKind) -> bool {
+    use syntax_kinds::*;
+    match kind {
+        IDENT | LIFETIME => true,
+        _ => false,
     }
 }
 

tests/data/parser/err/0000_struct_field_missing_comma.txt

@@ -2,21 +2,21 @@ FILE@[0; 34)
   STRUCT_ITEM@[0; 34)
     STRUCT_KW@[0; 6)
     WHITESPACE@[6; 7)
-    IDENT@[7; 8)
+    IDENT@[7; 8) "S"
     WHITESPACE@[8; 9)
     L_CURLY@[9; 10)
     NAMED_FIELD@[10; 26)
       WHITESPACE@[10; 15)
-      IDENT@[15; 16)
+      IDENT@[15; 16) "a"
       COLON@[16; 17)
       WHITESPACE@[17; 18)
-      IDENT@[18; 21)
+      IDENT@[18; 21) "u32"
       WHITESPACE@[21; 26)
     err: `expected COMMA`
     NAMED_FIELD@[26; 33)
-      IDENT@[26; 27)
+      IDENT@[26; 27) "b"
       COLON@[27; 28)
       WHITESPACE@[28; 29)
-      IDENT@[29; 32)
+      IDENT@[29; 32) "u32"
       WHITESPACE@[32; 33)
     R_CURLY@[33; 34)

tests/data/parser/err/0001_item_recovery_in_file.txt

@@ -1,16 +1,16 @@
 FILE@[0; 21)
   ERROR@[0; 3)
   err: `expected item`
-    IDENT@[0; 2)
+    IDENT@[0; 2) "if"
     WHITESPACE@[2; 3)
   ERROR@[3; 10)
   err: `expected item`
-    IDENT@[3; 8)
+    IDENT@[3; 8) "match"
     WHITESPACE@[8; 10)
   STRUCT_ITEM@[10; 21)
     STRUCT_KW@[10; 16)
     WHITESPACE@[16; 17)
-    IDENT@[17; 18)
+    IDENT@[17; 18) "S"
     WHITESPACE@[18; 19)
     L_CURLY@[19; 20)
     R_CURLY@[20; 21)

tests/data/parser/err/0003_C++_semicolon.txt

@@ -2,22 +2,22 @@ FILE@[0; 40)
   STRUCT_ITEM@[0; 39)
     STRUCT_KW@[0; 6)
     WHITESPACE@[6; 7)
-    IDENT@[7; 8)
+    IDENT@[7; 8) "S"
     WHITESPACE@[8; 9)
     L_CURLY@[9; 10)
     NAMED_FIELD@[10; 21)
       WHITESPACE@[10; 15)
-      IDENT@[15; 16)
+      IDENT@[15; 16) "a"
       COLON@[16; 17)
       WHITESPACE@[17; 18)
-      IDENT@[18; 21)
+      IDENT@[18; 21) "i32"
     COMMA@[21; 22)
     NAMED_FIELD@[22; 36)
       WHITESPACE@[22; 27)
-      IDENT@[27; 28)
+      IDENT@[27; 28) "b"
       COLON@[28; 29)
       WHITESPACE@[29; 30)
-      IDENT@[30; 36)
+      IDENT@[30; 36) "String"
     COMMA@[36; 37)
     WHITESPACE@[37; 38)
     R_CURLY@[38; 39)

tests/data/parser/err/0004_use_path_bad_segment.txt

@@ -6,7 +6,7 @@ FILE@[0; 12)
         PATH@[3; 7)
           PATH_SEGMENT@[3; 7)
             WHITESPACE@[3; 4)
-            IDENT@[4; 7)
+            IDENT@[4; 7) "foo"
         COLONCOLON@[7; 9)
         PATH_SEGMENT@[9; 9)
         err: `expected identifier`