c/crafting-interpreters
1
Fork 0
Code Issues Releases Activity

Cleanup: Use idiomatic getOrDefault

Browse Source
This commit is contained in:
ctsk
2022-09-05 10:28:04 +02:00
parent 6dd507d76a
commit 3857580ff0
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jlox/src/main/java/xyz/ctsk/lox/Scanner.java
View File

@@ -3,6 +3,7 @@ package xyz.ctsk.lox;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import static java.util.Map.entry; import static java.util.Map.entry;
import static xyz.ctsk.lox.TokenType.*; import static xyz.ctsk.lox.TokenType.*;
@@ -110,10 +111,6 @@ public class Scanner {
return isDigit(c) || isAlpha(c); return isDigit(c) || isAlpha(c);
} }
private static boolean isKeyword(String s) {
return keywords.containsKey(s);
}
private void number() { private void number() {
while (isDigit(peek())) advance(); while (isDigit(peek())) advance();
@@ -140,11 +137,9 @@ public class Scanner {
while (isAlphaNumeric(peek())) advance(); while (isAlphaNumeric(peek())) advance();
var text = currentMatch(); var text = currentMatch();
if (isKeyword(text)) { addToken(
addToken(keywords.get(text)); keywords.getOrDefault(text, IDENTIFIER)
} else { );
addToken(IDENTIFIER);
}
} }
private void scanToken() { private void scanToken() {