Code cleanup.

This commit is contained in:
Stephen Chung
2022-10-30 22:16:09 +08:00
parent dc5e80c821
commit 32493524ed
9 changed files with 144 additions and 150 deletions

View File

@@ -228,7 +228,13 @@ impl Engine {
continue;
}
let token = Token::lookup_from_syntax(s);
let token = Token::lookup_symbol_from_syntax(s).or_else(|| {
if Token::is_reserved_keyword(s) {
Some(Token::Reserved(Box::new(s.into())))
} else {
None
}
});
let seg = match s {
// Markers not in first position

View File

@@ -154,7 +154,7 @@ impl Engine {
let keyword = keyword.as_ref();
match Token::lookup_from_syntax(keyword) {
match Token::lookup_symbol_from_syntax(keyword) {
// Standard identifiers and reserved keywords are OK
None | Some(Token::Reserved(..)) => (),
// custom keywords are OK