From 90bdaec058948f00d11ccfe955ce252ace045929 Mon Sep 17 00:00:00 2001
From: Li Jin <dragon-fly@qq.com>
Date: Thu, 28 Jan 2021 18:05:58 +0800
Subject: fix issue #37.
---
MoonPlus.vcxproj | 8 ++++----
src/MoonP/moon_compiler.cpp | 2 +-
src/MoonP/parser.hpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MoonPlus.vcxproj b/MoonPlus.vcxproj
index b176a12..d01007c 100644
--- a/MoonPlus.vcxproj
+++ b/MoonPlus.vcxproj
@@ -112,10 +112,10 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;LUA_COMPAT_5_2;LUA_COMPAT_5_1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>.\src;.\src\lua-5.3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\src;.\src\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
@@ -148,10 +148,10 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;LUA_COMPAT_5_2;LUA_COMPAT_5_1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>.\src;.\src\lua-5.3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\src;.\src\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
diff --git a/src/MoonP/moon_compiler.cpp b/src/MoonP/moon_compiler.cpp
index e8649ae..fcdde59 100644
--- a/src/MoonP/moon_compiler.cpp
+++ b/src/MoonP/moon_compiler.cpp
@@ -53,7 +53,7 @@ inline std::string s(std::string_view sv) {
return std::string(sv);
}
-const std::string_view version = "0.4.23"sv;
+const std::string_view version = "0.4.24"sv;
const std::string_view extension = "mp"sv;
class MoonCompilerImpl {
diff --git a/src/MoonP/parser.hpp b/src/MoonP/parser.hpp
index 14abe1a..f70475f 100644
--- a/src/MoonP/parser.hpp
+++ b/src/MoonP/parser.hpp
@@ -31,7 +31,7 @@ namespace parserlib {
///type of the parser's input.
typedef std::basic_string<wchar_t> input;
typedef input::iterator input_it;
-typedef std::wstring_convert<std::codecvt_utf8<input::value_type>> Converter;
+typedef std::wstring_convert<std::codecvt_utf8_utf16<input::value_type>> Converter;
class _private;
class _expr;
--
cgit v1.2.3-55-g6feb