From ccb3ac17ca22cdd30bf4b7e72141d00eed9bf895 Mon Sep 17 00:00:00 2001
From: Humenius <contact@humenius.me>
Date: Wed, 13 May 2020 11:25:35 +0200
Subject: [PATCH] [06 - Top Down Parser] Attempt to fix "program11Expr" tests

---
 .../bin/de/dhbw/compiler/xparser/XParser.class | Bin 4173 -> 4882 bytes
 .../src/de/dhbw/compiler/xparser/XParser.java |  55 ++++++++++++++++--
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/ÜB-Praxis-Abstiegsparser für X-Leer/bin/de/dhbw/compiler/xparser/XParser.class b/ÜB-Praxis-Abstiegsparser für X-Leer/bin/de/dhbw/compiler/xparser/XParser.class
index e5cb6840e8ceab7ba3c84e682d77e204b6732fff..4ef849bef028859bd00d2890dec1ed105b896865 100644
GIT binary patch
literal 4882
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
IO52D25A2oPb^rhX

delta 1795
zcmb_cYi|@~6n<v5%goMB?_w`o$|AJ1-7ZzTfD~JhEl?1*YfB5oRV=vHrR{dzwpbP2
zR+LM<pv)&t#6*L46DqnyNbrNV1mg$eFYsrO)W+w`4$~69nn|8H@9muDJm<Xc#l}B^
zxm!!uZvu$mT?6-Fz=w4hG;j!qH4GUX91(azL&882o;0B0DS@LtJdI%;#|#|DGjbp)
z8=sZ65gpITASG}@U{qjCU|b+AFd>IB4H}*|P>TT_S@};2ObJX&z>^wY&@i*GFs3L8
zt6sfUZDxkElgZfh`0klZR)L;MPemuvlT%iu=R(_%0;7LoI(t01CpDH-U>=Uk?(C)$
z!zYJLG~h)O>#;$@OD0~%DeF(qdjDgHndm@R!5VAMQya}Dld|&_fmcoBFsotC#A`UM
zptLL4Kbp#9Qt6T4L2lIWx`{V%#>81U(1oyxbC|UfMfHt4Ww1+NkHBt$eFBdP91w`(
zymh%Kw0a(InwZC1Cf>$7CNAKVf*{G%T=jYXQY=*q2iCDTfPxC)Ps^m;fJWj*YrhuQ
z*2K9Ic!=ectpYw&qM4(6p%M+WAjH2|a$e!rim-k9lJ=$2WbM;?bFx3dlL_wKgf{4`
z!Z_}y<zb{@JV2|6<3o6mmKP5*m3CUIuopYoL2ax(@V*mE$9vd}EsRly^VrH&6%TRU
z2jw4}RWxkl1a%h@oW2dK%9kdSGrp|}VbVpv9po=eyr`jv?X*11I>gAr1UTl#I^xFa
zL+9PG;!Z49$4<D$*vv4!Mpab81Z~kaIF8CGn*>x)g<|Y*9hE>`L^(MxqO8E2<+Z(i
zVGJrw7yY3DaTX!d5c4f41s1)ayG~98Eo!K{1W>V-nm$6yW2?e?E@8VcEx2dn*zRZj
zGbDT4AGNC^ngAoN*Q2i2nCrC%QO9c=x@i@m538MuiT>5_ETP$nw1^rzDM4~#lS)+X
zYUN+yUsbLMqN$O;Rrb_ryRoDJWucIuDoxIrjn?1hh_q92`{<n_wo>E0HjynXXAdne
zPY$|C#M~r0og{*6n?l<OVOyF5%hK=?NhGdZrYC8Gb}L?5Z+S~9b2eKK<Tlhh-KgUO
zcF%{rKbLsuBa;7^_4&k3qNQ-$r4n+f)Vg}!gZ+-44wXCFF?n9)yQuK~wOc)9bxO50
zTN=nM)A)>+>2uQfiZs3^jc*wK3TZ6-FEsd=I5a+W6p6Ha2i1y~2duf$+7&#$CyzXN
z{J>}6I%T@S)Nismeq6yL;>ywL$`NoY^B*}{mMg=j)ZuZJZ7r4Q79P!ccsj*k<k+|H
z-$3oqH3TZ^@>mnjqdt$dc@)zMTJsfkW6P@jM7BTkI{iX+zf!H=_#oWkoBI0-w%ra}
k#zL?C+~|BB<g%$e8Q~lIxO2tqho^&V`$)2%<WwB|7dcSqz5oCK

