Fix assert failure in math parser, as C functions can't handle code p…

…oints >= 255
GrammarSoft · Jun 27, 2024 · 6eb3e40 · 6eb3e40
1 parent 9eb7e54
commit 6eb3e40
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/MathParser.hpp b/src/MathParser.hpp
@@ -273,15 +273,15 @@ inline void MathParser::get_token() {
 		token = exp_ptr.substr(0, 1);
 		exp_ptr.remove_prefix(1);
 	}
-	else if (isalpha(exp_ptr[0])) {
+	else if (ISALPHA_C(exp_ptr[0])) {
 		token = exp_ptr.substr(0, exp_ptr.find_first_of(u" +-/*%^=()"));
 		exp_ptr.remove_prefix(token.size());
 		while (ISSPACE(exp_ptr[0])) {
 			exp_ptr.remove_prefix(1);
 		}
 		tok_type = (exp_ptr[0] == '(') ? FUNCTION : VARIABLE;
 	}
-	else if (isdigit(exp_ptr[0]) || exp_ptr[0] == '.') {
+	else if (ISDIGIT_C(exp_ptr[0]) || exp_ptr[0] == '.') {
 		token = exp_ptr.substr(0, exp_ptr.find_first_of(u" +-/*%^=()"));
 		exp_ptr.remove_prefix(token.size());
 		tok_type = NUMBER;

diff --git a/src/inlines.hpp b/src/inlines.hpp
@@ -315,6 +315,16 @@ inline bool ISSPACE(const Char* p) {
 	return ISSPACE(*p) && !ISESC(p);
 }
 
+template<typename Char>
+inline bool ISALPHA_C(Char p) {
+	return (p < 255) && isalpha(p);
+}
+
+template<typename Char>
+inline bool ISDIGIT_C(Char p) {
+	return (p < 255) && isdigit(p);
+}
+
 template<typename Char, typename C, size_t N>
 inline size_t IS_ICASE(const Char* p, const C (&uc)[N], const C (&lc)[N]) {
 	// N - 1 due to null terminator for string constants

diff --git a/src/version.hpp b/src/version.hpp
@@ -27,7 +27,7 @@ constexpr auto CG3_COPYRIGHT_STRING = "Copyright (C) 2007-2024 GrammarSoft ApS.
 
 constexpr uint32_t CG3_VERSION_MAJOR = 1;
 constexpr uint32_t CG3_VERSION_MINOR = 4;
-constexpr uint32_t CG3_VERSION_PATCH = 12;
+constexpr uint32_t CG3_VERSION_PATCH = 13;
 constexpr uint32_t CG3_REVISION = 13898;
 constexpr uint32_t CG3_FEATURE_REV = 13898;
 constexpr uint32_t CG3_TOO_OLD = 10373;