1
0
mirror of https://github.com/DanilaFe/abacus synced 2024-11-13 14:19:53 -08:00

Correctly handle invalid strings.

This commit is contained in:
Danila Fedorin 2017-07-26 13:25:12 -07:00
parent 7c4ecdc1db
commit 9ce35aad54

View File

@ -129,7 +129,9 @@ public abstract class TreeNode {
* @return the resulting tree.
*/
public static TreeNode fromString(String string){
ArrayList<Match<TokenType>> matches = intoPostfix(string, tokenize(string));
ArrayList<Match<TokenType>> matches = tokenize(string);
if(matches == null) return null;
matches = intoPostfix(string, matches);
if(matches == null) return null;
Collections.reverse(matches);