amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 14:07:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing issues on linux: iswalpha and friends don't work correctly on non-ascii characters.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-18 01:01:57 +02:00
parent efa1db8789
commit 0d38c64e86
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/parser.cpp
+11 -2
View File
@@ -119,8 +119,17 @@ class TokenIterator {
// ----------------------------------------------------------------------------- : Characters // ----------------------------------------------------------------------------- : Characters
bool isUnicodeAlpha(Char c) {
#if wxMSW
return false;
#else
// libc's iswalpha doesn't work on non-ascii characters. For the parser let's just say that anything >=128 is alphabetic
return c >= 128;
#endif
}
bool isAlpha_(Char c) { return isAlpha(c) || c==_('_'); } bool isAlpha_(Char c) { return isAlpha(c) || c==_('_'); }
bool isAlnum_(Char c) { return isAlnum(c) || c==_('_'); } bool isAlnum_(Char c) { return isAlnum(c) || c==_('_') || isUnicodeAlpha(c); }
bool isOper (Char c) { return wxStrchr(_("+-*/!.@%^&:=<>;,"),c) != nullptr; } bool isOper (Char c) { return wxStrchr(_("+-*/!.@%^&:=<>;,"),c) != nullptr; }
bool isLparen(Char c) { return c==_('(') || c==_('[') || c==_('{'); } bool isLparen(Char c) { return c==_('(') || c==_('[') || c==_('{'); }
bool isRparen(Char c) { return c==_(')') || c==_(']') || c==_('}'); } bool isRparen(Char c) { return c==_(')') || c==_(']') || c==_('}'); }
@@ -207,7 +216,7 @@ void TokenIterator::readToken() {
InputStreamP is = package_manager.openFileFromPackage(package, include_file); InputStreamP is = package_manager.openFileFromPackage(package, include_file);
eat_utf8_bom(*is); eat_utf8_bom(*is);
input = read_utf8_line(*is, true); input = read_utf8_line(*is, true);
} else if (isAlpha(c) || c == _('_') || (isDigit(c) && !buffer.empty() && buffer.back() == _("."))) { } else if (isAlpha(c) || isUnicodeAlpha(c) || c == _('_') || (isDigit(c) && !buffer.empty() && buffer.back() == _("."))) {
// name, or a number after a . token, as in array.0 // name, or a number after a . token, as in array.0
size_t start = pos - 1; size_t start = pos - 1;
while (pos < input.size() && isAlnum_(input.GetChar(pos))) ++pos; while (pos < input.size() && isAlnum_(input.GetChar(pos))) ++pos;