diff --git a/ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/XParser.java b/ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/XParser.java
index 187ee36..6761f87 100644
--- a/ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/XParser.java	
+++ b/ÜB-Praxis-Abstiegsparser für X-Leer/src/de/dhbw/compiler/xparser/XParser.java	
@@ -138,7 +138,7 @@ public class XParser {
 
 		if ((id = parseToken(Token.ID)) != null
 			&& (assign = parseToken(Token.ASSIGN)) != null
-			&& (numExpr = parseNumExpr()) != null) {
+			&& (numExpr = parseNumExpr0()) != null) {
 			tree.addLastChild(id);
 			tree.addLastChild(assign);
 			tree.addLastChild(numExpr);
@@ -149,15 +149,47 @@ public class XParser {
 		return null;
 	}
 
-	private Tree parseNumExpr() {
+	private Tree parseNumExpr0() {
 		int oldPosition = in.getPosition();
 		Tree tree = new Tree(new Token(Token.EXPR));
-		Tree intConst;
+		Tree intConst, a, operator, b;
 
 		if ((intConst = parseNumExpr2()) != null) {
 			tree.addLastChild(intConst);
 			return tree;
 		}
+		in.setPosition(oldPosition);
+
+		if (((a = parseNumExpr2()) != null)
+				&& ((operator = parseToken(Token.MULT)) != null
+				|| ((operator = parseToken(Token.DIV)) != null
+				|| ((operator = parseToken(Token.PLUS)) != null
+				|| ((operator = parseToken(Token.MINUS)) != null))))
+			&& ((b = parseNumExpr()) != null)) {
+			tree.addLastChild(a);
+			tree.addLastChild(operator);
+			tree.addLastChild(b);
+			return tree;
+		}
+
+		in.setPosition(oldPosition);
+		return null;
+	}
+
+	private Tree parseNumExpr() {
+		int oldPosition = in.getPosition();
+		Tree tree = new Tree(new Token(Token.EXPR));
+		Tree id, intConst;
+
+		if ((intConst = parseNumExpr2()) != null) {
+			tree.addLastChild(intConst);
+			return tree;
+		}
+
+		if ((id = parseToken(Token.ID)) != null) {
+			tree.addLastChild(id);
+			return tree;
+		}
 
 		in.setPosition(oldPosition);
 		return null;
@@ -166,13 +198,18 @@ public class XParser {
 	private Tree parseNumExpr2() {
 		int oldPosition = in.getPosition();
 		Tree tree = new Tree(new Token(Token.EXPR2));
-		Tree intConst;
+		Tree id, intConst;
 
 		if ((intConst = parseNumExpr3()) != null) {
 			tree.addLastChild(intConst);
 			return tree;
 		}
+		in.setPosition(oldPosition);
 
+		if ((id = parseToken(Token.ID)) != null) {
+			tree.addLastChild(id);
+			return tree;
+		}
 		in.setPosition(oldPosition);
 		return null;
 	}
@@ -180,12 +217,18 @@ public class XParser {
 	private Tree parseNumExpr3() {
 		int oldPosition = in.getPosition();
 		Tree tree = new Tree(new Token(Token.EXPR3));
-		Tree intConst;
+		Tree id, intConst;
 
 		if ((intConst = parseToken(Token.INTCONST)) != null) {
 			tree.addLastChild(intConst);
 			return tree;
 		}
+		in.setPosition(oldPosition);
+
+		if ((id = parseToken(Token.ID)) != null) {
+			tree.addLastChild(id);
+			return tree;
+		}
 
 		in.setPosition(oldPosition);
 		return null;
@@ -194,7 +237,7 @@ public class XParser {
 	private Tree parseToken(int tokenType) {
 		int oldPosition = in.getPosition();
 		Token nextToken = in.nextToken();
-		System.out.println("parseToken> " + nextToken);
+		System.out.println("parseToken> " + nextToken + " = " + Token.getTypeName(tokenType));
 		if (nextToken.getType() == tokenType) {
 			return new Tree(nextToken);
 		} else {