Identifiers may not end with an underscore

2 files changed, 10 insertions, 2 deletions

diff --git a/src/core/common/Utils.cpp b/src/core/common/Utils.cpp
index a87ff6d..67920c2 100644
--- a/src/core/common/Utils.cpp
+++ b/src/core/common/Utils.cpp
@@ -36,7 +36,7 @@ bool Utils::isIdentifier(const std::string &name)
 		}
 		first = false;
 	}
-	return !first;
+	return !first && isIdentifierEndCharacter(name.back());
 }
 
 bool Utils::isIdentifierOrEmpty(const std::string &name)
@@ -150,4 +150,4 @@ bool Utils::isUserDefinedToken(const std::string &token)
 	}
 	return false;
 }
-}
\ No newline at end of file
+}
diff --git a/src/core/common/Utils.hpp b/src/core/common/Utils.hpp
index d9e26da..c3b49a0 100644
--- a/src/core/common/Utils.hpp
+++ b/src/core/common/Utils.hpp
@@ -66,6 +66,14 @@ public:
 	}
 
 	/**
+	 * Returns true if the given character is in [A-Za-z0-9].
+	 */
+	static bool isIdentifierEndCharacter(const char c)
+	{
+		return isAlphanumeric(c);
+	}
+
+	/**
 	 * Returns true if the given character is in [A-Za-z0-9_-].
 	 */
 	static bool isIdentifierCharacter(const char c)