From 5222b8aba3b1c2c68706aacf6869423a8e4fe6d5 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 20 Feb 2019 15:47:32 +0300
Subject: move all parsing related bits to a separate module

---
 crates/ra_syntax/src/grammar/items/nominal.rs | 168 --------------------------
 1 file changed, 168 deletions(-)
 delete mode 100644 crates/ra_syntax/src/grammar/items/nominal.rs

(limited to 'crates/ra_syntax/src/grammar/items/nominal.rs')

diff --git a/crates/ra_syntax/src/grammar/items/nominal.rs b/crates/ra_syntax/src/grammar/items/nominal.rs
deleted file mode 100644
index ff9b38f9c..000000000
--- a/crates/ra_syntax/src/grammar/items/nominal.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use super::*;
-
-pub(super) fn struct_def(p: &mut Parser, kind: SyntaxKind) {
-    assert!(p.at(STRUCT_KW) || p.at_contextual_kw("union"));
-    p.bump_remap(kind);
-
-    name_r(p, ITEM_RECOVERY_SET);
-    type_params::opt_type_param_list(p);
-    match p.current() {
-        WHERE_KW => {
-            type_params::opt_where_clause(p);
-            match p.current() {
-                SEMI => {
-                    p.bump();
-                    return;
-                }
-                L_CURLY => named_field_def_list(p),
-                _ => {
-                    //TODO: special case `(` error message
-                    p.error("expected `;` or `{`");
-                    return;
-                }
-            }
-        }
-        SEMI if kind == STRUCT_KW => {
-            p.bump();
-            return;
-        }
-        L_CURLY => named_field_def_list(p),
-        L_PAREN if kind == STRUCT_KW => {
-            pos_field_def_list(p);
-            // test tuple_struct_where
-            // struct Test<T>(T) where T: Clone;
-            // struct Test<T>(T);
-            type_params::opt_where_clause(p);
-            p.expect(SEMI);
-        }
-        _ if kind == STRUCT_KW => {
-            p.error("expected `;`, `{`, or `(`");
-            return;
-        }
-        _ => {
-            p.error("expected `{`");
-            return;
-        }
-    }
-}
-
-pub(super) fn enum_def(p: &mut Parser) {
-    assert!(p.at(ENUM_KW));
-    p.bump();
-    name_r(p, ITEM_RECOVERY_SET);
-    type_params::opt_type_param_list(p);
-    type_params::opt_where_clause(p);
-    if p.at(L_CURLY) {
-        enum_variant_list(p);
-    } else {
-        p.error("expected `{`")
-    }
-}
-
-pub(crate) fn enum_variant_list(p: &mut Parser) {
-    assert!(p.at(L_CURLY));
-    let m = p.start();
-    p.bump();
-    while !p.at(EOF) && !p.at(R_CURLY) {
-        if p.at(L_CURLY) {
-            error_block(p, "expected enum variant");
-            continue;
-        }
-        let var = p.start();
-        attributes::outer_attributes(p);
-        if p.at(IDENT) {
-            name(p);
-            match p.current() {
-                L_CURLY => named_field_def_list(p),
-                L_PAREN => pos_field_def_list(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);
-    m.complete(p, ENUM_VARIANT_LIST);
-}
-
-pub(crate) fn named_field_def_list(p: &mut Parser) {
-    assert!(p.at(L_CURLY));
-    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);
-        }
-    }
-    p.expect(R_CURLY);
-    m.complete(p, NAMED_FIELD_DEF_LIST);
-
-    fn named_field_def(p: &mut Parser) {
-        let m = p.start();
-        // test field_attrs
-        // struct S {
-        //     #[serde(with = "url_serde")]
-        //     pub uri: Uri,
-        // }
-        attributes::outer_attributes(p);
-        opt_visibility(p);
-        if p.at(IDENT) {
-            name(p);
-            p.expect(COLON);
-            types::type_(p);
-            m.complete(p, NAMED_FIELD_DEF);
-        } else {
-            m.abandon(p);
-            p.err_and_bump("expected field declaration");
-        }
-    }
-}
-
-fn pos_field_def_list(p: &mut Parser) {
-    assert!(p.at(L_PAREN));
-    let m = p.start();
-    if !p.expect(L_PAREN) {
-        return;
-    }
-    while !p.at(R_PAREN) && !p.at(EOF) {
-        let m = p.start();
-        // test pos_field_attrs
-        // struct S (
-        //     #[serde(with = "url_serde")]
-        //     pub Uri,
-        // );
-        //
-        // enum S {
-        //     Uri(#[serde(with = "url_serde")] Uri),
-        // }
-        attributes::outer_attributes(p);
-        opt_visibility(p);
-        if !p.at_ts(types::TYPE_FIRST) {
-            p.error("expected a type");
-            m.complete(p, ERROR);
-            break;
-        }
-        types::type_(p);
-        m.complete(p, POS_FIELD_DEF);
-
-        if !p.at(R_PAREN) {
-            p.expect(COMMA);
-        }
-    }
-    p.expect(R_PAREN);
-    m.complete(p, POS_FIELD_DEF_LIST);
-}
-- 
cgit v1.2.3