[08 - AST] Add ASTParser, ASTParserTreeTest abstract and Parser abstract

ÜB-Praxis-Abstiegsparser für X-Leer/.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/ASTParser.java

@@ -0,0 +1,18 @@
+package de.dhbw.compiler.xparser;
+
+import de.dhbw.compiler.xparser.api.Parser;
+
+/**
+ * <h1>ASTParser</h1>
+ * <p>Parses programming language X into abstract syntax trees.</p>
+ */
+public class ASTParser extends Parser {
+    public ASTParser(TokenReader in) {
+        super(in);
+    }
+
+    @Override
+    public Tree parseProgram() {
+        return null;
+    }
+}

ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/XParser.java

@@ -11,13 +11,14 @@
 
 package de.dhbw.compiler.xparser;
 
-public class XParser {
+import de.dhbw.compiler.xparser.api.Parser;
-	private final TokenReader in;
 
+public class XParser extends Parser {
 	public XParser(TokenReader in) {
-		this.in = in;
+		super(in);
 	}
 
+	@Override
 	public Tree parseProgram() {
 		int oldPosition = in.getPosition();
 		Tree program, id, semicolon, block, dot, eof;
@@ -277,18 +278,4 @@ public class XParser {
 		in.setPosition(oldPosition);
 		return null;
 	}
-
-	private Tree parseToken(int tokenType) {
-		int oldPosition = in.getPosition();
-		Token nextToken = in.nextToken();
-		System.out.println("parseToken> " + nextToken + " = " + Token.getTypeName(tokenType));
-		if (nextToken.getType() == tokenType) {
-			return new Tree(nextToken);
-		} else {
-			// Reset to last position as it needs to be re-read again
-			in.setPosition(oldPosition);
-			return null;
-		}
-	}
-
 }

ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/api/Parser.java

@@ -0,0 +1,28 @@
+package de.dhbw.compiler.xparser.api;
+
+import de.dhbw.compiler.xparser.Token;
+import de.dhbw.compiler.xparser.TokenReader;
+import de.dhbw.compiler.xparser.Tree;
+
+public abstract class Parser {
+    protected final TokenReader in;
+
+    protected Parser(TokenReader in) {
+        this.in = in;
+    }
+
+    public abstract Tree parseProgram();
+
+    protected Tree parseToken(int tokenType) {
+        int oldPosition = in.getPosition();
+        Token nextToken = in.nextToken();
+        System.out.println("parseToken> " + nextToken + " = " + Token.getTypeName(tokenType));
+        if (nextToken.getType() == tokenType) {
+            return new Tree(nextToken);
+        } else {
+            // Reset to last position as it needs to be re-read again
+            in.setPosition(oldPosition);
+            return null;
+        }
+    }
+}

ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/test/ASTParseTreeTest.java

@@ -0,0 +1,27 @@
+package de.dhbw.compiler.xparser.test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.StringReader;
+
+import de.dhbw.compiler.xparser.ASTParser;
+import de.dhbw.compiler.xparser.JFlexXScanner;
+import de.dhbw.compiler.xparser.TokenReader;
+import de.dhbw.compiler.xparser.Tree;
+
+public abstract class ASTParseTreeTest extends ParseTreeTest {
+    @Override
+    protected void testParseTree(String in, String expected) throws Exception {
+        JFlexXScanner scanner   = new JFlexXScanner(new StringReader(in));
+        TokenReader reader	    = new TokenReader(scanner);
+        ASTParser parser	    = new ASTParser(reader);
+
+        Tree out = parser.parseProgram();
+
+        if (out==null) {
+            assertEquals(expected, out);
+        } else {
+            assertEquals(expected, out.toString());
+        }
+    }
+}

ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/test/TestXASTParser1.java

@@ -16,7 +16,7 @@ import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestXASTParser1 extends ParseTreeTest {
+public class TestXASTParser1 extends ASTParseTreeTest {
 	
 	@Test
 	public void program00BeginEnd() throws Exception {

ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/test/TestXASTParser2.java

@@ -16,7 +16,7 @@ import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestXASTParser2 extends ParseTreeTest {
+public class TestXASTParser2 extends ASTParseTreeTest {
 	
 	@Test
 	public void program30Decl() throws Exception {