DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2024-12-24 00:10:09 -08:00
Code Issues Releases Wiki Activity

Remove unnecessary getType() calls.

Browse Source
This commit is contained in:
Danila Fedorin 2017-07-27 09:22:24 -07:00
parent cc1d67a078
commit eef83a04aa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,14 +124,15 @@ public abstract class TreeNode {
public static TreeNode fromStringRecursive(String source, ArrayList<Match<TokenType>> matches){ public static TreeNode fromStringRecursive(String source, ArrayList<Match<TokenType>> matches){
if(matches.size() == 0) return null; if(matches.size() == 0) return null;
Match<TokenType> match = matches.remove(0); Match<TokenType> match = matches.remove(0);
if(match.getType() == TokenType.OP){ TokenType matchType = match.getType();
if(matchType == TokenType.OP){
TreeNode right = fromStringRecursive(source, matches); TreeNode right = fromStringRecursive(source, matches);
TreeNode left = fromStringRecursive(source, matches); TreeNode left = fromStringRecursive(source, matches);
if(left == null || right == null) return null; if(left == null || right == null) return null;
else return new OpNode(source.substring(match.getFrom(), match.getTo()), left, right); else return new OpNode(source.substring(match.getFrom(), match.getTo()), left, right);
} else if(match.getType() == TokenType.NUM){ } else if(matchType == TokenType.NUM){
return new NumberNode(Double.parseDouble(source.substring(match.getFrom(), match.getTo()))); return new NumberNode(Double.parseDouble(source.substring(match.getFrom(), match.getTo())));
} else if(match.getType() == TokenType.INTERNAL_FUNCTION_START){ } else if(matchType == TokenType.INTERNAL_FUNCTION_START){
if(matches.isEmpty() || matches.get(0).getType() != TokenType.WORD) return null; if(matches.isEmpty() || matches.get(0).getType() != TokenType.WORD) return null;
Match<TokenType> stringName = matches.remove(0); Match<TokenType> stringName = matches.remove(0);
String functionName = source.substring(stringName.getFrom(), stringName.getTo()); String functionName = source.substring(stringName.getFrom(), stringName.getTo());