DanilaFe
/
Abacus
mirror of https://github.com/DanilaFe/abacus
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into ui-touchup

This commit is contained in:
Danila Fedorin 2017-07-26 17:27:05 -07:00
parent b31c1f9624 d7caf1cdc7
commit 4a8164631f
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/nwapw/abacus/tree/NumberNode.java
View File

@ -49,4 +49,9 @@ public class NumberNode extends TreeNode {
public <T> T reduce(Reducer<T> reducer) { public <T> T reduce(Reducer<T> reducer) {
return reducer.reduceNode(this); return reducer.reduceNode(this);
} }
@Override
public String toString() {
return number != null ? number.toString() : "null";
}
} }

15
src/org/nwapw/abacus/tree/OpNode.java
View File

@ -88,4 +88,19 @@ public class OpNode extends TreeNode {
T rightReduce = right.reduce(reducer); T rightReduce = right.reduce(reducer);
return reducer.reduceNode(this, leftReduce, rightReduce); return reducer.reduceNode(this, leftReduce, rightReduce);
} }
@Override
public String toString() {
String leftString = left != null ? left.toString() : "null";
String rightString = right != null ? right.toString() : "null";
if(right != null && right instanceof OpNode){
if(TreeNode.precedenceMap.get(((OpNode) right).getOperation()) >
TreeNode.precedenceMap.get(operation)) {
rightString = "(" + rightString + ")";
}
}
return leftString + operation + rightString;
}
} }

8
src/org/nwapw/abacus/tree/TreeNode.java
View File

@ -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