Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle

CppCXY · CppCXY · commit 0730a1915041 · 2022-01-24T11:45:09.000+08:00
diff --git a/LuaParser/src/LuaTokenParser.cpp b/LuaParser/src/LuaTokenParser.cpp
@@ -1,5 +1,6 @@
 ﻿#include "LuaParser/LuaTokenParser.h"
 #include <limits>
+#include <cstdlib>
 #include "LuaDefine.h"
 #include "LuaParser/LuaIdentify.h"
 #include "LuaParser/LuaTokenTypeDetail.h"
@@ -520,8 +521,9 @@ LuaTokenType LuaTokenParser::ReadNumeral()
 			break;
 		}
 	}
-
-	if (lislalpha(GetCurrentChar())) /* is numeral touching a letter? */
+	
+	// fix bug:这里不能使用lislalpha,否则会错误的解析下一个unicode字符
+	if (std::isalpha(GetCurrentChar())) /* is numeral touching a letter? */
 	{
 		// luajit
 		if (CheckNext1('U'))

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#include "LuaParser/LuaTokenParser.h"`
`2`	`2`	`#include <limits>`
	`3`	`+#include <cstdlib>`
`3`	`4`	`#include "LuaDefine.h"`
`4`	`5`	`#include "LuaParser/LuaIdentify.h"`
`5`	`6`	`#include "LuaParser/LuaTokenTypeDetail.h"`
`@@ -520,8 +521,9 @@ LuaTokenType LuaTokenParser::ReadNumeral()`
`520`	`521`	`break;`
`521`	`522`	`}`
`522`	`523`	`}`
`523`		`-`
`524`		`- if (lislalpha(GetCurrentChar())) /* is numeral touching a letter? */`
	`524`	`+`
	`525`	`+ // fix bug:这里不能使用lislalpha,否则会错误的解析下一个unicode字符`
	`526`	`+ if (std::isalpha(GetCurrentChar())) /* is numeral touching a letter? */`
`525`	`527`	`{`
`526`	`528`	`// luajit`
`527`	`529`	`if (CheckNext1('U'))`