Fixed conditionals

thiagobapt · Dec 4, 2024 · 3f38afb · 3f38afb
1 parent 1c0f51e
commit 3f38afb
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 33 deletions.
diff --git a/CheckLanguageWebsite/src/App.tsx b/CheckLanguageWebsite/src/App.tsx
@@ -32,6 +32,8 @@ let parserWithMetadata = parser.configure({
       Expression_Operator: t.arithmeticOperator,
       Term_Operator: t.arithmeticOperator,
       Comment: t.comment,
+      And: t.logicOperator,
+      Or: t.logicOperator,
       "( )": t.paren,
       "{ }": t.bracket,
       "= ; ,": t.operator,

diff --git a/CheckLanguageWebsite/src/CheckLang.terms.ts b/CheckLanguageWebsite/src/CheckLang.terms.ts
@@ -15,12 +15,14 @@ export const
   If_Statement = 20,
   Conditional = 21,
   Logical_Operator = 22,
-  Statement_List = 25,
-  Else_Statement = 26,
-  While_Statement = 27,
-  For_Statement = 28,
-  Initialization = 29,
-  Function_Declaration = 30,
-  Parameter_Declaration = 31,
-  Types = 32,
-  Return_Statement = 33
+  And = 23,
+  Or = 24,
+  Statement_List = 27,
+  Else_Statement = 28,
+  While_Statement = 29,
+  For_Statement = 30,
+  Initialization = 31,
+  Function_Declaration = 32,
+  Parameter_Declaration = 33,
+  Types = 34,
+  Return_Statement = 35
diff --git a/CheckLanguageWebsite/src/CheckLang.ts b/CheckLanguageWebsite/src/CheckLang.ts
@@ -2,19 +2,19 @@
 import {LRParser} from "@lezer/lr"
 export const parser = LRParser.deserialize({
   version: 14,
-  states: ".dQYQPOOO!QQPO'#DXO!cQPO'#CmOOQO'#DX'#DXO!cQPO'#DXO!wQPO'#DWO#]QPO'#DVO#nQPO'#CpO#sQPO'#CwO#xQPO'#CxO#}QPO'#CyO$SQPO'#CzO!cQPO'#C}OOQO'#DU'#DUO$XQPO'#DUOOQO'#DO'#DOQYQPOOO!cQPO,59RO!cQPO,58zO$oQPO'#DXO$yQPO,59XO%RQPO,59sO!cQPO,59rO!cQPO,59qO%WQPO,59[O%WQPO,59cO%lQPO,59dO%qQPO,59eO%vQPO,59fO%{QPO,59iOOQO,59p,59pOOQO-E6|-E6|O&QQPO'#CiO&YQPO1G.mO&_QPO1G.fO!cQPO'#DPO&dQPO1G.sOOQO1G.s1G.sOOQO1G/_1G/_OOQO1G/^1G/^OOQO1G/]1G/]O&lQQO'#DXO&yQQO'#DWO'bQQO'#DVO'vQQO'#D[O'{QQO'#DZO(ZQQO'#CqO(fQPO1G.vO(kQPO1G.}O(pQPO'#C`O(uQPO1G/OO!cQPO1G/PO(zQQO1G/QOOQO1G/T1G/TO)PQPO,59TOOQO7+$X7+$XOOQO7+$Q7+$QOOQO,59k,59kOOQO-E6}-E6}OOQO7+$_7+$_O%WQPO,59vO%WQPO,59uO%WQPO,59]O)XQPO7+$bO)^QPO7+$iO%WQPO7+$jO)cQPO7+$kO)hQPO'#C{O)mQPO7+$lOOQO1G/b1G/bOOQO1G/a1G/aOOQO1G.w1G.wO)rQPO'#CuO)yQPO<<G|OYQPO<<HTO*}QPO<<HUOOQO<<HV<<HVO+SQPO,59gO)XQPO<<HWOOQO,59a,59aO+[QPO,59aO)XQPO'#CvOOQOAN=hAN=hO+cQPOAN=oOYQPOAN=pO+hQQO'#DQO+mQPO1G/ROOQOAN=rAN=rOOQO1G.{1G.{OOQO,59b,59bOOQOG23ZG23ZO+uQPOG23[O+zQPO,59lOOQO-E7O-E7OO)XQPOLD(vOOQO1G/W1G/WOOQO!$'Lb!$'LbO%WQPO,59rO%WQPO,59qO!cQPO,59vO,PQQO'#D[O%WQPO,59uO,UQQO'#DZ",
-  stateData: ",l~OwOSPOS~OTPOVROWROXRO[SO`QO|VO!SWO!TXO!UYO!VZO!W[O~OUbO[aOR{Xb{Xc{X~OTcOVROWROXRO[SO`QO~ObfORzXczX^zX_zXYzX~OcgORyX^yX_yXYyX~O[hO~O[iO~O[jO~OTkO~OTlO~ORnO~O[aOb{Xc{XY{XR{X~O^{X_{X~P$^O^sO_uO~OYvO~OTyOVROWROXRO[SO`QO~OT!RO~OU!TO~O[!UO~OR!VO~O^sOY]X~OY!XO~OR!YO~O^sO_!]O~Of{X!P{X!Q{X~P$^Ob#TOczXfzXYzX!PzX!QzXRzX~Oc#UOfyXYyX!PyX!QyXRyX~Of!^O~O!P!_OY}X!Q}XR}X~O!Q!`OYeXReX~OY!aO~OY!bO~OUbO~OR!cO~Op!eO~O^sOY]a~Oh!jO~Oh!lO~OR!nO~OT!oO~OY!pO~Og!qO~PYO!R!sOTdyVdyWdyXdy[dy`dyudy|dy!Sdy!Tdy!Udy!Vdy!WdygdyYdy~OR!vO~O^!wOYoa~Og!zO~PYOg!|O~Op#OO~O^!wOYoi~OY#QO~OT#RO~Of#VO~O!P#XOY}XR}X~O!S|!R!T!U!V!WXT!U~",
-  goto: "'X!PPPPP!QPPPPPP!]P!xPPP!]PP!{#TPPP#^#j!{!{!{!{#mP!{#p#z$UPPP$[$h%e&SP&s&{[]O`!j!l!r!vR!Sj!TROQS[`abfghis!T!^!_!`!c!j!l!r!v#T#U#V#XRqa]]O`!j!l!r!vQ!PhQ!QiR!m!cQ!k!aQ!y!pQ!{!sR#S#QR!t!kR!f!UQ`OSo`!rR!r!jQtdQ!WpT![t!WQ!x!oR#P!xW_O`!j!rQ!u!lR!}!v[^O`!j!l!r!vQdQQeSQm[QpaQrbY|hi!_!`!cQ!ZsQ!d!TS!g!^#VR#W#XlUOQS[`abs!T!j!l!r!v#VSxg#U_{hi!^!_!`!c#XnTOQS[`abgs!T!j!l!r!v#VSwf#Tazhi!^!_!`!c#U#XU!Ohi!cR!i!`U}hi!cS!h!_#XR#Y!`",
-  nodeNames: "⚠ Comment Program ; Assignment Name = Number String Boolean ) Function_Call ( Parameter , ] [ Array Term_Operator Expression_Operator If_Statement Conditional Logical_Operator } { Statement_List Else_Statement While_Statement For_Statement Initialization Function_Declaration Parameter_Declaration Types Return_Statement",
+  states: "-zQYQPOOO!QQPO'#DZO!cQPO'#CmOOQO'#DZ'#DZO!cQPO'#DZO!wQPO'#DYO#cQPO'#DXO#zQPO'#CpO$PQPO'#CyO$UQPO'#CzO$ZQPO'#C{O$`QPO'#C|O!cQPO'#DPOOQO'#DW'#DWO$eQPO'#DWOOQO'#DQ'#DQQYQPOOO!cQPO,59RO!cQPO,58zO$jQPO'#DZO%XQPO,59XO%aQPO,59uO!cQPO,59tO!cQPO,59sO%fQPO,59[O%fQPO,59eO%zQPO,59fO&PQPO,59gO&UQPO,59hO&ZQPO,59kOOQO,59r,59rOOQO-E7O-E7OO&`QPO'#CiO&hQPO1G.mO&mQPO1G.fO!cQPO'#DRO&rQPO1G.sOOQO1G.s1G.sOOQO1G/a1G/aOOQO1G/`1G/`OOQO1G/_1G/_O&zQQO'#DZO'YQQO'#DYO'eQQO'#DXO'mQQO'#D^O'rQPO'#D]O(QQPO'#CqO(]QPO1G.vO(bQPO1G/PO(gQPO'#C`O(lQPO1G/QO!cQPO1G/RO(qQQO1G/SOOQO1G/V1G/VO(vQPO,59TOOQO7+$X7+$XOOQO7+$Q7+$QOOQO,59m,59mOOQO-E7P-E7POOQO7+$_7+$_O!cQPO,59xO%fQPO,59wO%fQPO,59]O)OQPO7+$bO)TQPO7+$kO%fQPO7+$lO)YQPO7+$mO)_QPO'#C}O)dQPO7+$nOOQO1G/d1G/dOOQO1G/c1G/cOOQO1G.w1G.wO)iQPO'#CwO)pQPO<<G|OYQPO<<HVO*tQPO<<HWOOQO<<HX<<HXO*yQPO,59iO)OQPO<<HYOOQO,59c,59cO+RQPO,59cO)OQPO'#CxOOQOAN=hAN=hO+YQPOAN=qOYQPOAN=rO+_QQO'#DSO+dQPO1G/TOOQOAN=tAN=tOOQO1G.}1G.}OOQO,59d,59dOOQOG23]G23]O+lQPOG23^O+qQPO,59nOOQO-E7Q-E7QO)OQPOLD(xOOQO1G/Y1G/YOOQO!$'Ld!$'LdO%fQPO,59tO%fQPO,59s",
+  stateData: ",R~OyOSPOS~OTPOVROWROXRO[SO`QO!OVO!SWO!TXO!UYO!VZO!W[O~OUbO[aOR}Xb}Xc}X~OTcOVROWROXRO[SO`QO~ObfOR|Xc|X^|X_|XY|Xg|Xh|X~OcgOR{X^{X_{XY{Xg{Xh{X~O[hO~O[iO~O[jO~OTkO~OTlO~ORnO~O[aO^}X_}Xb}Xc}XY}XR}Xg}Xh}X~O^sO_uO~OYvO~OTyOVROWROXRO[SO`QO~OT!RO~OU!TO~O[!UO~OR!VO~O^sOY]X~OY!XO~OR!YO~O^sO_!]O~O[aOb}Xc}Xf}X~Ob#TOc|Xf|X~Oc#UOf{X~Of!^O~Og!_OY!PXh!PXR!PX~Oh!`OYeXReX~OY!aO~OY!bO~OUbO~OR!cO~Or!eO~O^sOY]a~Oj!jO~Oj!lO~OR!nO~OT!oO~OY!pO~Oi!qO~PYO!R!sOTdyVdyWdyXdy[dy`dywdy!Ody!Sdy!Tdy!Udy!Vdy!WdyidyYdy~OR!vO~O^!wOYqa~Oi!zO~PYOi!|O~Or#OO~O^!wOYqi~OY#QO~OT#RO~O!S!O!R!T!U!V!WXT!U~",
+  goto: "&|!RPPPP!SPPPPPP!_P!xPPP!_PP!{#TPPPPP#^#j!{!{!{!{#mP!{#p#z$UPPP$[$h%a%|P&k&s[]O`!j!l!r!vR!Sj!PROQS[`abfghis!T!^!_!`!c!j!l!r!v#T#URqa]]O`!j!l!r!vQ!PhQ!QiR!m!cQ!k!aQ!y!pQ!{!sR#S#QR!t!kR!f!UQ`OSo`!rR!r!jQtdQ!WpT![t!WQ!x!oR#P!xW_O`!j!rQ!u!lR!}!v[^O`!j!l!r!vQdQQeSQm[QpaQrbY|hi!_!`!cQ!ZsQ!d!TR!g!^lUOQS[`abs!T!^!j!l!r!vSxg#UZ{hi!_!`!cnTOQS[`abgs!T!^!j!l!r!vSwf#T]zhi!_!`!c#UU!Ohi!cR!i!`W}hi!`!cR!h!_",
+  nodeNames: "⚠ Comment Program ; Assignment Name = Number String Boolean ) Function_Call ( Parameter , ] [ Array Term_Operator Expression_Operator If_Statement Conditional Logical_Operator And Or } { Statement_List Else_Statement While_Statement For_Statement Initialization Function_Declaration Parameter_Declaration Types Return_Statement",
   maxTerm: 54,
   nodeProps: [
-    ["openedBy", 15,"[",23,"{"],
-    ["closedBy", 16,"]",24,"}"]
+    ["openedBy", 15,"[",25,"{"],
+    ["closedBy", 16,"]",26,"}"]
   ],
   skippedNodes: [0,1],
   repeatNodeCount: 3,
-  tokenData: "EQ~R!QX^$Xpq$Xqr$|rs%Xuv%vxy%{yz&Qz{%v{|&V|}&[}!O&V!P!Q&a!Q!['a!]!^'i!^!_'n!_!`'v!`!a'n!c!}(O!}#O(a#P#Q(f#T#U(k#U#V+}#V#X(O#X#Y-f#Y#Z/b#Z#](O#]#^6_#^#b(O#b#c7Z#c#d9r#d#f(O#f#g:n#g#h=j#h#i@R#i#j(O#j#kAR#k#lBc#l#o(O#o#pDv#q#rD{#y#z$X$f$g$X#BY#BZ$X$IS$I_$X$I|$JO$X$JT$JU$X$KV$KW$X&FU&FV$X~$^Yw~X^$Xpq$X#y#z$X$f$g$X#BY#BZ$X$IS$I_$X$I|$JO$X$JT$JU$X$KV$KW$X&FU&FV$XQ%PP!_!`%SQ%XOfQ~%[TOr%Xrs%ks;'S%X;'S;=`%p<%lO%X~%pOW~~%sP;=`<%l%X~%{Ob~~&QO[~~&VOY~~&[Oc~~&aO^~~&fPb~z{&i~&lUOz&iz{'O{!P&i!Q;'S&i;'S;=`'Z<%lO&i~'RP!P!Q'U~'ZOP~~'^P;=`<%l&i~'fPV~!Q!['a~'nOR~Q'sPfQ!_!`%SR'{PUP!_!`%SP(TSTP!Q![(O!c!}(O#R#S(O#T#o(O~(fO`~~(kO_~R(pWTP!Q![(O!c!}(O#R#S(O#T#b(O#b#c)Y#c#f(O#f#g*U#g#o(OR)_UTP!Q![(O!c!}(O#R#S(O#T#W(O#W#X)q#X#o(OR)xS!PQTP!Q![(O!c!}(O#R#S(O#T#o(OR*ZUTP!Q![(O!c!}(O#R#S(O#T#f(O#f#g*m#g#o(OR*rTTP!Q![(O!c!}(O#R#S(O#T#U+R#U#o(OR+WUTP!Q![(O!c!}(O#R#S(O#T#m(O#m#n+j#n#o(OR+qSpQTP!Q![(O!c!}(O#R#S(O#T#o(OR,SUTP!Q![(O!c!}(O#R#S(O#T#c(O#c#d,f#d#o(OR,kUTP!Q![(O!c!}(O#R#S(O#T#c(O#c#d,}#d#o(OR-SUTP!Q![(O!c!}(O#R#S(O#T#`(O#`#a+j#a#o(O~-kUTP!Q![(O!c!}(O#R#S(O#T#`(O#`#a-}#a#o(O~.SUTP!Q![(O!c!}(O#R#S(O#T#g(O#g#h.f#h#o(O~.kUTP!Q![(O!c!}(O#R#S(O#T#X(O#X#Y.}#Y#o(O~/US!R~TP!Q![(O!c!}(O#R#S(O#T#o(O~/gXTP!Q![(O!c!}(O#R#S(O#T#U0S#U#c(O#c#d2O#d#i(O#i#j2z#j#o(O~0XUTP!Q![(O!c!}(O#R#S(O#T#`(O#`#a0k#a#o(O~0pUTP!Q![(O!c!}(O#R#S(O#T#g(O#g#h1S#h#o(O~1XUTP!Q![(O!c!}(O#R#S(O#T#X(O#X#Y1k#Y#o(O~1rSX~TP!Q![(O!c!}(O#R#S(O#T#o(O~2TUTP!Q![(O!c!}(O#R#S(O#T#f(O#f#g2g#g#o(O~2nS!T~TP!Q![(O!c!}(O#R#S(O#T#o(O~3PUTP!Q![(O!c!}(O#R#S(O#T#b(O#b#c3c#c#o(O~3hUTP!Q![(O!c!}(O#R#S(O#T#V(O#V#W3z#W#o(O~4PUTP!Q![(O!c!}(O#R#S(O#T#h(O#h#i4c#i#o(O~4hUTP!Q![(O!c!}(O#R#S(O#T#](O#]#^4z#^#o(O~5PUTP!Q![(O!c!}(O#R#S(O#T#c(O#c#d5c#d#o(O~5hUTP!Q![(O!c!}(O#R#S(O#T#b(O#b#c5z#c#o(O~6RS!V~TP!Q![(O!c!}(O#R#S(O#T#o(O~6dUTP!Q![(O!c!}(O#R#S(O#T#Y(O#Y#Z6v#Z#o(O~6}S|~TP!Q![(O!c!}(O#R#S(O#T#o(OR7`UTP!Q![(O!c!}(O#R#S(O#T#i(O#i#j7r#j#o(OR7wUTP!Q![(O!c!}(O#R#S(O#T#a(O#a#b8Z#b#o(OR8`UTP!Q![(O!c!}(O#R#S(O#T#U(O#U#V8r#V#o(OR8wUTP!Q![(O!c!}(O#R#S(O#T#X(O#X#Y9Z#Y#o(OR9`UTP!Q![(O!c!}(O#R#S(O#T#f(O#f#g+j#g#o(OR9wUTP!Q![(O!c!}(O#R#S(O#T#f(O#f#g:Z#g#o(OR:bS!QQTP!Q![(O!c!}(O#R#S(O#T#o(O~:sUTP!Q![(O!c!}(O#R#S(O#T#X(O#X#Y;V#Y#o(O~;[UTP!Q![(O!c!}(O#R#S(O#T#h(O#h#i;n#i#o(O~;sUTP!Q![(O!c!}(O#R#S(O#T#i(O#i#j<V#j#o(O~<[UTP!Q![(O!c!}(O#R#S(O#T#f(O#f#g<n#g#o(O~<sUTP!Q![(O!c!}(O#R#S(O#T#b(O#b#c=V#c#o(O~=^S!W~TP!Q![(O!c!}(O#R#S(O#T#o(OR=oUTP!Q![(O!c!}(O#R#S(O#T#h(O#h#i>R#i#o(OR>WUTP!Q![(O!c!}(O#R#S(O#T#f(O#f#g>j#g#o(OR>oUTP!Q![(O!c!}(O#R#S(O#T#](O#]#^?R#^#o(OR?WUTP!Q![(O!c!}(O#R#S(O#T#b(O#b#c?j#c#o(OR?oUTP!Q![(O!c!}(O#R#S(O#T#Z(O#Z#[+j#[#o(O~@WUTP!Q![(O!c!}(O#R#S(O#T#f(O#f#g@j#g#o(O~@oUTP!Q![(O!c!}(O#R#S(O#T#i(O#i#j1S#j#o(O~AWTTP!Q![(O!c!}(O#R#S(O#T#UAg#U#o(O~AlUTP!Q![(O!c!}(O#R#S(O#T#f(O#f#gBO#g#o(O~BVS!U~TP!Q![(O!c!}(O#R#S(O#T#o(O~BhUTP!Q![(O!c!}(O#R#S(O#T#[(O#[#]Bz#]#o(O~CPUTP!Q![(O!c!}(O#R#S(O#T#](O#]#^Cc#^#o(O~ChUTP!Q![(O!c!}(O#R#S(O#T#`(O#`#aCz#a#o(O~DPUTP!Q![(O!c!}(O#R#S(O#T#X(O#X#YDc#Y#o(O~DjS!S~TP!Q![(O!c!}(O#R#S(O#T#o(O~D{Oh~~EQOg~",
+  tokenData: "Cm~R!RX^$[pq$[qr%Prs%[uv%yvw&Oxy&Zyz&`z{%y{|&e|}&j}!O&e!P!Q&o!Q!['o!]!^'w!^!_'|!_!`(U!`!a'|!c!}(^!}#O(o#P#Q(t#T#U(y#U#V+Z#V#X(^#X#Y,r#Y#Z.n#Z#](^#]#^5k#^#b(^#b#c6g#c#f(^#f#g9O#g#h;z#h#i>c#i#j(^#j#k?c#k#l@s#l#o(^#o#pCW#p#qC]#q#rCh#y#z$[$f$g$[#BY#BZ$[$IS$I_$[$I|$JO$[$JT$JU$[$KV$KW$[&FU&FV$[~$aYy~X^$[pq$[#y#z$[$f$g$[#BY#BZ$[$IS$I_$[$I|$JO$[$JT$JU$[$KV$KW$[&FU&FV$[Q%SP!_!`%VQ%[OfQ~%_TOr%[rs%ns;'S%[;'S;=`%s<%lO%[~%sOW~~%vP;=`<%l%[~&OOb~~&RPvw&U~&ZOg~~&`O[~~&eOY~~&jOc~~&oO^~~&tPb~z{&w~&zUOz&wz{'^{!P&w!Q;'S&w;'S;=`'i<%lO&w~'aP!P!Q'd~'iOP~~'lP;=`<%l&w~'tPV~!Q!['o~'|OR~Q(RPfQ!_!`%VR(ZPUP!_!`%VP(cSTP!Q![(^!c!}(^#R#S(^#T#o(^~(tO`~~(yO_~R)OUTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g)b#g#o(^R)gUTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g)y#g#o(^R*OTTP!Q![(^!c!}(^#R#S(^#T#U*_#U#o(^R*dUTP!Q![(^!c!}(^#R#S(^#T#m(^#m#n*v#n#o(^R*}SrQTP!Q![(^!c!}(^#R#S(^#T#o(^R+`UTP!Q![(^!c!}(^#R#S(^#T#c(^#c#d+r#d#o(^R+wUTP!Q![(^!c!}(^#R#S(^#T#c(^#c#d,Z#d#o(^R,`UTP!Q![(^!c!}(^#R#S(^#T#`(^#`#a*v#a#o(^~,wUTP!Q![(^!c!}(^#R#S(^#T#`(^#`#a-Z#a#o(^~-`UTP!Q![(^!c!}(^#R#S(^#T#g(^#g#h-r#h#o(^~-wUTP!Q![(^!c!}(^#R#S(^#T#X(^#X#Y.Z#Y#o(^~.bS!R~TP!Q![(^!c!}(^#R#S(^#T#o(^~.sXTP!Q![(^!c!}(^#R#S(^#T#U/`#U#c(^#c#d1[#d#i(^#i#j2W#j#o(^~/eUTP!Q![(^!c!}(^#R#S(^#T#`(^#`#a/w#a#o(^~/|UTP!Q![(^!c!}(^#R#S(^#T#g(^#g#h0`#h#o(^~0eUTP!Q![(^!c!}(^#R#S(^#T#X(^#X#Y0w#Y#o(^~1OSX~TP!Q![(^!c!}(^#R#S(^#T#o(^~1aUTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g1s#g#o(^~1zS!T~TP!Q![(^!c!}(^#R#S(^#T#o(^~2]UTP!Q![(^!c!}(^#R#S(^#T#b(^#b#c2o#c#o(^~2tUTP!Q![(^!c!}(^#R#S(^#T#V(^#V#W3W#W#o(^~3]UTP!Q![(^!c!}(^#R#S(^#T#h(^#h#i3o#i#o(^~3tUTP!Q![(^!c!}(^#R#S(^#T#](^#]#^4W#^#o(^~4]UTP!Q![(^!c!}(^#R#S(^#T#c(^#c#d4o#d#o(^~4tUTP!Q![(^!c!}(^#R#S(^#T#b(^#b#c5W#c#o(^~5_S!V~TP!Q![(^!c!}(^#R#S(^#T#o(^~5pUTP!Q![(^!c!}(^#R#S(^#T#Y(^#Y#Z6S#Z#o(^~6ZS!O~TP!Q![(^!c!}(^#R#S(^#T#o(^R6lUTP!Q![(^!c!}(^#R#S(^#T#i(^#i#j7O#j#o(^R7TUTP!Q![(^!c!}(^#R#S(^#T#a(^#a#b7g#b#o(^R7lUTP!Q![(^!c!}(^#R#S(^#T#U(^#U#V8O#V#o(^R8TUTP!Q![(^!c!}(^#R#S(^#T#X(^#X#Y8g#Y#o(^R8lUTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g*v#g#o(^~9TUTP!Q![(^!c!}(^#R#S(^#T#X(^#X#Y9g#Y#o(^~9lUTP!Q![(^!c!}(^#R#S(^#T#h(^#h#i:O#i#o(^~:TUTP!Q![(^!c!}(^#R#S(^#T#i(^#i#j:g#j#o(^~:lUTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g;O#g#o(^~;TUTP!Q![(^!c!}(^#R#S(^#T#b(^#b#c;g#c#o(^~;nS!W~TP!Q![(^!c!}(^#R#S(^#T#o(^R<PUTP!Q![(^!c!}(^#R#S(^#T#h(^#h#i<c#i#o(^R<hUTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g<z#g#o(^R=PUTP!Q![(^!c!}(^#R#S(^#T#](^#]#^=c#^#o(^R=hUTP!Q![(^!c!}(^#R#S(^#T#b(^#b#c=z#c#o(^R>PUTP!Q![(^!c!}(^#R#S(^#T#Z(^#Z#[*v#[#o(^~>hUTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g>z#g#o(^~?PUTP!Q![(^!c!}(^#R#S(^#T#i(^#i#j0`#j#o(^~?hTTP!Q![(^!c!}(^#R#S(^#T#U?w#U#o(^~?|UTP!Q![(^!c!}(^#R#S(^#T#f(^#f#g@`#g#o(^~@gS!U~TP!Q![(^!c!}(^#R#S(^#T#o(^~@xUTP!Q![(^!c!}(^#R#S(^#T#[(^#[#]A[#]#o(^~AaUTP!Q![(^!c!}(^#R#S(^#T#](^#]#^As#^#o(^~AxUTP!Q![(^!c!}(^#R#S(^#T#`(^#`#aB[#a#o(^~BaUTP!Q![(^!c!}(^#R#S(^#T#X(^#X#YBs#Y#o(^~BzS!S~TP!Q![(^!c!}(^#R#S(^#T#o(^~C]Oj~~C`P#p#qCc~ChOh~~CmOi~",
   tokenizers: [0, 1],
   topRules: {"Program":[0,2]},
-  tokenPrec: 523
+  tokenPrec: 498
 })
diff --git a/gramatica.txt b/gramatica.txt
@@ -25,8 +25,8 @@
                             | <array>
                             | <function>
                             | "(" <expression> ")"
-<conditional>            ::= <bool_term> { ("or") <bool_term> }
-<bool_term>              ::= <bool_factor> { ("and") <bool_factor> }
+<conditional>            ::= <bool_term> ( "||" <bool_term> )
+<bool_term>              ::= <bool_factor> ( "&&" <bool_factor> )
 <bool_factor>            ::= <expression> <relational_operator> <expression>
 <relational_operator>    ::= "==" | "!=" | "<" | "<=" | ">" | ">=" | "||" | "&&"
 <number>                 ::= [0-9]+

diff --git a/src/CheckLang.grammar b/src/CheckLang.grammar
@@ -34,9 +34,9 @@ factor { Number | Name | String | Boolean | Function_Call | Array | "(" expressi
 
 Array { "[" expression ("," expression)* "]" }
 
-Conditional { bool_term ( "or" bool_term )? }
+Conditional { bool_term ( Or bool_term )? }
 
-bool_term { bool_factor ( "and" bool_factor )? }
+bool_term { bool_factor ( And bool_factor )? }
 
 bool_factor { expression Logical_Operator expression }
 
@@ -51,6 +51,8 @@ bool_factor { expression Logical_Operator expression }
   String { '"' (!["])* '"' }
   space { @whitespace+ }
   Comment { "/*" (![*/])*  "*/" }
+  Or { "||" }
+  And { "&&" }
   Logical_Operator { "==" | "!=" | "<" | "<=" | ">" | ">=" }
   Expression_Operator { "+" | "-" }
   Term_Operator { "*" | "/" | "%" }

diff --git a/src/parser.ts b/src/parser.ts
@@ -21,8 +21,7 @@ export class Parser {
     }
   }
 
-  // parte nova 
-  private conditional(): ASTNode {
+  private bool_factor(): ASTNode {
     const left = this.expr();
 
     switch(this.currentToken.type) {
@@ -62,19 +61,32 @@ export class Parser {
         const right = this.expr();
         return new ConditionalNode(left, "<=", right, this.lexer.getCurrentLine(), this.lexer.getCurrentLineChar());
       }
+    }
 
-      case TokenType.And: {
-        this.eat(this.currentToken.type);
-        const right = this.expr();
-        return new ConditionalNode(left, "&&", right, this.lexer.getCurrentLine(), this.lexer.getCurrentLineChar());
-      }
+    return left;
+  }
 
-      case TokenType.Or: {
-        this.eat(this.currentToken.type);
-        const right = this.expr();
-        return new ConditionalNode(left, "||", right, this.lexer.getCurrentLine(), this.lexer.getCurrentLineChar());
-      }
+  private bool_term(): ASTNode {
+    let left = this.bool_factor();
 
+    while(
+      this.currentToken.type === TokenType.And
+    ) {
+      this.eat(TokenType.And);
+      left = new ConditionalNode(left, TokenType.And, this.bool_factor(), this.lexer.getCurrentLine(), this.lexer.getCurrentLineChar());
+    }
+
+    return left;
+  }
+
+  private conditional(): ASTNode {
+    let left = this.bool_term();
+
+    while(
+      this.currentToken.type === TokenType.Or
+    ) {
+      this.eat(TokenType.Or);
+      left = new ConditionalNode(left, TokenType.Or, this.bool_term(), this.lexer.getCurrentLine(), this.lexer.getCurrentLineChar());
     }
 
     return left;