mirror of
https://github.com/DanilaFe/abacus
synced 2024-12-22 15:30:09 -08:00
Make some operator-related fields protected in TreeNode.
This should allow for the implementation of toString in child nodes.
This commit is contained in:
parent
0002f14e61
commit
8754871556
|
@ -13,7 +13,7 @@ public abstract class TreeNode {
|
||||||
/**
|
/**
|
||||||
* The lexer used to lex tokens.
|
* The lexer used to lex tokens.
|
||||||
*/
|
*/
|
||||||
private static Lexer<TokenType> lexer = new Lexer<TokenType>(){{
|
protected static Lexer<TokenType> lexer = new Lexer<TokenType>(){{
|
||||||
register("\\+|-|\\*|/|^", TokenType.OP);
|
register("\\+|-|\\*|/|^", TokenType.OP);
|
||||||
register("[0-9]+(\\.[0-9]+)?", TokenType.NUM);
|
register("[0-9]+(\\.[0-9]+)?", TokenType.NUM);
|
||||||
register("[a-zA-Z]+", TokenType.WORD);
|
register("[a-zA-Z]+", TokenType.WORD);
|
||||||
|
@ -23,7 +23,7 @@ public abstract class TreeNode {
|
||||||
/**
|
/**
|
||||||
* A map that maps operations to their precedence.
|
* A map that maps operations to their precedence.
|
||||||
*/
|
*/
|
||||||
private static HashMap<String, Integer> precedenceMap = new HashMap<String, Integer>(){{
|
protected static HashMap<String, Integer> precedenceMap = new HashMap<String, Integer>(){{
|
||||||
put("+", 0);
|
put("+", 0);
|
||||||
put("-", 0);
|
put("-", 0);
|
||||||
put("*", 1);
|
put("*", 1);
|
||||||
|
@ -33,7 +33,7 @@ public abstract class TreeNode {
|
||||||
/**
|
/**
|
||||||
* A map that maps operations to their associativity.
|
* A map that maps operations to their associativity.
|
||||||
*/
|
*/
|
||||||
private static HashMap<String, OperatorAssociativity> associativityMap =
|
protected static HashMap<String, OperatorAssociativity> associativityMap =
|
||||||
new HashMap<String, OperatorAssociativity>() {{
|
new HashMap<String, OperatorAssociativity>() {{
|
||||||
put("+", OperatorAssociativity.LEFT);
|
put("+", OperatorAssociativity.LEFT);
|
||||||
put("-", OperatorAssociativity.LEFT);
|
put("-", OperatorAssociativity.LEFT);
|
||||||
|
@ -45,7 +45,7 @@ public abstract class TreeNode {
|
||||||
/**
|
/**
|
||||||
* Comparator used to sort token types.
|
* Comparator used to sort token types.
|
||||||
*/
|
*/
|
||||||
private static Comparator<TokenType> tokenSorter = Comparator.comparingInt(e -> e.priority);
|
protected static Comparator<TokenType> tokenSorter = Comparator.comparingInt(e -> e.priority);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tokenizes a string, converting it into matches
|
* Tokenizes a string, converting it into matches
|
||||||
|
|
Loading…
Reference in New Issue
Block a user