Merge branch 'parser'

# Conflicts:
#	RELEASE.md

Author: mhaupt

RELEASE.md

@@ -1,5 +1,6 @@
 ## upcoming
 
+*   Switched from generated to handwritten recursive descent parser.
 *   Bug fixes: EXP/LOG, unary +, case sensitivity of variables, comma 
     separator in PRINT, VAL tolerates erroneous input and returns 0.
 

pom.xml

@@ -38,23 +38,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <id>javacc</id>
-                        <goals>
-                            <goal>javacc</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

src/main/java/de/haupz/basicode/Main.java

@@ -3,8 +3,8 @@
 import de.haupz.basicode.ast.ProgramNode;
 import de.haupz.basicode.interpreter.Configuration;
 import de.haupz.basicode.interpreter.InterpreterState;
+import de.haupz.basicode.parser.Parser;
 import de.haupz.basicode.ui.BasicFrame;
-import de.haupz.basicode.parser.BasicParser;
 import de.haupz.basicode.ui.BasicContainer;
 
 import javax.swing.*;
@@ -106,7 +106,7 @@ private static String getSource(String filename) throws IOException {
      * @throws Exception in case anything goes wrong.
      */
     public static void run(String code, Configuration configuration) throws Exception {
-        final BasicParser parser = new BasicParser(new StringReader(code));
+        final Parser parser = new Parser(new StringReader(code));
         ProgramNode prog = parser.program();
         InterpreterState state = new InterpreterState(prog, bc, bc, configuration);
         bc.registerStopKeyHandler(() -> state.terminate());

src/main/java/de/haupz/basicode/ast/DataNode.java

@@ -17,6 +17,10 @@ public DataNode(List<Object> data) {
         this.data = List.copyOf(data);
     }
 
+    public List<Object> getData() {
+        return data;
+    }
+
     @Override
     public void run(InterpreterState state) {
         // naught

src/main/java/de/haupz/basicode/ast/DefFnNode.java

@@ -29,6 +29,18 @@ public DefFnNode(String id, String arg, ExpressionNode expression) {
         this.expression = expression;
     }
 
+    public String getId() {
+        return id;
+    }
+
+    public String getArg() {
+        return arg;
+    }
+
+    public ExpressionNode getExpression() {
+        return expression;
+    }
+
     @Override
     public void run(InterpreterState state) {
         Function fn = new Function(arg, expression);

src/main/java/de/haupz/basicode/ast/DependentJumpNode.java

@@ -26,6 +26,14 @@ public DependentJumpNode(ExpressionNode expression, List<Integer> targets) {
         this.targets = targets;
     }
 
+    public ExpressionNode getExpression() {
+        return expression;
+    }
+
+    public List<Integer> getTargets() {
+        return targets;
+    }
+
     /**
      * Compute a jump target from a value derived from evaluating {@link #expression}.
      *

src/main/java/de/haupz/basicode/ast/DimCreateNode.java

@@ -35,6 +35,18 @@ public DimCreateNode(String id, ExpressionNode dim1, ExpressionNode dim2) {
         this.dim2 = dim2;
     }
 
+    public String getId() {
+        return id;
+    }
+
+    public ExpressionNode getDim1() {
+        return dim1;
+    }
+
+    public ExpressionNode getDim2() {
+        return dim2;
+    }
+
     @Override
     public void run(InterpreterState state) {
         ArrayType type = id.endsWith("$") ? ArrayType.STRING : ArrayType.NUMBER;

src/main/java/de/haupz/basicode/ast/DimNode.java

@@ -17,6 +17,10 @@ public DimNode(List<DimCreateNode> dims) {
         this.dims = List.copyOf(dims);
     }
 
+    public List<DimCreateNode> getDims() {
+        return dims;
+    }
+
     @Override
     public void run(InterpreterState state) {
         dims.forEach(d -> d.run(state));

src/main/java/de/haupz/basicode/ast/ExpressionNode.java

@@ -1,9 +1,6 @@
 package de.haupz.basicode.ast;
 
 import de.haupz.basicode.interpreter.InterpreterState;
-import de.haupz.basicode.parser.Token;
-
-import java.util.List;
 
 /**
  * The super class of all AST nodes representing BASICODE expressions. It overrides

src/main/java/de/haupz/basicode/ast/ForNode.java

@@ -39,6 +39,22 @@ public ForNode(String id, ExpressionNode init, ExpressionNode end, ExpressionNod
         this.step = step == null ? new DoubleNode(1.0) : step;
     }
 
+    public String getId() {
+        return id;
+    }
+
+    public ExpressionNode getInit() {
+        return init;
+    }
+
+    public ExpressionNode getEnd() {
+        return end;
+    }
+
+    public ExpressionNode getStep() {
+        return step;
+    }
+
     @Override
     public void run(InterpreterState state) {
         if (!state.isRunningLoop(id)) {