Skip to content

Commit e30980b

Browse files
i42outputi42output
committed
misc
1 parent 292d769 commit e30980b

7 files changed

Lines changed: 22 additions & 19 deletions

File tree

‎build/win32/vs2022/neos/neos.vcxproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
<ClInclude Include="..\..\..\..\..\include\neos\neos.hpp" />
4343
</ItemGroup>
4444
<ItemGroup>
45-
<ClCompile Include="..\..\..\..\src\api\context.cpp" />
45+
<ClCompile Include="..\..\..\..\src\api\context.cpp">
46+
<ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ShowIncludes>
47+
<ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ShowIncludes>
48+
</ClCompile>
4649
<ClCompile Include="..\..\..\..\src\bytecode\text.cpp" />
4750
<ClCompile Include="..\..\..\..\src\bytecode\vm.cpp" />
4851
<ClCompile Include="..\..\..\..\src\compiler.cpp" />
@@ -163,7 +166,7 @@
163166
<ClCompile>
164167
<WarningLevel>Level3</WarningLevel>
165168
<SDLCheck>true</SDLCheck>
166-
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169+
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
167170
<ConformanceMode>true</ConformanceMode>
168171
<PrecompiledHeader>NotUsing</PrecompiledHeader>
169172
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -183,7 +186,7 @@
183186
<FunctionLevelLinking>true</FunctionLevelLinking>
184187
<IntrinsicFunctions>true</IntrinsicFunctions>
185188
<SDLCheck>true</SDLCheck>
186-
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189+
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
187190
<ConformanceMode>true</ConformanceMode>
188191
<PrecompiledHeader>NotUsing</PrecompiledHeader>
189192
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎concepts/build/win32/vs2017/core/core.math.universal.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<FunctionLevelLinking>true</FunctionLevelLinking>
9797
<IntrinsicFunctions>true</IntrinsicFunctions>
9898
<SDLCheck>true</SDLCheck>
99-
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;NDEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99+
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;NDEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
100100
<ConformanceMode>true</ConformanceMode>
101101
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
102102
<AdditionalIncludeDirectories>/usr/local/include;$(DevDirNeos)/include</AdditionalIncludeDirectories>
@@ -140,7 +140,7 @@
140140
<WarningLevel>Level3</WarningLevel>
141141
<Optimization>Disabled</Optimization>
142142
<SDLCheck>true</SDLCheck>
143-
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;_DEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143+
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;_DEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
144144
<ConformanceMode>true</ConformanceMode>
145145
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
146146
<AdditionalIncludeDirectories>/usr/local/include;$(DevDirNeos)/include</AdditionalIncludeDirectories>

‎concepts/build/win32/vs2017/core/core.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<FunctionLevelLinking>true</FunctionLevelLinking>
9797
<IntrinsicFunctions>true</IntrinsicFunctions>
9898
<SDLCheck>true</SDLCheck>
99-
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;NDEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99+
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;NDEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
100100
<ConformanceMode>true</ConformanceMode>
101101
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
102102
<AdditionalIncludeDirectories>/usr/local/include;$(DevDirNeos)/include</AdditionalIncludeDirectories>
@@ -140,7 +140,7 @@
140140
<WarningLevel>Level3</WarningLevel>
141141
<Optimization>Disabled</Optimization>
142142
<SDLCheck>true</SDLCheck>
143-
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;_DEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143+
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;_DEBUG;CORE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
144144
<ConformanceMode>true</ConformanceMode>
145145
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
146146
<AdditionalIncludeDirectories>/usr/local/include;$(DevDirNeos)/include</AdditionalIncludeDirectories>

