ajuste no parsing

Author: nathaliafab

Imperativa1/src/li1/plp/expressions2/expression/ExpTernaria.java

@@ -32,7 +32,7 @@ public abstract class ExpTernaria implements Expressao {
 	private String operador1;
 
 	/**
-	 * Operador 1 desta expressao ternaria
+	 * Operador 2 desta expressao ternaria
 	 */
 	private String operador2;
 

Imperativa1/src/li1/plp/imperative1/parser/Imperative1.jj

@@ -539,14 +539,29 @@ Expressao PExpBinaria() :
 	}
 }
 
+Expressao PExpBase() :
+{
+    Expressao retorno;
+}
+{
+    (
+        LOOKAHEAD (2) 
+            retorno = PExpUnaria()
+      | LOOKAHEAD (PExpPrimaria() (<OR> | <AND> | <MINUS> | <PLUS> | <EQ>| <CONCAT>)) 
+            retorno = PExpBinaria()
+      | retorno = PExpPrimaria()
+    )
+    { return retorno; }
+}
+
 Expressao PExpTernaria() :
 {
 	Expressao esq;
 	Expressao mei;
 	Expressao dir;
 }
 {
-	esq = PExpPrimaria()
+	esq = PExpBase()
 	<HOOK>
 	mei = PExpressao()
 	<COLON>
@@ -562,7 +577,7 @@ ExpSoma PExpSoma() :
 {
 	esq = PExpPrimaria()
 	<PLUS>
-	dir = PExpressao()
+	dir = PExpBase()
 	{return new ExpSoma(esq, dir);}
 }
 
@@ -574,7 +589,7 @@ ExpSub PExpSub() :
 {
 	esq = PExpPrimaria()
 	<MINUS>
-	dir = PExpressao()
+	dir = PExpBase()
 	{return new ExpSub(esq, dir);}
 }
 
@@ -587,7 +602,7 @@ ExpAnd PExpAnd() :
 {
 	esq = PExpPrimaria()
 	<AND>
-	dir = PExpressao()
+	dir = PExpBase()
 	{return new ExpAnd(esq, dir);}
 }
 
@@ -600,7 +615,7 @@ ExpOr PExpOr() :
 {
 	esq = PExpPrimaria()
 	<OR>
-	dir = PExpressao()
+	dir = PExpBase()
 	{return new ExpOr(esq, dir);}
 }
 
@@ -612,7 +627,7 @@ ExpEquals PExpEquals() :
 {
 	esq = PExpPrimaria()
 	<EQ>
-	dir = PExpressao()
+	dir = PExpBase()
 	{return new ExpEquals(esq, dir);}
 }
 
@@ -625,7 +640,7 @@ ExpConcat PExpConcat() :
 {
 	esq = PExpPrimaria()
 	<CONCAT>
-	dir = PExpressao()
+	dir = PExpBase()
 	{return new ExpConcat(esq, dir);}
 }
 
@@ -635,15 +650,10 @@ Expressao PExpressao() :
 }
 {
 	(
-	    LOOKAHEAD (PExpPrimaria() <HOOK>) 
+	    LOOKAHEAD (PExpBase() <HOOK>) 
 			retorno = PExpTernaria()
 	  |
-	    LOOKAHEAD (2) 
-	  		retorno = PExpUnaria()
-	  | LOOKAHEAD (PExpPrimaria() (<OR> | <AND> | <MINUS> | <PLUS> | <EQ>| <CONCAT>)) 
-	  		retorno = PExpBinaria()
-	  |
-	    retorno = PExpPrimaria()
+	    retorno = PExpBase()
 	)
 	{
 		return retorno;