aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Jin <dragon-fly@qq.com>2021-01-28 18:05:58 +0800
committerLi Jin <dragon-fly@qq.com>2021-01-28 18:05:58 +0800
commit90bdaec058948f00d11ccfe955ce252ace045929 (patch)
tree02c4c00126d74a891ba194b6953e6cb00cb53753
parent236bcc6e10f59b9336603571f1683cbe4aa411a9 (diff)
downloadyuescript-90bdaec058948f00d11ccfe955ce252ace045929.tar.gz
yuescript-90bdaec058948f00d11ccfe955ce252ace045929.tar.bz2
yuescript-90bdaec058948f00d11ccfe955ce252ace045929.zip
fix issue #37.
-rw-r--r--MoonPlus.vcxproj8
-rw-r--r--src/MoonP/moon_compiler.cpp2
-rw-r--r--src/MoonP/parser.hpp2
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 @@
112 <ClCompile> 112 <ClCompile>
113 <WarningLevel>Level3</WarningLevel> 113 <WarningLevel>Level3</WarningLevel>
114 <SDLCheck>true</SDLCheck> 114 <SDLCheck>true</SDLCheck>
115 <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;LUA_COMPAT_5_2;LUA_COMPAT_5_1;%(PreprocessorDefinitions)</PreprocessorDefinitions> 115 <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116 <ConformanceMode>true</ConformanceMode> 116 <ConformanceMode>true</ConformanceMode>
117 <LanguageStandard>stdcpplatest</LanguageStandard> 117 <LanguageStandard>stdcpplatest</LanguageStandard>
118 <AdditionalIncludeDirectories>.\src;.\src\lua-5.3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 118 <AdditionalIncludeDirectories>.\src;.\src\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119 <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> 119 <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
120 </ClCompile> 120 </ClCompile>
121 <Link> 121 <Link>
@@ -148,10 +148,10 @@
148 <FunctionLevelLinking>true</FunctionLevelLinking> 148 <FunctionLevelLinking>true</FunctionLevelLinking>
149 <IntrinsicFunctions>true</IntrinsicFunctions> 149 <IntrinsicFunctions>true</IntrinsicFunctions>
150 <SDLCheck>true</SDLCheck> 150 <SDLCheck>true</SDLCheck>
151 <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;LUA_COMPAT_5_2;LUA_COMPAT_5_1;%(PreprocessorDefinitions)</PreprocessorDefinitions> 151 <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152 <ConformanceMode>true</ConformanceMode> 152 <ConformanceMode>true</ConformanceMode>
153 <LanguageStandard>stdcpplatest</LanguageStandard> 153 <LanguageStandard>stdcpplatest</LanguageStandard>
154 <AdditionalIncludeDirectories>.\src;.\src\lua-5.3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 154 <AdditionalIncludeDirectories>.\src;.\src\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155 <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> 155 <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
156 </ClCompile> 156 </ClCompile>
157 <Link> 157 <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) {
53 return std::string(sv); 53 return std::string(sv);
54} 54}
55 55
56const std::string_view version = "0.4.23"sv; 56const std::string_view version = "0.4.24"sv;
57const std::string_view extension = "mp"sv; 57const std::string_view extension = "mp"sv;
58 58
59class MoonCompilerImpl { 59class 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 {
31///type of the parser's input. 31///type of the parser's input.
32typedef std::basic_string<wchar_t> input; 32typedef std::basic_string<wchar_t> input;
33typedef input::iterator input_it; 33typedef input::iterator input_it;
34typedef std::wstring_convert<std::codecvt_utf8<input::value_type>> Converter; 34typedef std::wstring_convert<std::codecvt_utf8_utf16<input::value_type>> Converter;
35 35
36class _private; 36class _private;
37class _expr; 37class _expr;