From cb863390f23bc2eac6561d55def9bd3ba54605fc Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Fri, 15 Jan 2021 18:57:32 +0100 Subject: Handle self/super/crate in PathSegment as NameRef --- .../syntax/test_data/parser/err/0018_incomplete_fn.rast | 6 ++++-- crates/syntax/test_data/parser/err/0035_use_recover.rast | 3 ++- .../parser/err/0040_illegal_crate_kw_location.rast | 15 ++++++++++----- .../parser/err/0041_illegal_super_keyword_location.rast | 15 ++++++++++----- .../parser/err/0042_illegal_self_keyword_location.rast | 6 ++++-- 5 files changed, 30 insertions(+), 15 deletions(-) (limited to 'crates/syntax/test_data/parser/err') diff --git a/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast index 72939fc98..060f47dc4 100644 --- a/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast @@ -49,7 +49,8 @@ SOURCE_FILE@0..183 PATH_EXPR@67..71 PATH@67..71 PATH_SEGMENT@67..71 - SELF_KW@67..71 "self" + NAME_REF@67..71 + SELF_KW@67..71 "self" DOT@71..72 "." NAME_REF@72..78 IDENT@72..78 "scopes" @@ -66,7 +67,8 @@ SOURCE_FILE@0..183 PATH_EXPR@94..98 PATH@94..98 PATH_SEGMENT@94..98 - SELF_KW@94..98 "self" + NAME_REF@94..98 + SELF_KW@94..98 "self" DOT@98..99 "." NAME_REF@99..105 IDENT@99..105 "scopes" diff --git a/crates/syntax/test_data/parser/err/0035_use_recover.rast b/crates/syntax/test_data/parser/err/0035_use_recover.rast index 2f03709eb..a95151bc5 100644 --- a/crates/syntax/test_data/parser/err/0035_use_recover.rast +++ b/crates/syntax/test_data/parser/err/0035_use_recover.rast @@ -24,7 +24,8 @@ SOURCE_FILE@0..48 PATH@22..32 PATH@22..27 PATH_SEGMENT@22..27 - CRATE_KW@22..27 "crate" + NAME_REF@22..27 + CRATE_KW@22..27 "crate" COLON2@27..29 "::" PATH_SEGMENT@29..32 NAME_REF@29..32 diff --git a/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast index 284c8715b..7449b5ddf 100644 --- a/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast +++ b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast @@ -6,7 +6,8 @@ SOURCE_FILE@0..98 PATH@4..11 PATH_SEGMENT@4..11 COLON2@4..6 "::" - CRATE_KW@6..11 "crate" + NAME_REF@6..11 + CRATE_KW@6..11 "crate" SEMICOLON@11..12 ";" WHITESPACE@12..13 "\n" USE@13..54 @@ -18,7 +19,8 @@ SOURCE_FILE@0..98 USE_TREE@18..23 PATH@18..23 PATH_SEGMENT@18..23 - CRATE_KW@18..23 "crate" + NAME_REF@18..23 + CRATE_KW@18..23 "crate" COMMA@23..24 "," WHITESPACE@24..25 " " USE_TREE@25..52 @@ -35,7 +37,8 @@ SOURCE_FILE@0..98 PATH@31..41 PATH@31..36 PATH_SEGMENT@31..36 - CRATE_KW@31..36 "crate" + NAME_REF@31..36 + CRATE_KW@31..36 "crate" COLON2@36..38 "::" PATH_SEGMENT@38..41 NAME_REF@38..41 @@ -63,7 +66,8 @@ SOURCE_FILE@0..98 IDENT@59..64 "hello" COLON2@64..66 "::" PATH_SEGMENT@66..71 - CRATE_KW@66..71 "crate" + NAME_REF@66..71 + CRATE_KW@66..71 "crate" SEMICOLON@71..72 ";" WHITESPACE@72..73 "\n" USE@73..97 @@ -78,7 +82,8 @@ SOURCE_FILE@0..98 IDENT@77..82 "hello" COLON2@82..84 "::" PATH_SEGMENT@84..89 - CRATE_KW@84..89 "crate" + NAME_REF@84..89 + CRATE_KW@84..89 "crate" COLON2@89..91 "::" PATH_SEGMENT@91..96 NAME_REF@91..96 diff --git a/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast index 2049a9d72..271f8d780 100644 --- a/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast +++ b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast @@ -6,7 +6,8 @@ SOURCE_FILE@0..67 PATH@4..11 PATH_SEGMENT@4..11 COLON2@4..6 "::" - SUPER_KW@6..11 "super" + NAME_REF@6..11 + SUPER_KW@6..11 "super" SEMICOLON@11..12 ";" WHITESPACE@12..13 "\n" USE@13..26 @@ -20,7 +21,8 @@ SOURCE_FILE@0..67 IDENT@17..18 "a" COLON2@18..20 "::" PATH_SEGMENT@20..25 - SUPER_KW@20..25 "super" + NAME_REF@20..25 + SUPER_KW@20..25 "super" SEMICOLON@25..26 ";" WHITESPACE@26..27 "\n" USE@27..47 @@ -31,14 +33,16 @@ SOURCE_FILE@0..67 PATH@31..39 PATH@31..36 PATH_SEGMENT@31..36 - SUPER_KW@31..36 "super" + NAME_REF@31..36 + SUPER_KW@31..36 "super" COLON2@36..38 "::" PATH_SEGMENT@38..39 NAME_REF@38..39 IDENT@38..39 "a" COLON2@39..41 "::" PATH_SEGMENT@41..46 - SUPER_KW@41..46 "super" + NAME_REF@41..46 + SUPER_KW@41..46 "super" SEMICOLON@46..47 ";" WHITESPACE@47..48 "\n" USE@48..66 @@ -56,7 +60,8 @@ SOURCE_FILE@0..67 PATH@56..64 PATH@56..61 PATH_SEGMENT@56..61 - SUPER_KW@56..61 "super" + NAME_REF@56..61 + SUPER_KW@56..61 "super" COLON2@61..63 "::" PATH_SEGMENT@63..64 NAME_REF@63..64 diff --git a/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast index deadf56b4..01f601091 100644 --- a/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast +++ b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast @@ -6,7 +6,8 @@ SOURCE_FILE@0..25 PATH@4..10 PATH_SEGMENT@4..10 COLON2@4..6 "::" - SELF_KW@6..10 "self" + NAME_REF@6..10 + SELF_KW@6..10 "self" SEMICOLON@10..11 ";" WHITESPACE@11..12 "\n" USE@12..24 @@ -20,7 +21,8 @@ SOURCE_FILE@0..25 IDENT@16..17 "a" COLON2@17..19 "::" PATH_SEGMENT@19..23 - SELF_KW@19..23 "self" + NAME_REF@19..23 + SELF_KW@19..23 "self" SEMICOLON@23..24 ";" WHITESPACE@24..25 "\n" error 6..10: The `self` keyword is only allowed as the first segment of a path -- cgit v1.2.3