Merge branch 'feature/interpreter_string'

1 files changed, 2 insertions, 108 deletions

diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj
index 8db08cc..a2bc858 100644
--- a/JSImpl/solution/JSImpl.vcxproj
+++ b/JSImpl/solution/JSImpl.vcxproj
@@ -5,18 +5,10 @@
       <Configuration>Debug</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{549B84BA-403D-AF90-29F8-C2E4153936E1}</ProjectGuid>

@@ -33,13 +25,6 @@
     <PlatformToolset>v142</PlatformToolset>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <DebugSymbols>true</DebugSymbols>

-  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <VCProjectVersion>16.0</VCProjectVersion>

     <ConfigurationType>Application</ConfigurationType>

@@ -47,28 +32,15 @@
     <PlatformToolset>v142</PlatformToolset>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <DebugSymbols>true</DebugSymbols>

-  </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <OutDir>..\build\bin\Debug\</OutDir>

@@ -77,13 +49,6 @@
     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\build\bin\Debug\</OutDir>

-    <IntDir>..\build\obj\Debug\x64\Debug\JSImpl\</IntDir>

-    <TargetName>JSImpl</TargetName>

-    <TargetExt>.exe</TargetExt>

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <OutDir>..\build\bin\Release\</OutDir>

     <IntDir>..\build\obj\Release\Release\JSImpl\</IntDir>

@@ -91,13 +56,6 @@
     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\build\bin\Release\</OutDir>

-    <IntDir>..\build\obj\Release\x64\Release\JSImpl\</IntDir>

-    <TargetName>JSImpl</TargetName>

-    <TargetExt>.exe</TargetExt>

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

@@ -111,37 +69,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(IntDir)JSImpl.compile.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ResourceCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)JSImpl.pdb</ProgramDatabaseFile>

-      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <OutputFile>$(OutDir)JSImpl.exe</OutputFile>

-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

-      <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>false</MinimalRebuild>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-      <PrecompiledHeader></PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

+      <LanguageStandard>stdcpp17</LanguageStandard>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <ProgramDataBaseFileName>$(IntDir)JSImpl.compile.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -156,7 +84,6 @@
       <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <OutputFile>$(OutDir)JSImpl.exe</OutputFile>

       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

-      <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -172,39 +99,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(IntDir)JSImpl.compile.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ResourceCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)JSImpl.pdb</ProgramDatabaseFile>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <OutputFile>$(OutDir)JSImpl.exe</OutputFile>

-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

-      <Optimization>MaxSpeed</Optimization>

-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>false</MinimalRebuild>

-      <StringPooling>true</StringPooling>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-      <PrecompiledHeader></PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

+      <LanguageStandard>stdcpp17</LanguageStandard>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <ProgramDataBaseFileName>$(IntDir)JSImpl.compile.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -221,7 +116,6 @@
       <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <OutputFile>$(OutDir)JSImpl.exe</OutputFile>

       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

-      <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>