From 88a062f8e69f6ebdf8c251396154b0145b9aa50f Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 15 May 2014 13:56:38 +0000
Subject: [PATCH]
---
executablecode/Makefile.src | 2 +-
src/avatartranslator/AvatarStateMachine.java | 4 ++--
src/myutil/BoolExpressionEvaluator.java | 4 ++++
src/tmltranslator/tmlcp/TMLSDInstance.java | 1 +
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 28b9acb23f..1a5aafcafa 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/RemoteControl.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c generated_src/WirelessInterface.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/MicroWaveOven.c generated_src/WirelessInterface.c generated_src/Door.c generated_src/Magnetron.c generated_src/Controller.c generated_src/ControlPanel.c generated_src/Bell.c generated_src/RemoteControl.c
\ No newline at end of file
diff --git a/src/avatartranslator/AvatarStateMachine.java b/src/avatartranslator/AvatarStateMachine.java
index 54de45e09f..eb90fee668 100644
--- a/src/avatartranslator/AvatarStateMachine.java
+++ b/src/avatartranslator/AvatarStateMachine.java
@@ -111,8 +111,8 @@ public class AvatarStateMachine extends AvatarElement {
LinkedList<AvatarStateMachineElement> toRemove = new LinkedList<AvatarStateMachineElement>();
while((at = getCompositeTransition()) != null) {
- //TraceManager.addDev("*** Found composite transition: " + at.toString());
- //TraceManager.addDev(_block.toString());
+ TraceManager.addDev("*** Found composite transition: " + at.toString());
+ TraceManager.addDev(_block.toString());
if (!(toRemove.contains(getPreviousElementOf(at)))) {
toRemove.add(getPreviousElementOf(at));
}
diff --git a/src/myutil/BoolExpressionEvaluator.java b/src/myutil/BoolExpressionEvaluator.java
index 114ae48859..61aa88b858 100755
--- a/src/myutil/BoolExpressionEvaluator.java
+++ b/src/myutil/BoolExpressionEvaluator.java
@@ -557,7 +557,11 @@ public class BoolExpressionEvaluator {
currentType = WHITE_SPACE_TOKEN;
TraceManager.addDev("White space found: looping");
computeNextToken1();
+ return;
}
+
+ // Invalid token
+ errorMessage = "Unknown element: " + s;
}
diff --git a/src/tmltranslator/tmlcp/TMLSDInstance.java b/src/tmltranslator/tmlcp/TMLSDInstance.java
index 275a347d9b..e30002db01 100755
--- a/src/tmltranslator/tmlcp/TMLSDInstance.java
+++ b/src/tmltranslator/tmlcp/TMLSDInstance.java
@@ -52,6 +52,7 @@ import java.util.*;
import myutil.*;
public class TMLSDInstance extends TMLElement {
+
private ArrayList<TMLSDElement> elements;
public TMLSDInstance(String _name, Object _referenceObject) {
--
GitLab