kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Disallow variable names starting with _ + digit.

Browse Source
This commit is contained in:
Stephen Chung 2020-03-18 23:09:53 +08:00
parent 0dc51f8e59
commit b3efb8b264
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/parser.rs
View File

@ -991,9 +991,18 @@ impl<'a> TokenIterator<'a> {
} }
} }
let has_letter = result.iter().any(char::is_ascii_alphabetic); let is_valid_identifier = result
.iter()
.find(|&ch| char::is_ascii_alphanumeric(ch)) // first alpha-numeric character
.map(char::is_ascii_alphabetic) // is a letter
.unwrap_or(false); // if no alpha-numeric at all - syntax error
let identifier: String = result.iter().collect(); let identifier: String = result.iter().collect();
if !is_valid_identifier {
return Some((Token::LexError(LERR::MalformedIdentifier(identifier)), pos));
}
return Some(( return Some((
match identifier.as_str() { match identifier.as_str() {
"true" => Token::True, "true" => Token::True,
@ -1013,9 +1022,7 @@ impl<'a> TokenIterator<'a> {
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
"fn" => Token::Fn, "fn" => Token::Fn,
_ if has_letter => Token::Identifier(identifier), _ => Token::Identifier(identifier),
_ => Token::LexError(LERR::MalformedIdentifier(identifier)),
}, },
pos, pos,
)); ));