From 1544e89c49c67df00fc72d841f3e39be792cbe2b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 9 Jan 2018 22:35:55 +0300 Subject: G: mod item --- src/parser/event_parser/grammar/items.rs | 21 +++-- src/parser/event_parser/grammar/mod.rs | 3 +- src/syntax_kinds.rs | 127 ++++++++++++++++--------------- 3 files changed, 83 insertions(+), 68 deletions(-) (limited to 'src') diff --git a/src/parser/event_parser/grammar/items.rs b/src/parser/event_parser/grammar/items.rs index 9b174679c..e775db14b 100644 --- a/src/parser/event_parser/grammar/items.rs +++ b/src/parser/event_parser/grammar/items.rs @@ -1,9 +1,10 @@ use super::*; -pub(super) fn mod_items(p: &mut Parser) { +pub(super) fn mod_contents(p: &mut Parser) { + attributes::inner_attributes(p); many(p, |p| { skip_to_first( - p, item_first, mod_item, + p, item_first, mod_contents_item, "expected item", ) }); @@ -11,12 +12,12 @@ pub(super) fn mod_items(p: &mut Parser) { fn item_first(p: &Parser) -> bool { match p.current() { - STRUCT_KW | FN_KW | EXTERN_KW => true, + STRUCT_KW | FN_KW | EXTERN_KW | MOD_KW => true, _ => false, } } -fn mod_item(p: &mut Parser) { +fn mod_contents_item(p: &mut Parser) { if item(p) { if p.current() == SEMI { node(p, ERROR, |p| { @@ -39,9 +40,9 @@ fn item(p: &mut Parser) -> bool { // || node_if(p, CONST_KW, CONST_ITEM, const_item) or const FN! // || unsafe trait, impl // || node_if(p, FN_KW, FN_ITEM, fn_item) - // || node_if(p, MOD_KW, MOD_ITEM, mod_item) // || node_if(p, TYPE_KW, TYPE_ITEM, type_item) node_if(p, [EXTERN_KW, CRATE_KW], EXTERN_CRATE_ITEM, extern_crate_item) + || node_if(p, MOD_KW, MOD_ITEM, mod_item) || node_if(p, STRUCT_KW, STRUCT_ITEM, struct_item) || node_if(p, FN_KW, FN_ITEM, fn_item) } @@ -55,6 +56,16 @@ fn extern_crate_item(p: &mut Parser) { p.expect(IDENT) && alias(p) && p.expect(SEMI); } +fn mod_item(p: &mut Parser) { + if !p.expect(IDENT) { + return; + } + if p.eat(SEMI) { + return; + } + p.curly_block(mod_contents); +} + fn struct_field(p: &mut Parser) -> bool { node_if(p, IDENT, STRUCT_FIELD, |p| { p.expect(COLON) && p.expect(IDENT); diff --git a/src/parser/event_parser/grammar/mod.rs b/src/parser/event_parser/grammar/mod.rs index dd1270eae..6d1cd7ec3 100644 --- a/src/parser/event_parser/grammar/mod.rs +++ b/src/parser/event_parser/grammar/mod.rs @@ -10,8 +10,7 @@ mod expressions; pub(crate) fn file(p: &mut Parser) { node(p, FILE, |p| { p.optional(SHEBANG); - attributes::inner_attributes(p); - items::mod_items(p); + items::mod_contents(p); }) } diff --git a/src/syntax_kinds.rs b/src/syntax_kinds.rs index 6db82051e..26838d2d8 100644 --- a/src/syntax_kinds.rs +++ b/src/syntax_kinds.rs @@ -12,68 +12,70 @@ pub const FALSE_KW: SyntaxKind = SyntaxKind(7); pub const AS_KW: SyntaxKind = SyntaxKind(8); pub const EXTERN_KW: SyntaxKind = SyntaxKind(9); pub const CRATE_KW: SyntaxKind = SyntaxKind(10); -pub const ERROR: SyntaxKind = SyntaxKind(11); -pub const IDENT: SyntaxKind = SyntaxKind(12); -pub const UNDERSCORE: SyntaxKind = SyntaxKind(13); -pub const WHITESPACE: SyntaxKind = SyntaxKind(14); -pub const INT_NUMBER: SyntaxKind = SyntaxKind(15); -pub const FLOAT_NUMBER: SyntaxKind = SyntaxKind(16); -pub const SEMI: SyntaxKind = SyntaxKind(17); -pub const COMMA: SyntaxKind = SyntaxKind(18); -pub const DOT: SyntaxKind = SyntaxKind(19); -pub const DOTDOT: SyntaxKind = SyntaxKind(20); -pub const DOTDOTDOT: SyntaxKind = SyntaxKind(21); -pub const DOTDOTEQ: SyntaxKind = SyntaxKind(22); -pub const L_PAREN: SyntaxKind = SyntaxKind(23); -pub const R_PAREN: SyntaxKind = SyntaxKind(24); -pub const L_CURLY: SyntaxKind = SyntaxKind(25); -pub const R_CURLY: SyntaxKind = SyntaxKind(26); -pub const L_BRACK: SyntaxKind = SyntaxKind(27); -pub const R_BRACK: SyntaxKind = SyntaxKind(28); -pub const L_ANGLE: SyntaxKind = SyntaxKind(29); -pub const R_ANGLE: SyntaxKind = SyntaxKind(30); -pub const AT: SyntaxKind = SyntaxKind(31); -pub const POUND: SyntaxKind = SyntaxKind(32); -pub const TILDE: SyntaxKind = SyntaxKind(33); -pub const QUESTION: SyntaxKind = SyntaxKind(34); -pub const COLON: SyntaxKind = SyntaxKind(35); -pub const COLONCOLON: SyntaxKind = SyntaxKind(36); -pub const DOLLAR: SyntaxKind = SyntaxKind(37); -pub const EQ: SyntaxKind = SyntaxKind(38); -pub const EQEQ: SyntaxKind = SyntaxKind(39); -pub const FAT_ARROW: SyntaxKind = SyntaxKind(40); -pub const NEQ: SyntaxKind = SyntaxKind(41); -pub const EXCL: SyntaxKind = SyntaxKind(42); -pub const LIFETIME: SyntaxKind = SyntaxKind(43); -pub const CHAR: SyntaxKind = SyntaxKind(44); -pub const BYTE: SyntaxKind = SyntaxKind(45); -pub const STRING: SyntaxKind = SyntaxKind(46); -pub const RAW_STRING: SyntaxKind = SyntaxKind(47); -pub const BYTE_STRING: SyntaxKind = SyntaxKind(48); -pub const RAW_BYTE_STRING: SyntaxKind = SyntaxKind(49); -pub const PLUS: SyntaxKind = SyntaxKind(50); -pub const MINUS: SyntaxKind = SyntaxKind(51); -pub const STAR: SyntaxKind = SyntaxKind(52); -pub const SLASH: SyntaxKind = SyntaxKind(53); -pub const CARET: SyntaxKind = SyntaxKind(54); -pub const PERCENT: SyntaxKind = SyntaxKind(55); -pub const AMPERSAND: SyntaxKind = SyntaxKind(56); -pub const PIPE: SyntaxKind = SyntaxKind(57); -pub const THIN_ARROW: SyntaxKind = SyntaxKind(58); -pub const COMMENT: SyntaxKind = SyntaxKind(59); -pub const DOC_COMMENT: SyntaxKind = SyntaxKind(60); -pub const SHEBANG: SyntaxKind = SyntaxKind(61); -pub const FILE: SyntaxKind = SyntaxKind(62); -pub const STRUCT_ITEM: SyntaxKind = SyntaxKind(63); -pub const STRUCT_FIELD: SyntaxKind = SyntaxKind(64); -pub const FN_ITEM: SyntaxKind = SyntaxKind(65); -pub const EXTERN_CRATE_ITEM: SyntaxKind = SyntaxKind(66); -pub const ATTR: SyntaxKind = SyntaxKind(67); -pub const META_ITEM: SyntaxKind = SyntaxKind(68); -pub const LITERAL: SyntaxKind = SyntaxKind(69); -pub const ALIAS: SyntaxKind = SyntaxKind(70); +pub const MOD_KW: SyntaxKind = SyntaxKind(11); +pub const ERROR: SyntaxKind = SyntaxKind(12); +pub const IDENT: SyntaxKind = SyntaxKind(13); +pub const UNDERSCORE: SyntaxKind = SyntaxKind(14); +pub const WHITESPACE: SyntaxKind = SyntaxKind(15); +pub const INT_NUMBER: SyntaxKind = SyntaxKind(16); +pub const FLOAT_NUMBER: SyntaxKind = SyntaxKind(17); +pub const SEMI: SyntaxKind = SyntaxKind(18); +pub const COMMA: SyntaxKind = SyntaxKind(19); +pub const DOT: SyntaxKind = SyntaxKind(20); +pub const DOTDOT: SyntaxKind = SyntaxKind(21); +pub const DOTDOTDOT: SyntaxKind = SyntaxKind(22); +pub const DOTDOTEQ: SyntaxKind = SyntaxKind(23); +pub const L_PAREN: SyntaxKind = SyntaxKind(24); +pub const R_PAREN: SyntaxKind = SyntaxKind(25); +pub const L_CURLY: SyntaxKind = SyntaxKind(26); +pub const R_CURLY: SyntaxKind = SyntaxKind(27); +pub const L_BRACK: SyntaxKind = SyntaxKind(28); +pub const R_BRACK: SyntaxKind = SyntaxKind(29); +pub const L_ANGLE: SyntaxKind = SyntaxKind(30); +pub const R_ANGLE: SyntaxKind = SyntaxKind(31); +pub const AT: SyntaxKind = SyntaxKind(32); +pub const POUND: SyntaxKind = SyntaxKind(33); +pub const TILDE: SyntaxKind = SyntaxKind(34); +pub const QUESTION: SyntaxKind = SyntaxKind(35); +pub const COLON: SyntaxKind = SyntaxKind(36); +pub const COLONCOLON: SyntaxKind = SyntaxKind(37); +pub const DOLLAR: SyntaxKind = SyntaxKind(38); +pub const EQ: SyntaxKind = SyntaxKind(39); +pub const EQEQ: SyntaxKind = SyntaxKind(40); +pub const FAT_ARROW: SyntaxKind = SyntaxKind(41); +pub const NEQ: SyntaxKind = SyntaxKind(42); +pub const EXCL: SyntaxKind = SyntaxKind(43); +pub const LIFETIME: SyntaxKind = SyntaxKind(44); +pub const CHAR: SyntaxKind = SyntaxKind(45); +pub const BYTE: SyntaxKind = SyntaxKind(46); +pub const STRING: SyntaxKind = SyntaxKind(47); +pub const RAW_STRING: SyntaxKind = SyntaxKind(48); +pub const BYTE_STRING: SyntaxKind = SyntaxKind(49); +pub const RAW_BYTE_STRING: SyntaxKind = SyntaxKind(50); +pub const PLUS: SyntaxKind = SyntaxKind(51); +pub const MINUS: SyntaxKind = SyntaxKind(52); +pub const STAR: SyntaxKind = SyntaxKind(53); +pub const SLASH: SyntaxKind = SyntaxKind(54); +pub const CARET: SyntaxKind = SyntaxKind(55); +pub const PERCENT: SyntaxKind = SyntaxKind(56); +pub const AMPERSAND: SyntaxKind = SyntaxKind(57); +pub const PIPE: SyntaxKind = SyntaxKind(58); +pub const THIN_ARROW: SyntaxKind = SyntaxKind(59); +pub const COMMENT: SyntaxKind = SyntaxKind(60); +pub const DOC_COMMENT: SyntaxKind = SyntaxKind(61); +pub const SHEBANG: SyntaxKind = SyntaxKind(62); +pub const FILE: SyntaxKind = SyntaxKind(63); +pub const STRUCT_ITEM: SyntaxKind = SyntaxKind(64); +pub const STRUCT_FIELD: SyntaxKind = SyntaxKind(65); +pub const FN_ITEM: SyntaxKind = SyntaxKind(66); +pub const EXTERN_CRATE_ITEM: SyntaxKind = SyntaxKind(67); +pub const ATTR: SyntaxKind = SyntaxKind(68); +pub const META_ITEM: SyntaxKind = SyntaxKind(69); +pub const MOD_ITEM: SyntaxKind = SyntaxKind(70); +pub const LITERAL: SyntaxKind = SyntaxKind(71); +pub const ALIAS: SyntaxKind = SyntaxKind(72); -static INFOS: [SyntaxInfo; 71] = [ +static INFOS: [SyntaxInfo; 73] = [ SyntaxInfo { name: "USE_KW" }, SyntaxInfo { name: "FN_KW" }, SyntaxInfo { name: "STRUCT_KW" }, @@ -85,6 +87,7 @@ static INFOS: [SyntaxInfo; 71] = [ SyntaxInfo { name: "AS_KW" }, SyntaxInfo { name: "EXTERN_KW" }, SyntaxInfo { name: "CRATE_KW" }, + SyntaxInfo { name: "MOD_KW" }, SyntaxInfo { name: "ERROR" }, SyntaxInfo { name: "IDENT" }, SyntaxInfo { name: "UNDERSCORE" }, @@ -143,6 +146,7 @@ static INFOS: [SyntaxInfo; 71] = [ SyntaxInfo { name: "EXTERN_CRATE_ITEM" }, SyntaxInfo { name: "ATTR" }, SyntaxInfo { name: "META_ITEM" }, + SyntaxInfo { name: "MOD_ITEM" }, SyntaxInfo { name: "LITERAL" }, SyntaxInfo { name: "ALIAS" }, ]; @@ -164,6 +168,7 @@ pub(crate) fn ident_to_keyword(ident: &str) -> Option { "as" => Some(AS_KW), "extern" => Some(EXTERN_KW), "crate" => Some(CRATE_KW), + "mod" => Some(MOD_KW), _ => None, } } -- cgit v1.2.3