Changed definition of identifier (do not allow them to start with an underscore)

2 files changed, 14 insertions, 6 deletions

diff --git a/src/core/common/Utils.cpp b/src/core/common/Utils.cpp
index e5e2d39..563fe2a 100644
--- a/src/core/common/Utils.cpp
+++ b/src/core/common/Utils.cpp
@@ -35,10 +35,10 @@ bool Utils::isIdentifier(const std::string &name)
 {
 	bool first = true;
 	for (char c : name) {
-		if (first && !(isAlphabetic(c) || c == '_')) {
+		if (first && !isIdentifierStartCharacter(c)) {
 			return false;
 		}
-		if (!first && !(isAlphanumeric(c) || c == '_' || c == '-')) {
+		if (!first && !isIdentifierCharacter(c)) {
 			return false;
 		}
 		first = false;
diff --git a/src/core/common/Utils.hpp b/src/core/common/Utils.hpp
index 457d446..2c8a5b3 100644
--- a/src/core/common/Utils.hpp
+++ b/src/core/common/Utils.hpp
@@ -58,15 +58,23 @@ public:
 	}
 
 	/**
-	 * Returns true if the given character is in [A-Za-z_]
+	 * Returns true if the given character is in [A-Za-z].
 	 */
-	static bool isIdentifierStart(const char c)
+	static bool isIdentifierStartCharacter(const char c)
 	{
-		return isAlphabetic(c) || (c == '_');
+		return isAlphabetic(c);
 	}
 
 	/**
-	 * Returns true if the given character is in [A-Za-z_][A-Za-z0-9_-]*
+	 * Returns true if the given character is in [A-Za-z0-9_-].
+	 */
+	static bool isIdentifierCharacter(const char c)
+	{
+		return isAlphanumeric(c) || (c == '_') || (c == '-');
+	}
+
+	/**
+	 * Returns true if the given character is in [A-Za-z][A-Za-z0-9_-]*
 	 */
 	static bool isIdentifier(const std::string &name);