add a integer to binary string function

2 files changed, 168 insertions, 134 deletions

diff --git a/src/uscxml/util/String.cpp b/src/uscxml/util/String.cpp
index 6a80756..2183ba8 100644
--- a/src/uscxml/util/String.cpp
+++ b/src/uscxml/util/String.cpp
@@ -25,174 +25,203 @@ namespace uscxml {
 
 #define ISWHITESPACE(char) (isspace(char))
 
-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 (('0' <= c && c <= '9') || ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') || c == '_') {
-			returnValue += c;
-		} else {
-			specialChars += c;
+	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 (('0' <= c && c <= '9') || ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') || c == '_') {
+				returnValue += c;
+			} else {
+				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;
 	}
-	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;
-}
-
-std::list<std::string> tokenize(const std::string& line, const char sep, bool trimWhiteSpace) {
-	std::list<std::string> tokens;
-
-	// appr. 3x faster than stringstream
-	size_t start = 0;
-	for (size_t i = 0; i < line.size(); i++) {
-		if (line[i] == sep || (trimWhiteSpace && ISWHITESPACE(line[i]))) {
-			if (i > 0 && start < i) {
-				tokens.push_back(line.substr(start, i - start));
-			}
-			while(line[i] == sep || (trimWhiteSpace && ISWHITESPACE(line[i]))) {
-				i++;    // skip multiple occurences of seperator and whitespaces
+
+	std::string toBinStr(size_t val, size_t margin) {
+		// inspired by http://www.cplusplus.com/forum/general/65862/
+		
+		// mask has only the leftmost bit set.
+		size_t mask = 1u << (std::numeric_limits<unsigned>::digits - 1);
+
+		// skip leading bits that are not set.
+		while (0 == (val & mask) && mask != 0)
+			mask >>= 1; // shift all bits to the right by 1
+
+		std::string binStr;
+		binStr.reserve(std::numeric_limits<unsigned>::digits + 1);
+
+		do {
+			// add a '1' or '0' depending the current bit.
+			binStr += static_cast<char>(val & mask) + '0';
+
+		} while ((mask >>= 1) != 0); // next bit, when mask is 0 we've processed all bits
+
+		// fill with leading 0
+		if (binStr.size() < margin) {
+			for (size_t i = 0; i < (margin - binStr.size()); i++) {
+				binStr = "0" + binStr;
 			}
-			start = i;
-		} else if (i + 1 == line.size()) {
-			tokens.push_back(line.substr(start, i + 1 - start));
 		}
+
+		return binStr;
 	}
 
-	return tokens;
-}
+	std::list<std::string> tokenize(const std::string &line, const char sep, bool trimWhiteSpace) {
+		std::list<std::string> tokens;
+
+		// appr. 3x faster than stringstream
+		size_t start = 0;
+		for (size_t i = 0; i < line.size(); i++) {
+			if (line[i] == sep || (trimWhiteSpace && ISWHITESPACE(line[i]))) {
+				if (i > 0 && start < i) {
+					tokens.push_back(line.substr(start, i - start));
+				}
+				while (line[i] == sep || (trimWhiteSpace && ISWHITESPACE(line[i]))) {
+					i++;    // skip multiple occurences of seperator and whitespaces
+				}
+				start = i;
+			} else if (i + 1 == line.size()) {
+				tokens.push_back(line.substr(start, i + 1 - start));
+			}
+		}
+
+		return tokens;
+	}
 
-std::string spaceNormalize(const std::string& text) {
-	std::stringstream content;
+	std::string spaceNormalize(const std::string &text) {
+		std::stringstream content;
 
 #if 1
-	// 195ms with test-performance-events.scml
-	std::string seperator;
-
-	size_t start = 0;
-	for (size_t i = 0; i < text.size(); i++) {
-		if (isspace(text[i])) {
-			if (i > 0 && start < i) {
-				content << seperator << text.substr(start, i - start);
-				seperator = " ";
+		// 195ms with test-performance-events.scml
+		std::string seperator;
+
+		size_t start = 0;
+		for (size_t i = 0; i < text.size(); i++) {
+			if (isspace(text[i])) {
+				if (i > 0 && start < i) {
+					content << seperator << text.substr(start, i - start);
+					seperator = " ";
+				}
+				while (isspace(text[++i])); // skip whitespaces
+				start = i;
+			} else if (i + 1 == text.size()) {
+				content << seperator << text.substr(start, i + 1 - start);
 			}
-			while(isspace(text[++i])); // skip whitespaces
-			start = i;
-		} else if (i + 1 == text.size()) {
-			content << seperator << text.substr(start, i + 1 - start);
 		}
-	}
 //	std::cerr << ">>" << content.str() << "<<" << std::endl;
 
 #else
 
-// 291ms with test-performance-events.scml
-	std::istringstream iss(text);
-	std::string seperator;
-	do {
-		std::string token;
-		iss >> token;
-		if (token.length() > 0) {
-			content << seperator << token;
-			seperator = " ";
-		}
-	} while (iss);
+		// 291ms with test-performance-events.scml
+			std::istringstream iss(text);
+			std::string seperator;
+			do {
+				std::string token;
+				iss >> token;
+				if (token.length() > 0) {
+					content << seperator << token;
+					seperator = " ";
+				}
+			} while (iss);
 
 #endif
-	return content.str();
-}
+		return content.str();
+	}
 
 // see: http://www.w3.org/TR/scxml/#EventDescriptors
-bool nameMatch(const std::string& eventDescs, const std::string& eventName) {
+	bool nameMatch(const std::string &eventDescs, const std::string &eventName) {
 #if 1
-	if(eventDescs.length() == 0 || eventName.length() == 0)
-		return false;
+		if (eventDescs.length() == 0 || eventName.length() == 0)
+			return false;
 
-	// naive case of single descriptor and exact match
-	if (boost::iequals(eventDescs, eventName))
-		return true;
+		// naive case of single descriptor and exact match
+		if (boost::iequals(eventDescs, eventName))
+			return true;
 
-	size_t start = 0;
-	std::string eventDesc;
-	for (size_t i = 0; i < eventDescs.size(); i++) {
-		if (isspace(eventDescs[i])) {
-			if (i > 0 && start < i - 1) {
-				eventDesc = eventDescs.substr(start, i - start);
+		size_t start = 0;
+		std::string eventDesc;
+		for (size_t i = 0; i < eventDescs.size(); i++) {
+			if (isspace(eventDescs[i])) {
+				if (i > 0 && start < i - 1) {
+					eventDesc = eventDescs.substr(start, i - start);
+				}
+				while (isspace(eventDescs[++i])); // skip whitespaces
+				start = i;
+			} else if (i + 1 == eventDescs.size()) {
+				eventDesc = eventDescs.substr(start, i + 1 - start);
 			}
-			while(isspace(eventDescs[++i])); // skip whitespaces
-			start = i;
-		} else if (i + 1 == eventDescs.size()) {
-			eventDesc = eventDescs.substr(start, i + 1 - start);
-		}
 
-		if (eventDesc.size() > 0) {
-			// remove optional trailing .* for CCXML compatibility
-			if (eventDesc.find("*", eventDesc.size() - 1) != std::string::npos)
-				eventDesc = eventDesc.substr(0, eventDesc.size() - 1);
-			if (eventDesc.find(".", eventDesc.size() - 1) != std::string::npos)
-				eventDesc = eventDesc.substr(0, eventDesc.size() - 1);
+			if (eventDesc.size() > 0) {
+				// remove optional trailing .* for CCXML compatibility
+				if (eventDesc.find("*", eventDesc.size() - 1) != std::string::npos)
+					eventDesc = eventDesc.substr(0, eventDesc.size() - 1);
+				if (eventDesc.find(".", eventDesc.size() - 1) != std::string::npos)
+					eventDesc = eventDesc.substr(0, eventDesc.size() - 1);
 
-			// was eventDesc the * wildcard
-			if (eventDesc.size() == 0)
-				return true;
-
-			// eventDesc has to be a real prefix of event now and therefore shorter
-			if (eventDesc.size() > eventName.size())
-				goto NEXT_DESC;
+				// was eventDesc the * wildcard
+				if (eventDesc.size() == 0)
+					return true;
 
-			// are they already equal?
-			if (boost::iequals(eventDesc, eventName))
-				return true;
+				// eventDesc has to be a real prefix of event now and therefore shorter
+				if (eventDesc.size() > eventName.size())
+					goto NEXT_DESC;
 
-			if (eventName.find(eventDesc) == 0) {
-				if (eventName.find(".", eventDesc.size()) == eventDesc.size())
+				// are they already equal?
+				if (boost::iequals(eventDesc, eventName))
 					return true;
+
+				if (eventName.find(eventDesc) == 0) {
+					if (eventName.find(".", eventDesc.size()) == eventDesc.size())
+						return true;
+				}
+				NEXT_DESC:
+				eventDesc = "";
 			}
-NEXT_DESC:
-			eventDesc = "";
 		}
-	}
-	return false;
+		return false;
 #else
-	const char* dPtr = eventDescs.c_str();
-	const char* ePtr = eventName.c_str();
-	while(*dPtr != 0) {
+		const char* dPtr = eventDescs.c_str();
+		const char* ePtr = eventName.c_str();
+		while(*dPtr != 0) {
 
-		if (*dPtr == '*' && *ePtr != 0) // something following
-			return true;
+			if (*dPtr == '*' && *ePtr != 0) // something following
+				return true;
 
-		// descriptor differs from event name
-		if (*dPtr != *ePtr) {
-			// move to next descriptor
-			while(*dPtr != ' ' && *dPtr != 0) {
+			// descriptor differs from event name
+			if (*dPtr != *ePtr) {
+				// move to next descriptor
+				while(*dPtr != ' ' && *dPtr != 0) {
+					dPtr++;
+				}
+				if (*dPtr == 0)
+					return false;
+				dPtr++;
+				ePtr = eventName.c_str();
+			} else {
+				// move both pointers one character
 				dPtr++;
+				ePtr++;
+
 			}
-			if (*dPtr == 0)
-				return false;
-			dPtr++;
-			ePtr = eventName.c_str();
-		} else {
-			// move both pointers one character
-			dPtr++;
-			ePtr++;
 
+			// descriptor is done, return match
+			if (((*dPtr == 0 || *dPtr == ' ') && (*ePtr == 0 || *ePtr == ' ')) || // exact match, end of string
+					(*dPtr == ' ' && *ePtr == '.') || (*dPtr == 0 && *ePtr == '.')) // prefix match
+				return true;
 		}
-
-		// descriptor is done, return match
-		if (((*dPtr == 0 || *dPtr == ' ') && (*ePtr == 0 || *ePtr == ' ')) || // exact match, end of string
-		        (*dPtr == ' ' && *ePtr == '.') || (*dPtr == 0 && *ePtr == '.')) // prefix match
-			return true;
-	}
-	return false;
+		return false;
 #endif
-}
+	}
 
 
 }
\ No newline at end of file
diff --git a/src/uscxml/util/String.h b/src/uscxml/util/String.h
index 8d9c9ef..91b8462 100644
--- a/src/uscxml/util/String.h
+++ b/src/uscxml/util/String.h
@@ -25,10 +25,15 @@
 
 namespace uscxml {
 
-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);
+	std::string escapeMacro(std::string const &s);
+
+	std::string toBinStr(size_t val, size_t margin);
+
+	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);
 
 }