improved excapeMacro to produce vhdl supported names

2 files changed, 12 insertions, 17 deletions

diff --git a/src/uscxml/util/String.cpp b/src/uscxml/util/String.cpp
index f189140..ae1aa68 100644
--- a/src/uscxml/util/String.cpp
+++ b/src/uscxml/util/String.cpp
@@ -25,31 +25,26 @@ namespace uscxml {
 
 #define ISWHITESPACE(char) (isspace(char))
 
-std::string escapedMacro(std::string const& s) {
+std::string escapeMacro(std::string const &s) {
     // inspired by http://stackoverflow.com/questions/2417588/escaping-a-c-string
     std::string returnValue="";
+	std::string specialChars="";
     for (std::string::const_iterator iter = s.begin(), end = s.end(); iter != end; ++iter) {
         char c = *iter;
-        if (' ' <= c && c <= '~' && c != '\\' && c != '"') {
+        if (('0' <= c && c <= '9') || ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') || c == '_') {
             returnValue += c;
         }
         else {
-            returnValue += "_";
-            switch(c) {
-                case '"':  returnValue += "COLON";  break;
-                case '\\': returnValue += "BACHSLASH"; break;
-                case '\t': returnValue += "TAB";  break;
-                case '\r': returnValue += "RETURN";  break;
-                case '\n': returnValue += "NEWLINE";  break;
-                default:
-                    char const* const hexdig = "0123456789ABCDEF";
-                    returnValue += 'x';
-                    returnValue += hexdig[c >> 4];
-                    returnValue += hexdig[c & 0xF];
-            }
-            returnValue += "_";
+            specialChars += c;
         }
     }
+	if (!specialChars.empty()){
+		// http://www.cplusplus.com/reference/functional/hash/
+		// returns the same result for a given string within one execution
+		std::hash<std::string> strHash;
+		returnValue += "_";
+		returnValue += strHash(specialChars);
+	}
     return returnValue;
 }
 
diff --git a/src/uscxml/util/String.h b/src/uscxml/util/String.h
index 9acd288..8d9c9ef 100644
--- a/src/uscxml/util/String.h
+++ b/src/uscxml/util/String.h
@@ -25,7 +25,7 @@
 
 namespace uscxml {
 
-std::string escapedMacro(std::string const& s);
+std::string escapeMacro(std::string const &s);
 std::list<std::string> tokenize(const std::string& line, const char seperator = ' ', bool trimWhiteSpace = true);
 std::string spaceNormalize(const std::string& text);
 bool nameMatch(const std::string& eventDescs, const std::string& event);