From 9b8fc290ad09fe0cfdb07f895bb7eaa35f20b30a Mon Sep 17 00:00:00 2001
From: Humenius <contact@humenius.me>
Date: Wed, 13 May 2020 11:52:42 +0200
Subject: [PATCH] [06 - Top Down Parser] Fix "program1*" tests except
 "program18ExprAll"

---
 .../bin/de/dhbw/compiler/xparser/XParser.class | Bin 4882 -> 4719 bytes
 .../src/de/dhbw/compiler/xparser/XParser.java |  65 ++++++++----------
 2 files changed, 29 insertions(+), 36 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 4ef849bef028859bd00d2890dec1ed105b896865..a6f0be5f601d7b5ecb339f70e2b7d73932143e87 100644
GIT binary patch
delta 2244
zcmb7FX>3$g6#m}4nZB7fk8TL<bV?a$Eix@sb|{psQVP_zvKOi_)UgywXPA~%v_%92
z_dYi?;%<Z(!(yfgE>R;SYNEurZ&81^CGwl3g5P=X@xb`Q@aNof?|t_y-*?V=y`|?$
zx<9;d@@)X)@sy4dGzU<On|0iRRT@_7+{8qz(a@s9i(7SQh>N%_fL5&aqfN&;td|Gv
z^5F)#>+mBXo1}=1B2pqcMRbYSBx18X+A>PRRviUs_G6o@+eO^&#}09KhivW?ty@En
zhMh-`wkt}DS>)*}Hj=SaXS{yXhB;f4DFw<J1^z@bo{DuPWE<lHbD%mr+uPaJ+QGZF
zj;`uNM`xEgPEAy-R-i9RY)ZAnYuei53XJ8AVl6d#U2JpAzzE!B;98Vw*k#~u>^9G;
z#lgi`Vqh976bvzUss+`lcwD~RBVw<Cd$3Q#egpU7J_T9RBa7CzC6jF(t&zq2P{aKO
z9>9YJ9+C$$QDNX=>@%CaMWwT4bAyOl5pzW>5YZ^&CK1cfYrf<yi<o%CfQd&HsFA9O
zfyeN;fhTalz?0amAi}sp#{<4nPq>&|0t#{^4QdAU5x9<Wq&Z&;Pl@s@6Dnm6(al8w
z15w7^V0b8Xlw%ZE(d0ex#AsAluMcX6m8dz--_R}JH}hpPUtW(f@RO_!7)wp%n;6DX
z^YUgHi)##g#BKp5P|IMBGcl2xMhgcVUw#5I36tp~8~ZSYw;ojTJ^<x!>{T>O<pJTB
zAb5NpW?rC!k?aXfYL-Z*({3f>mq>gF(N+~TmGPJHP9g!;xV~1nz7}G}zkM}2zDSal
za7dp(Hw}7TwYZ5`pp`g=atNC^RFH=OnB^MEgr^@ljJY4#cI0H)vUW&csziH(WlO}^
zct%>rd~KwFIc|JaPJAJrhyxFX64PpGs)Y*qynv|^scoM1W0~&>Ze_6NgVh#0f(h8C
zHk*E|a;?_8R%_{1tWKtd8fsoF#2|+;!9O4B1&nk&^&?~@C6Y0*R>dp7D(9+j^(aR~
zA}U3fVIA$V3QG!5F6>Y|QtLb!Y5ruiN;wS}xBe1|<-~ZN705)=IiH%3FPFMW)VoPk
zIY~rVOm^8xz!o%hm!V-Vi6?f$SXvT5wwaAtMYHNpV{$ax-v?h)rSA-~qS*mkKaEJV
z4}+U3y{9p_d{i2GdB|r;ugD|O*Wn4Lk=dJ>-)*I<LfUCIiIj5ovl&BpnuT|eu|Gqg
zo@IMK$DE!=175%qyvUY#nPj|zwK&9<IgA8e#TL9~Atj{EV&-)g24&3qMhAm!E(RMN
z4CaTh+GTPD>iMBvA7Q8$StuDA8ZIFrl(B6J^T+~6%YQJb%`Tjq-(;hrU4csQN>uXx
z7ZpO6Z}wz`yDwvMjF=oJCTU{Q#}H32k~fISNn&z}n7m0$-XbRN5R-R_$$P})ePZ$f
zF*$S9m^hGBGtHs63QRa@9Zc$2CjoM~!>r4hVAy3rT*6VG`Hfy=_T*%k-vtY;1Zy}y
zfsdHr$4u}OPTfyg3};EyXY8TRN#qwS;V+rwS4{G2CiyLs{GR{JACSb4Na1H}$1iS@
zbn24a<raF2!|^oE&4m`n!?3a&i>P|p-h-^__gRBsv=CnopF=!HELp$Em@b|0z&h(k
zfvg_zzh>u6{8ejAHcEx3p;p;zsQws&r%=$;hj4CT8bjC;MY%(-p%y-Y2$wX5r7?iV
z!_ED<h3&$8ku}_ZB{09SFMj9X|APbhPmY+sSf=N!grl}MCt<KEms&pnKc|EI3Osx{
XlaMWUirV@W)UckL81M=@@nGdY&(2WV

literal 4882
zcma)<d2AHd9ml`3-u156Ygh~h7IQ3T?6twvB#_$Ra0GK1<6vT9j=<PE*n@X>HoIf4
zG)Z%`Bqa%<Buz+~9_o=^QfZagX;2fXm7Jcc+N%AdmD;LmD>bTmL~5#51p58GnH?{_
zh%CK*Z|1!>zu)Kg{r%qakFLG(CV*S<au~~TxD3m1Zx}~#GzdM+L60=OK_tWQ!w4gY
zW771Mp&w=l$HN#vN*1JLVn*IsA!KE6pENmX^3vGS3`%oCnv>F;l9i`}I1@%S4u^2R
z{C-552SRvIKKYOgJ}SM3gLou}M>Y7&jD{6$Nuwdz-*d8|*Ggy2l#y#VmDO{3{_e8|
zjLcp`Pa3&q4W;YNjA^%MsIB>6OKQ6`__tU|L&NkoGh?(5rhAOsKD{T!CzWkhub%4C
zbEb^lhkm=?%xhRO`TqBGDAQ<8L>bwUv-)y+TEpU++R0b#%NYij_-+1bSaj2gJ~OGI
zEN`UEUMpo0QlKYg^$ut#Nm@2r!#bv++)5=oth{NPGDF*;A($;#Q_*Sby#u@Tta6M&
z*AQ0rZg%zw<!#+=GxKV*4BrNNj6R7*g__0H?pwc1)G*t7yx+9@JBtjH_w=dEo4|f%
zFuf_CH~Y9>sMpFQWxK-GTfFf!wS++_%q`X3ML}+`^;9-jSi?CoT+QvQtdY}gi?6gE
z4$X|s4aE&jFNDOMO_7aR-#BKxrT|6hjA5_Yaq}3K*&@n)r?cX8#yDlWi{n!SRaP`J
z4f(xJYcSVqv{L3Y*A>&M<N66bf*L#)!3x|G#K$7|IL>NVICW-3a5uUl*Z_iAF!@w!
zPBwpBnkORo1kMHVWCTy)Y34;symP?JX3b1rTtphg`3RoDg$O<=3pQbO1Q&5mLreur
zsb|cR2)4+qt<vm}X1g?P(sW95mo)pNxd+c`m?O?Mr1VT*L#LhNcQ+53DJFO!dJ1Pt
zJc8%&DQTXk+~XTKegT&vco8o}@M&QapVVQOs)p$3r}p$5H+rd(k{T%r%O+i`zV1{U
zCRm?gk0uzGGR6GV2zOX|vl7%Svm$yj*{0|1E&X&+^fiS>q(aD=BBMJ`=WT<frNkPf
z=~ZpY9n)&)AU2!u3_Z=FGIN5*suXZiiWyi{<18#fu0B+rFZQm2rnZ{7B3q|Q1tn-!
zWIdZTq<XBJ=o{lc>qeS3-!R{aO>^xO^Cc3Ja_xGWc~d2MIvQI?M%*=ITTWlYELP(Q
zW(3`Ru$V{Ia-Nnv2PEa#t6;wdwQLg{wZg|gAe<P6mZ*CTzHf2lLmk^`C}BH;2U#V`
zFcbA0&30yEC0237b!t~uB{X2Qv!`|p0nP_5C0>PZ2qo(i(RsrNbnhO)$%J2e?ITDh
zqSK_?<R5{~kC%2g1xBzx5e=)Sr6bst@TqQa1RJj)*nI{5?&#n!Lc=I)3dKV8LkP!0
zD^(lwJ3j&Er_}igs-Mf>MtNmq2o+*Z^$@0MmuXyya&aeJ6Q@Fmp$hX5=h2<Oe5}O+
z)`W%FiA6ZXr#%GOk0r3M6eo!E0YZI@IL~tSdG7Q);Rv2Xbo>y<A3`JdoQE{luvbDz
zIxj4ZM7bLKaT|L9tj8{XrxB&thK*RqUQnR9XhXPw+wox{jp7M3@vRTdd|w9beU^nF
zm;0n5x^et3H!S7ro>AtNLXXThlJ0atzAh1+RX|?n5xvhP8i)l*G#U#iq5+3!K*5_a
zF}y}Z_{G(9bPZ<Fy+w4ahAuVHnT<5QmFDlJ(H&@ENxTC``BWga(9$MC7f1nuU&ki`
zX*t2&!Jc3I@Gu<kFzn^}8!&XZ7+Aes43BU_5$!V1y`1A-8zEE*jq*Ct%`4a6ts7NA
zrTXMnN_{(Hwu5oLTNxU6_Hs>`!4wdaS=yOIn>|ye!FLri7?7)oI$_~C;o9><+7qBX
zTMJ?F?8-ZK?WSEbB{=ho@*!F;F{oD|sJ}dcY*(oK>L&RE<ae0l?qxn6VH}Q<xlZOu
z9#)2O;#L|^M-e&lqbVNQ4KCRj=ZRxJMsNl0WUoX?EduQtnuW3B7EeCMEiJ}9MQwfK
z+{%u+HA~zIJFa+6(A_GP^W|gR;~S?2@QtMLgpRjhIzMaD@#Azn%}8aKg%-<MjxOYB
zw#~d9r1PhkU8fnxGdPI*iReM%c*v6<P4_Sy@i4S|7`9Wqg5h?SwQcPAv6uD1$y>?7
zxhT1YS{Kb##8mX9B}85e-00WySL1A-syI$jEmcn*RhAI2ymc+{$*qD<q%8l<1>7|b
z@IV1@p^(-mq7{X#juYZ+RY+$SOK5VQt5D9boh8r5$@3h;|0HdAiXwWNNqL@Pc!o9b
z0&h9b@@n&($FH6>ai`+4mWjNJJyCg=$F$vJy1``{XJK$^q3~1EY8#anZ&8lt+ClCl
zb@1Xi&-)9W4`a?G(wd{Bbyp%9R73)A<Ca9UywI;sM0s}b$l>$piD;SAAHiZ$o7>$~
zI)XW_C>>xiIYuUwp>u3pBDNQa?PbdFGnC<HDZ|gx-7gT`7m4Rf1oCB8vR9D8S18J_
zQixx}!}vOZe}hH+n*@7VA>B@w?__4~Rv>dMFzxI~hF$cKp7W5N@nmXa59f(Y53<UN
zOvj1yeQa_P_<uaod~!*3CH4+MOVC=U1}*3FXs#ASH#V({j?@J21i-6g^BUQ_&I9v1
z<njh<(07?YZ?f{g#WeXI{r$f3UFwtEL!28$i0qtWFUBWMRchqv;z%b>fr`hDpEdAZ
z=eB_$_KK3oa6NFHrLOSAah$vR<c9A0{hsT0`#8VNQGvxKsZk%me<!8hrvE>n|39Yx
zKcW9WrJ+Bg7eD8j{R<u*zoh@aVp{#Wh(Wu@pw(k=o6Df7h{39xGnhLO1O9K~GWd_n
zV9z)P#|sPsDm!inzI%Q0u5eR`z=7}^LijBq{Ej!K-?Og$fzJMs2hpDx<Ug}U|AmtO
zD@FfK5rjP+gl!&#wJwBa55i&|cVmQ5@3~wM!h{g`pQH=nEhdg!H9A}f8=T*H?Yu8u
zL3Q^q=2tEl!a|<Kiz?&nRKJeJ{29U$-iP>fY4zt2kpq1tZ=~vkn}6f&a-phZe<y{1
zP?i6r{Qt%9ze}<In+g7&@;c$z;CfAKct4a|Ux??3B!Z7CH}d+_?H<bN{?|&qAK;{e
IO52D25A2oPb^rhX

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 6761f87..c97db4b 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 = parseNumExpr0()) != null) {
+			&& (numExpr = parseNumExpr()) != null) {
 			tree.addLastChild(id);
 			tree.addLastChild(assign);
 			tree.addLastChild(numExpr);
@@ -149,75 +149,60 @@ public class XParser {
 		return null;
 	}
 
-	private Tree parseNumExpr0() {
+	private Tree parseNumExpr() {
 		int oldPosition = in.getPosition();
 		Tree tree = new Tree(new Token(Token.EXPR));
-		Tree intConst, a, operator, b;
-
-		if ((intConst = parseNumExpr2()) != null) {
-			tree.addLastChild(intConst);
-			return tree;
-		}
-		in.setPosition(oldPosition);
+		Tree a, b, operator;
 
 		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)) {
+				&& (((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);
+		if ((a = parseNumExpr2()) != null) {
+			tree.addLastChild(a);
 			return tree;
 		}
-
-		if ((id = parseToken(Token.ID)) != null) {
-			tree.addLastChild(id);
-			return tree;
-		}
-
 		in.setPosition(oldPosition);
+
 		return null;
 	}
 
 	private Tree parseNumExpr2() {
 		int oldPosition = in.getPosition();
 		Tree tree = new Tree(new Token(Token.EXPR2));
-		Tree id, intConst;
+		Tree a, b, operator;
 
-		if ((intConst = parseNumExpr3()) != null) {
-			tree.addLastChild(intConst);
+		if (((a = parseNumExpr3()) != null)
+			&& (((operator = parseToken(Token.MULT)) != null
+				  || (operator = parseToken(Token.DIV)) != null))
+			&& (b = parseNumExpr2()) != null) {
+			tree.addLastChild(a);
+			tree.addLastChild(operator);
+			tree.addLastChild(b);
 			return tree;
 		}
 		in.setPosition(oldPosition);
 
-		if ((id = parseToken(Token.ID)) != null) {
-			tree.addLastChild(id);
+		if ((a = parseNumExpr3()) != null) {
+			tree.addLastChild(a);
 			return tree;
 		}
 		in.setPosition(oldPosition);
+
 		return null;
 	}
 
 	private Tree parseNumExpr3() {
 		int oldPosition = in.getPosition();
 		Tree tree = new Tree(new Token(Token.EXPR3));
-		Tree id, intConst;
+		Tree sign, intConst, id, num, lbr, rbr;
 
 		if ((intConst = parseToken(Token.INTCONST)) != null) {
 			tree.addLastChild(intConst);
@@ -225,6 +210,14 @@ public class XParser {
 		}
 		in.setPosition(oldPosition);
 
+		if (((sign = parseToken(Token.MINUS)) != null
+			&& ((intConst = parseToken(Token.INTCONST))) != null)) {
+			tree.addLastChild(sign);
+			tree.addLastChild(intConst);
+			return tree;
+		}
+		in.setPosition(oldPosition);
+
 		if ((id = parseToken(Token.ID)) != null) {
 			tree.addLastChild(id);
 			return tree;