DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-11 17:45:20 +00:00
Code Issues Releases Wiki Activity

Move parsing code into TreeBuilder, change lexing and parsing algorithms

Browse Source
This commit is contained in:
Danila Fedorin
2017-07-27 12:53:58 -07:00
parent 78e2d50f89
commit f931b9f322
6 changed files with 153 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/nwapw/abacus/window/Window.java
View File

@@ -3,6 +3,7 @@ package org.nwapw.abacus.window;
import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.plugin.PluginManager;
import org.nwapw.abacus.tree.NumberReducer;
import org.nwapw.abacus.tree.TreeBuilder;
import org.nwapw.abacus.tree.TreeNode;
import javax.swing.*;
@@ -47,6 +48,10 @@ public class Window extends JFrame {
* The plugin manager used to retrieve functions.
*/
private PluginManager manager;
/**
* The builder used to construct the parse trees.
*/
private TreeBuilder builder;
/**
* The reducer used to evaluate the tree.
*/
@@ -123,7 +128,8 @@ public class Window extends JFrame {
* Action listener that causes the input to be evaluated.
*/
private ActionListener evaluateListener = (event) -> {
TreeNode parsedExpression = TreeNode.fromString(inputField.getText());
TreeBuilder builder = new TreeBuilder();
TreeNode parsedExpression = builder.fromString(inputField.getText());
if(parsedExpression == null){
lastOutputArea.setText(SYNTAX_ERR_STRING);
return;