From 573a22a412f6a0a1614bb48cedf59f435d78aa5f Mon Sep 17 00:00:00 2001 From: hneemann Date: Fri, 20 Nov 2020 20:04:24 +0100 Subject: [PATCH] minor refactoring of the test case tokenizer --- .../digital/testing/parser/Tokenizer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/neemann/digital/testing/parser/Tokenizer.java b/src/main/java/de/neemann/digital/testing/parser/Tokenizer.java index dde77f8c0..6c378aec6 100644 --- a/src/main/java/de/neemann/digital/testing/parser/Tokenizer.java +++ b/src/main/java/de/neemann/digital/testing/parser/Tokenizer.java @@ -20,21 +20,21 @@ public class Tokenizer { LET, LOG_NOT, WHILE } - private static HashMap statementMap = new HashMap<>(); + private final static HashMap STATEMENT_MAP = new HashMap<>(); static { - statementMap.put("end", Token.END); - statementMap.put("loop", Token.LOOP); - statementMap.put("repeat", Token.REPEAT); - statementMap.put("bits", Token.BITS); - statementMap.put("let", Token.LET); - statementMap.put("while", Token.WHILE); + STATEMENT_MAP.put("end", Token.END); + STATEMENT_MAP.put("loop", Token.LOOP); + STATEMENT_MAP.put("repeat", Token.REPEAT); + STATEMENT_MAP.put("bits", Token.BITS); + STATEMENT_MAP.put("let", Token.LET); + STATEMENT_MAP.put("while", Token.WHILE); } private final Reader in; + private final StringBuilder builder; private Token token; private boolean isToken; - private StringBuilder builder; private boolean isUnreadChar = false; private int unreadChar; private int line = 1; @@ -171,7 +171,7 @@ public class Tokenizer { wasChar = false; } } while (wasChar); - token = statementMap.get(builder.toString()); + token = STATEMENT_MAP.get(builder.toString()); if (token == null) token = Token.IDENT; } else if (isNumberChar(c)) { token = Token.NUMBER;