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

Remove the caret operator as it is not implemented.

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

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

@ -15,7 +15,7 @@ public abstract class TreeNode {
*/ */
protected static Lexer<TokenType> lexer = new Lexer<TokenType>(){{ protected static Lexer<TokenType> lexer = new Lexer<TokenType>(){{
register(",", TokenType.COMMA); register(",", TokenType.COMMA);
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);
register("\\(", TokenType.OPEN_PARENTH); register("\\(", TokenType.OPEN_PARENTH);
@ -29,7 +29,6 @@ public abstract class TreeNode {
put("-", 0); put("-", 0);
put("*", 1); put("*", 1);
put("/", 1); put("/", 1);
put("^", 2);
}}; }};
/** /**
* A map that maps operations to their associativity. * A map that maps operations to their associativity.
@ -40,7 +39,6 @@ public abstract class TreeNode {
put("-", OperatorAssociativity.LEFT); put("-", OperatorAssociativity.LEFT);
put("*", OperatorAssociativity.LEFT); put("*", OperatorAssociativity.LEFT);
put("/", OperatorAssociativity.LEFT); put("/", OperatorAssociativity.LEFT);
put("^", OperatorAssociativity.RIGHT);
}}; }};
/** /**