‎console/build/win32/vs2017/console.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<WarningLevel>Level3</WarningLevel>
118118
<Optimization>Disabled</Optimization>
119119
<SDLCheck>true</SDLCheck>
120-
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120+
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
121121
<ConformanceMode>true</ConformanceMode>
122122
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
123123
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -168,7 +168,7 @@
168168
<FunctionLevelLinking>true</FunctionLevelLinking>
169169
<IntrinsicFunctions>true</IntrinsicFunctions>
170170
<SDLCheck>true</SDLCheck>
171-
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171+
<PreprocessorDefinitions>NEOLIB_HOSTED_ENVIRONMENT;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);NEOLIB_HOSTED_ENVIRONMENT</PreprocessorDefinitions>
172172
<ConformanceMode>true</ConformanceMode>
173173
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
174174
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎include/neos/language/ast.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace neos
3030
namespace language
3131
{
3232
using ast_node_value = neolib::variant<neolib::ref_ptr<i_semantic_concept>, symbol_table_entry*>;
33-
using i_ast_node_value = neolib::abstract_t<ast_node_value>;
33+
using i_ast_node_value = neolib::maybe_abstract_t<ast_node_value>;
3434

3535
class i_ast_node : public neolib::i_reference_counted
3636
{

‎include/neos/language/symbol_table.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ namespace neos
6666
};
6767

6868
using symbol_table = neolib::unordered_map<i_scope*, neolib::unordered_multimap<symbol_name, symbol_table_entry>>;
69-
using i_symbol_table = neolib::abstract_t<symbol_table>;
69+
using i_symbol_table = neolib::maybe_abstract_t<symbol_table>;
7070
}
7171
}

‎include/neos/language/type.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ namespace neos
180180
};
181181

182182
template<typename T, typename D = default_type_descriptor>
183-
struct data : i_data<typename neolib::abstract_t<T>, neolib::abstract_t<D>>
183+
struct data : i_data<typename neolib::maybe_abstract_t<T>, neolib::maybe_abstract_t<D>>
184184
{
185-
using abstract_type = i_data<typename neolib::abstract_t<T>, neolib::abstract_t<D>>;
185+
using abstract_type = i_data<typename neolib::maybe_abstract_t<T>, neolib::maybe_abstract_t<D>>;
186186
using type = T;
187187
using type_descriptor = D;
188188

@@ -478,9 +478,9 @@ namespace neos
478478
i_data<i64>,
479479
i_data<f32>,
480480
i_data<f64>,
481-
i_data<neolib::abstract_t<ibig>>,
482-
i_data<neolib::abstract_t<fbig>>,
483-
i_data<neolib::abstract_t<string>>,
481+
i_data<neolib::maybe_abstract_t<ibig>>,
482+
i_data<neolib::maybe_abstract_t<fbig>>,
483+
i_data<neolib::maybe_abstract_t<string>>,
484484
i_data<reference, i_reference_descriptor>,
485485
i_data<pointer, i_pointer_descriptor>,
486486
i_data<neolib::i_ref_ptr<i_array_type>, i_array_descriptor>,
@@ -716,11 +716,11 @@ namespace neos
716716
template <> inline constexpr type type_to_enum_v<float> = type::F32;
717717
template <> inline constexpr type type_to_enum_v<double> = type::F64;
718718
template <> inline constexpr type type_to_enum_v<ibig> = type::Ibig;
719-
//template <> inline constexpr type type_to_enum_v<neolib::abstract_t<ibig>> = type::Ibig;
719+
//template <> inline constexpr type type_to_enum_v<neolib::maybe_abstract_t<ibig>> = type::Ibig;
720720
template <> inline constexpr type type_to_enum_v<fbig> = type::Fbig;
721-
//template <> inline constexpr type type_to_enum_v<neolib::abstract_t<fbig>> = type::Fbig;
721+
//template <> inline constexpr type type_to_enum_v<neolib::maybe_abstract_t<fbig>> = type::Fbig;
722722
template <> inline constexpr type type_to_enum_v<string> = type::String;
723-
template <> inline constexpr type type_to_enum_v<neolib::abstract_t<string>> = type::String;
723+
template <> inline constexpr type type_to_enum_v<neolib::maybe_abstract_t<string>> = type::String;
724724
template <> inline constexpr type type_to_enum_v<reference> = type::Reference;
725725
template <> inline constexpr type type_to_enum_v<pointer> = type::Pointer;
726726
template <> inline constexpr type type_to_enum_v<array_type> = type::Array;

0 commit comments

Comments
 (0)