No commit message

No commit message

executablecode/Makefile.src

-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

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));
 			}

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;
 	}
 	
 	

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) {