From 5ba4f949c23dcf53f34995c90b7c01e6c641b1f0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 6 Nov 2020 22:21:56 +0100 Subject: Kill RAW_ literals Syntactically, they are indistinguishable from non-raw versions, so it doesn't make sense to separate then *at the syntax* level. --- xtask/src/ast_src.rs | 11 +---------- xtask/src/codegen/gen_syntax.rs | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'xtask') diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index adc191254..8ceaaf60e 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs @@ -71,16 +71,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { "trait", "true", "try", "type", "unsafe", "use", "where", "while", ], contextual_keywords: &["auto", "default", "existential", "union", "raw"], - literals: &[ - "INT_NUMBER", - "FLOAT_NUMBER", - "CHAR", - "BYTE", - "STRING", - "RAW_STRING", - "BYTE_STRING", - "RAW_BYTE_STRING", - ], + literals: &["INT_NUMBER", "FLOAT_NUMBER", "CHAR", "BYTE", "STRING", "BYTE_STRING"], tokens: &[ "ERROR", "IDENT", diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs index 87c934e66..44460effa 100644 --- a/xtask/src/codegen/gen_syntax.rs +++ b/xtask/src/codegen/gen_syntax.rs @@ -505,7 +505,7 @@ impl Field { fn lower(grammar: &Grammar) -> AstSrc { let mut res = AstSrc::default(); - res.tokens = "Whitespace Comment String RawString IntNumber FloatNumber" + res.tokens = "Whitespace Comment String ByteString IntNumber FloatNumber" .split_ascii_whitespace() .map(|it| it.to_string()) .collect::>(); -- cgit v1.2.3