Merge pull request #12 from flodavid/compilateur

Parenthesis available in conditionnalExpression and added in BooleanE…

Author: flodavid

src/EZ_language_compiler.ypp

@@ -861,11 +861,7 @@ conditionalExpression:
     debugYacc("BooleanExpression from variable "+ $1, AT);
     $$ = new BooleanExpression($1);
   }
-// | LEFT_PARENTHESIS conditionalExpression RIGHT_PARENTHESIS {
-//     TranslatedNode* parenthCond= new TranslatedNode("("+ $2->translate() +")");
-//     delete $2;
-//     $$ = parenthCond;
-//   }
+| LEFT_PARENTHESIS conditionalExpression RIGHT_PARENTHESIS { $$ = $2; }
 | conditionalExpression logicalOperator conditionalExpression {
     BooleanExpression* expr= new BooleanExpression($2,$1,$3);
     $$ = expr;
@@ -1015,12 +1011,6 @@ integerExpression:
 | NAME        { $$ = new TranslatedNode($1); }
 ;
 
-// numberExpression:
-//   NUM_INTEGER { /* $$ = Integer(to_string($1)); */ }
-// | NUM_REAL    { /* $$ = Real($1); */ }
-// | NAME        { /* $$ = String($1); */ }
-// ;
-
 /* ******************
  *    OPERATORS     *
  * ******************/

src/instructions/If.cpp

@@ -18,9 +18,7 @@ If::~If()
 
 string If::preTranslate() const
 {
-    string res="if(" + mCondition->translate() + ") ";
-
-    res+= "{\n";
+    string res="if " + mCondition->translate() + " {\n";
 
     // the instructions are in the left_son (the first one IS the left son)
 

src/instructions/Repeat.cpp

@@ -19,5 +19,5 @@ string Repeat::preTranslate() const
 
 string Repeat::postTranslate() const
 {
-    return "} while(" + mCondition->translate() + ");\n";
+    return "} while " + mCondition->translate() + ";\n";
 }

src/instructions/While.cpp

@@ -14,7 +14,7 @@ While::~While()
 
 
 string While::preTranslate() const {
-    return "while (" + mCondition->translate() + ") {\n";
+    return "while " + mCondition->translate() + " {\n";
 }
 
 string While::postTranslate() const

src/modules/BooleanExpression.cpp

@@ -29,21 +29,27 @@ BooleanExpression::~BooleanExpression()
 }
 
 string BooleanExpression::preTranslate() const {
-    string res= "";
+    string res= "( ";
 
     if (value != "") {
         debug("Cond. Expr., just value", AT);
         res+= value;
     } else {
         // Two operandes case
         if(left_part != nullptr) {
-            debug("Cond. Expr.: binary operator", AT);
             res+= left_part->translate() +" ";
         }
-        if(right_part != nullptr && mOperator != nullptr) res+= mOperator->translate() + " "+ right_part->translate();
+        if(right_part != nullptr && mOperator != nullptr) {
+            debug("Cond. Expr.: binary operator", AT);
+            res+= mOperator->translate() + " "+ right_part->translate();
+        }
         // There is no right part or operator whereas there is a left part
         else error("BooleanExpression is not correctly initialized (no operator or right part)", AT);
+        
     }
+
+    res+= " )";
+    
     return res;
 
 }

tests/1_main_simple.ez

@@ -64,4 +64,18 @@ a multiple lines comment
     m is map of <string, integer>
     s is set of string
 
+
+    if true or true and false
+    then print "Cond expr with no parenthesis priority working"
+    else print "Cond expr with no parenthesis priority not working"
+    end if
+    
+    if (false and true) or true
+    then print "Cond expr with parenthesis left first working"
+    end if
+
+    if true or (true and false)
+    then print "Cond expr with parenthesis right first working"
+    end if
+
 end