6 files changed, 36 insertions, 14 deletions

diff --git a/src/parser/grammar/items/consts.rs b/src/parser/grammar/items/consts.rs
index c9881d681..8117af706 100644
--- a/src/parser/grammar/items/consts.rs
+++ b/src/parser/grammar/items/consts.rs
@@ -12,7 +12,7 @@ fn const_or_static(p: &mut Parser, kw: SyntaxKind) {
     assert!(p.at(kw));
     p.bump();
     p.eat(MUT_KW); // TODO: validator to forbid const mut
-    p.expect(IDENT);
+    name(p);
     p.expect(COLON);
     types::type_ref(p);
     p.expect(EQ);
diff --git a/src/parser/grammar/items/mod.rs b/src/parser/grammar/items/mod.rs
index ffe86fa97..8bb821fb6 100644
--- a/src/parser/grammar/items/mod.rs
+++ b/src/parser/grammar/items/mod.rs
@@ -196,8 +196,9 @@ fn extern_crate_item(p: &mut Parser) {
     p.bump();
     assert!(p.at(CRATE_KW));
     p.bump();
-
-    p.expect(IDENT) && alias(p) && p.expect(SEMI);
+    name(p);
+    alias(p);
+    p.expect(SEMI);
 }
 
 fn extern_block(p: &mut Parser) {
@@ -210,7 +211,7 @@ fn fn_item(p: &mut Parser) {
     assert!(p.at(FN_KW));
     p.bump();
 
-    p.expect(IDENT);
+    name(p);
     if p.at(L_PAREN) {
         fn_value_parameters(p);
     } else {
@@ -235,7 +236,7 @@ fn type_item(p: &mut Parser) {
     assert!(p.at(TYPE_KW));
     p.bump();
 
-    p.expect(IDENT);
+    name(p);
 
     // test type_item_type_params
     // type Result<T> = ();
@@ -254,7 +255,8 @@ fn mod_item(p: &mut Parser) {
     assert!(p.at(MOD_KW));
     p.bump();
 
-    if p.expect(IDENT) && !p.eat(SEMI) {
+    name(p);
+    if !p.eat(SEMI) {
         if p.expect(L_CURLY) {
             mod_contents(p, true);
             p.expect(R_CURLY);
diff --git a/src/parser/grammar/items/structs.rs b/src/parser/grammar/items/structs.rs
index 640b940e4..eca0d2e64 100644
--- a/src/parser/grammar/items/structs.rs
+++ b/src/parser/grammar/items/structs.rs
@@ -4,9 +4,7 @@ pub(super) fn struct_item(p: &mut Parser) {
     assert!(p.at(STRUCT_KW));
     p.bump();
 
-    if !p.expect(IDENT) {
-        return;
-    }
+    name(p);
     type_params::list(p);
     match p.current() {
         WHERE_KW => {
@@ -43,7 +41,7 @@ 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);
+    name(p);
     type_params::list(p);
     type_params::where_clause(p);
     if p.expect(L_CURLY) {
@@ -88,7 +86,8 @@ fn named_fields(p: &mut Parser) {
     fn named_field(p: &mut Parser) {
         let field = p.start();
         visibility(p);
-        if p.expect(IDENT) {
+        if p.at(IDENT) {
+            name(p);
             p.expect(COLON);
             types::type_ref(p);
             field.complete(p, NAMED_FIELD);
diff --git a/src/parser/grammar/items/traits.rs b/src/parser/grammar/items/traits.rs
index 3bef9639f..9961a88fe 100644
--- a/src/parser/grammar/items/traits.rs
+++ b/src/parser/grammar/items/traits.rs
@@ -3,7 +3,7 @@ use super::*;
 pub(super) fn trait_item(p: &mut Parser) {
     assert!(p.at(TRAIT_KW));
     p.bump();
-    p.expect(IDENT);
+    name(p);
     p.expect(L_CURLY);
     p.expect(R_CURLY);
 }
diff --git a/src/parser/grammar/mod.rs b/src/parser/grammar/mod.rs
index b949583ff..abf9fe86c 100644
--- a/src/parser/grammar/mod.rs
+++ b/src/parser/grammar/mod.rs
@@ -44,12 +44,32 @@ fn alias(p: &mut Parser) -> bool {
     if p.at(AS_KW) {
         let alias = p.start();
         p.bump();
-        p.expect(IDENT);
+        name(p);
         alias.complete(p, ALIAS);
     }
     true //FIXME: return false if three are errors
 }
 
+fn name(p: &mut Parser) {
+    if p.at(IDENT) {
+        let m = p.start();
+        p.bump();
+        m.complete(p, NAME);
+    } else {
+        p.error("expected a name");
+    }
+}
+
+fn name_ref(p: &mut Parser) {
+    if p.at(IDENT) {
+        let m = p.start();
+        p.bump();
+        m.complete(p, NAME_REF);
+    } else {
+        p.error("expected identifier");
+    }
+}
+
 fn error_block(p: &mut Parser, message: &str) {
     assert!(p.at(L_CURLY));
     let err = p.start();
diff --git a/src/parser/grammar/paths.rs b/src/parser/grammar/paths.rs
index a7fc90774..6ed315c3d 100644
--- a/src/parser/grammar/paths.rs
+++ b/src/parser/grammar/paths.rs
@@ -42,7 +42,8 @@ fn path_segment(p: &mut Parser, first: bool) {
         p.eat(COLONCOLON);
     }
     match p.current() {
-        IDENT | SELF_KW | SUPER_KW => p.bump(),
+        IDENT => name_ref(p),
+        SELF_KW | SUPER_KW => p.bump(),
         _ => {
             p.error("expected identifier");
         }