Various extensions and bug-fixes

1 files changed, 9 insertions, 1 deletions

diff --git a/src/uscxml/transform/ChartToPromela.h b/src/uscxml/transform/ChartToPromela.h
index 1b0b16d..9c3c99b 100644
--- a/src/uscxml/transform/ChartToPromela.h
+++ b/src/uscxml/transform/ChartToPromela.h
@@ -205,6 +205,9 @@ public:
 		return false;
 	}
 
+    std::string getTypeAssignment(const std::string& varTo, const std::string& varFrom, const PromelaTypedef& type, const std::string padding = "");
+    std::string getTypeReset(const std::string& var, const PromelaTypedef& type, const std::string padding = "");
+    
 	bool usesInPredicate() {
 		return _usesInPredicate;
 	}
@@ -248,6 +251,10 @@ public:
 		return _typeDefs;
 	}
 
+    PromelaTypedef& getType(const std::string& typeName) {
+        return _typeDefs.types.at(typeName);
+    }
+
 protected:
 	std::string createMacroName(const std::string& literal);
 	int enumerateLiteral(const std::string& literal, int forceIndex = -1);
@@ -372,7 +379,8 @@ protected:
 	//void writeRemovePendingEventsFromInvoker(std::ostream& stream, ChartToPromela* invoker, int indent = 0, bool atomic = true);
 	
 	void writeDetermineShortestDelay(std::ostream& stream, int indent = 0);
-	void writeAdvanceTime(std::ostream& stream, int indent = 0);
+    void writeInsertWithDelay(std::ostream& stream, int indent = 0);
+    void writeAdvanceTime(std::ostream& stream, int indent = 0);
 	void writeRescheduleProcess(std::ostream& stream, int indent = 0);
 	void writeScheduleMachines(std::ostream& stream, int indent = 0);
 	void writeCancelEvents(std::ostream& stream, int indent = 0);