From cd65484a2219ef877ae8b653670fdfac7e590b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= Date: Fri, 17 Sep 2021 21:34:33 +0100 Subject: [PATCH] [wgsl-in] Disallow identifiers starting with _ --- src/front/wgsl/lexer.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/front/wgsl/lexer.rs b/src/front/wgsl/lexer.rs index 1a3b63b2d3..54a2660ea6 100644 --- a/src/front/wgsl/lexer.rs +++ b/src/front/wgsl/lexer.rs @@ -336,7 +336,7 @@ fn consume_token(mut input: &str, generic: bool) -> (Token<'_>, &str) { } } '0'..='9' => consume_number(input), - 'a'..='z' | 'A'..='Z' | '_' => { + 'a'..='z' | 'A'..='Z' => { let (word, rest) = consume_any(input, |c| c.is_ascii_alphanumeric() || c == '_'); (Token::Word(word), rest) } @@ -655,6 +655,7 @@ fn test_tokens() { ); sub_test("No¾", &[Token::Word("No"), Token::Unknown('¾')]); sub_test("No好", &[Token::Word("No"), Token::Unknown('好')]); + sub_test("_No", &[Token::Unknown('_'), Token::Word("No")]); sub_test("\"\u{2}ПЀ\u{0}\"", &[Token::String("\u{2}ПЀ\u{0}")]); // https://github.com/gfx-rs/naga/issues/90 }