From 82214b5fdb8750df0a005a85fb10ec1290526aa3 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Wed, 16 Jan 2019 17:21:59 +0100
Subject: [PATCH] Resolving bool evaluation ticket 170
---
src/main/java/avatartranslator/AvatarSyntaxChecker.java | 8 ++++----
src/main/java/ui/AvatarDesignPanelTranslator.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/avatartranslator/AvatarSyntaxChecker.java b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
index 5a5f0aceda..a1eed679c8 100644
--- a/src/main/java/avatartranslator/AvatarSyntaxChecker.java
+++ b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
@@ -158,13 +158,13 @@ public class AvatarSyntaxChecker {
BoolExpressionEvaluator bee = new BoolExpressionEvaluator();
- //TraceManager.addDev("IsValidBoolExpr Evaluating bool:" + act);
- //boolean result = bee.getResultOf(act);
+ TraceManager.addDev("IsValidBoolExpr Evaluating bool:" + act);
+ boolean result = bee.getResultOf(act);
if (bee.getError() != null) {
- //TraceManager.addDev("Error: " + bee.getError());
+ TraceManager.addDev("Error in bool expr: " + bee.getError());
return -1;
} else {
- //TraceManager.addDev("IsValidBoolExpr ! (" + act + ")");
+ TraceManager.addDev("IsValidBoolExpr: YES (" + act + ")");
}
return 0;
diff --git a/src/main/java/ui/AvatarDesignPanelTranslator.java b/src/main/java/ui/AvatarDesignPanelTranslator.java
index 51303f8bb4..ed37a70f04 100644
--- a/src/main/java/ui/AvatarDesignPanelTranslator.java
+++ b/src/main/java/ui/AvatarDesignPanelTranslator.java
@@ -1969,7 +1969,7 @@ public class AvatarDesignPanelTranslator {
else {
// Variable assignment
- TraceManager.addDev("Action=" + actionText);
+ TraceManager.addDev("Action:" + actionText);
error = AvatarSyntaxChecker.isAValidVariableExpr( block.getAvatarSpecification(), block, actionText);
if ( error < 0 ) {
--
GitLab