Update on intexpr parsing after Florian patch

src/main/java/avatartranslator/AvatarTuple.java

@@ -60,11 +60,12 @@ public class AvatarTuple extends AvatarLeftHand {
 
     public static AvatarTuple createFromString (AvatarStateMachineOwner block, String toParse) {
         AvatarTuple result = null;
+        toParse = toParse.trim();
 
-        if (toParse.trim().startsWith("(")) {
+        if (toParse.startsWith("(")) {
             int indexLParen = toParse.indexOf ("(");
             int indexRParen = AvatarGuard.getMatchingRParen (toParse, indexLParen);
-            if (indexRParen < 0)
+            if (indexRParen != toParse.length () - 1)
                 return null;
             String[] components = toParse.substring (indexLParen+1, indexRParen).trim().split (",");
             boolean illFormed = false;

ttool/src/test/java/avatartranslator/AvatarIntegerExprParsingAndEvaluationTests.java

@@ -129,13 +129,15 @@ public class AvatarIntegerExprParsingAndEvaluationTests {
 
         testExpr("x = x + x*(y+z)*(x - z)", 570, true);
 
-        //testExpr("x = (x + y)*z", 30, true);
+        testExpr("x = (x + y)*z", 30, true);
 
-        //testExpr("x = (x + y)*z + (x+z)/z", 36, true);
+        testExpr("x = (x + y)*z + (x+z)/z", 36, true);
+
+        testExpr("x  = x*((x + y)*z + (x+z)/z)", 360, true);
+
+        testExpr("x  = x*((x + y)*z + (x+z)/z)/x", 36, true);
 
 
-        /*res= AvatarGuard.createFromString(A, "else");
-        assertTrue(res instanceof AvatarGuardElse);*/
     }