Merge branch 'feature/interpreter_string'

11 files changed, 136 insertions, 756 deletions

diff --git a/JSImpl/test/ASTInterpreterTests.cpp b/JSImpl/test/ASTInterpreterTests.cpp
new file mode 100644
index 0000000..e8cf282
--- /dev/null
+++ b/JSImpl/test/ASTInterpreterTests.cpp
@@ -0,0 +1,77 @@
+#include <gtest/gtest.h>
+
+#include <src/CommonTypes.h>
+#include <src/Lexer.h>
+#include <src/Parser.h>
+#include <src/ASTPrinter.h>
+#include <src/ASTInterpreter.h>
+
+struct ASTInterpret : ::testing::Test
+{
+	void Run(const char* program)
+	{
+		auto tokens = Tokenize(program).tokens;
+		auto expr = Parse(tokens);
+		Interpreter.Run(expr.get());
+	}
+
+	bool HasVariable(const char* name)
+	{
+		return Interpreter.HasVariable(name);
+	}
+
+	double ValueAsNumber(const char* name)
+	{
+		return std::get<double>(*Interpreter.ModifyVariable(name));
+	}
+
+	IPLString ValueAsString(const char* name)
+	{
+		return std::get<IPLString>(*Interpreter.ModifyVariable(name));
+	}
+
+	ASTInterpreter Interpreter;
+};
+
+TEST_F(ASTInterpret, VarNumber)
+{
+	Run("var answer = 6 * 7");
+	ASSERT_TRUE(HasVariable("answer"));
+	ASSERT_DOUBLE_EQ(ValueAsNumber("answer"), 42.0);
+}
+
+TEST_F(ASTInterpret, VarString)
+{
+	Run("var name = 'John' + ' ' + 'Doe'");
+	ASSERT_TRUE(HasVariable("name"));
+	ASSERT_EQ(ValueAsString("name"), "John Doe");
+}
+
+TEST_F(ASTInterpret, StringPlusNumberNotSupported)
+{
+	ASSERT_THROW(Run("var data = 'John Doe' + 42"), std::runtime_error);
+}
+
+TEST_F(ASTInterpret, StringMinusString)
+{
+	ASSERT_THROW(Run("var data = 'John' - 'Doe'"), std::runtime_error);
+}
+
+TEST_F(ASTInterpret, LessNumber)
+{
+	Run("var answer = 6 < 7");
+	ASSERT_TRUE(HasVariable("answer"));
+	ASSERT_DOUBLE_EQ(ValueAsNumber("answer"), 1.0);
+}
+
+TEST_F(ASTInterpret, LessString)
+{
+	Run("var name = 'John' < 'Doe'");
+	ASSERT_TRUE(HasVariable("name"));
+	ASSERT_DOUBLE_EQ(ValueAsNumber("name"), 0.0);
+}
+
+TEST_F(ASTInterpret, StringLessNumber)
+{
+	ASSERT_THROW(Run("var data = 'John' < 42"), std::runtime_error);
+}
diff --git a/JSImpl/test/ParserTests.cpp b/JSImpl/test/ParserTests.cpp
index d63ae60..f47b4b3 100644
--- a/JSImpl/test/ParserTests.cpp
+++ b/JSImpl/test/ParserTests.cpp
@@ -27,7 +27,7 @@ TEST(Parser, VariableDeclaration)
 	ASTInterpreter i;
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("s"));
-	ASSERT_TRUE(i.ModifyVariable("s") == 0.0);
+	ASSERT_TRUE(std::get<double>(*i.ModifyVariable("s")) == 0.0);
 }
 
 TEST(Parser, Assignment)
@@ -38,7 +38,7 @@ TEST(Parser, Assignment)
 	ASTInterpreter i;
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("s"));
-	ASSERT_TRUE(i.ModifyVariable("s") == 100);
+	ASSERT_TRUE(std::get<double>(*i.ModifyVariable("s")) == 100);
 }
 
 TEST(Parser, VariableDeclarationAdditionOfLiterals)
@@ -49,7 +49,7 @@ TEST(Parser, VariableDeclarationAdditionOfLiterals)
 	ASTInterpreter i;
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("s"));
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("s"), 11.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("s")), 11.0);
 }
 
 TEST(Parser, VariableDeclarationAdditionOfVariables)
@@ -62,9 +62,9 @@ TEST(Parser, VariableDeclarationAdditionOfVariables)
 	ASSERT_TRUE(i.HasVariable("a"));
 	ASSERT_TRUE(i.HasVariable("b"));
 	ASSERT_TRUE(i.HasVariable("c"));
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 4.0);
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("c"), 9.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 5.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 4.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("c")), 9.0);
 }
 
 TEST(Parser, VariableDeclarationMultiplicationOfLiterals)
@@ -75,7 +75,7 @@ TEST(Parser, VariableDeclarationMultiplicationOfLiterals)
 	ASTInterpreter i;
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("s"));
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("s"), 30.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("s")), 30.0);
 }
 
 TEST(Parser, VariableDeclarationMultiplicationOfVariables)
@@ -88,9 +88,9 @@ TEST(Parser, VariableDeclarationMultiplicationOfVariables)
 	ASSERT_TRUE(i.HasVariable("a"));
 	ASSERT_TRUE(i.HasVariable("b"));
 	ASSERT_TRUE(i.HasVariable("c"));
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 4.0);
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("c"), 20.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 5.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 4.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("c")), 20.0);
 }
 
 
@@ -103,10 +103,10 @@ TEST(Parser, Unary)
 	i.Run(expr.get());
 	ASSERT_TRUE(i.HasVariable("a"));
 	ASSERT_TRUE(i.HasVariable("b"));
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("minusB"), -5.0);
-	ASSERT_DOUBLE_EQ(i.ModifyVariable("plusB"),  +5.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 6.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 5.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("minusB")), -5.0);
+	ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("plusB")),  +5.0);
 }
 
 
@@ -120,8 +120,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 6.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 5.0);
 	}
 	{
 		IPLVector<Token> tokens = Tokenize("var a = 5; var b = 3; if(a == 5)a++; b++; b++;").tokens;
@@ -131,8 +131,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 6.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 5.0);
 	}
 
 	{
@@ -143,8 +143,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 5.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 5.0);
 	}
 
 	{
@@ -155,8 +155,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 5.0);
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 5.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 5.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 5.0);
 	}
 
 	{
@@ -167,8 +167,8 @@ TEST(Parser, If)
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("a"));
 		ASSERT_TRUE(i.HasVariable("b"));
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("a"), 6.0);
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("b"), 4.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("a")), 6.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("b")), 4.0);
 	}
 }
 
@@ -181,7 +181,7 @@ TEST(Parser, For)
 		ASTInterpreter i;
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("i"));
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("i"), 45.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("i")), 45.0);
 	}
 	{
 		IPLVector<Token> tokens = Tokenize("var i = 0; for (var j = 0; j < 10; j++) i = i + j;").tokens;
@@ -189,7 +189,7 @@ TEST(Parser, For)
 		ASTInterpreter i;
 		i.Run(expr.get());
 		ASSERT_TRUE(i.HasVariable("i"));
-		ASSERT_DOUBLE_EQ(i.ModifyVariable("i"), 45.0);
+		ASSERT_DOUBLE_EQ(std::get<double>(*i.ModifyVariable("i")), 45.0);
 	}
 }
 
diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make
index 68e167d..0510fa2 100644
--- a/JSImpl/test/Test.make
+++ b/JSImpl/test/Test.make
@@ -51,9 +51,9 @@ ifeq ($(config),debug)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -L"."
   LIBDEPS            += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a
@@ -65,6 +65,7 @@ ifeq ($(config),debug)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
+	$(OBJDIR)/ASTInterpreterTests.o \
 	$(OBJDIR)/CodeGenerationTests.o \
 	$(OBJDIR)/LexerTests.o \
 	$(OBJDIR)/ParserTests.o \
@@ -88,9 +89,9 @@ ifeq ($(config),release)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -L"."
   LIBDEPS            += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a
@@ -102,80 +103,7 @@ ifeq ($(config),release)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/CodeGenerationTests.o \
-	$(OBJDIR)/LexerTests.o \
-	$(OBJDIR)/ParserTests.o \
-	$(OBJDIR)/empty.o \
-	$(OBJDIR)/sprtTests.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR              = ../build/obj/Debug/x64/Debug/Test
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/Test
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m64
-  LIBDEPS            += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a
-  LDDEPS             += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a
-  LDRESP              =
-  LIBS               += $(LDDEPS) -lpthread
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
-  OBJRESP             =
-  OBJECTS := \
-	$(OBJDIR)/CodeGenerationTests.o \
-	$(OBJDIR)/LexerTests.o \
-	$(OBJDIR)/ParserTests.o \
-	$(OBJDIR)/empty.o \
-	$(OBJDIR)/sprtTests.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR              = ../build/obj/Release/x64/Release/Test
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/Test
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -L"." -m64
-  LIBDEPS            += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a
-  LDDEPS             += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a
-  LDRESP              =
-  LIBS               += $(LDDEPS) -lpthread
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
-  OBJRESP             =
-  OBJECTS := \
+	$(OBJDIR)/ASTInterpreterTests.o \
 	$(OBJDIR)/CodeGenerationTests.o \
 	$(OBJDIR)/LexerTests.o \
 	$(OBJDIR)/ParserTests.o \
@@ -252,6 +180,10 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
+$(OBJDIR)/ASTInterpreterTests.o: ASTInterpreterTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
 $(OBJDIR)/CodeGenerationTests.o: CodeGenerationTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj
index 3abf38f..c33f333 100644
--- a/JSImpl/test/Test.vcxproj
+++ b/JSImpl/test/Test.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>{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}</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\Test\</IntDir>

-    <TargetName>Test</TargetName>

-    <TargetExt>.exe</TargetExt>

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

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

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

     <IntDir>..\build\obj\Release\Release\Test\</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\Test\</IntDir>

-    <TargetName>Test</TargetName>

-    <TargetExt>.exe</TargetExt>

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

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

     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

@@ -112,7 +70,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

+      <LanguageStandard>stdcpp17</LanguageStandard>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -130,39 +88,6 @@
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

     </Link>

   </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

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

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

-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

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

     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

@@ -177,41 +102,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

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

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

-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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)Test.compile.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -229,10 +120,11 @@
       <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

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

       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

-      <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="ASTInterpreterTests.cpp">

+    </ClCompile>

     <ClCompile Include="LexerTests.cpp">

     </ClCompile>

     <ClCompile Include="CodeGenerationTests.cpp">

diff --git a/JSImpl/test/Test.vcxproj.filters b/JSImpl/test/Test.vcxproj.filters
index 412f2b7..50fcfb0 100644
--- a/JSImpl/test/Test.vcxproj.filters
+++ b/JSImpl/test/Test.vcxproj.filters
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

+    <ClCompile Include="ASTInterpreterTests.cpp" />

     <ClCompile Include="LexerTests.cpp" />

     <ClCompile Include="CodeGenerationTests.cpp" />

     <ClCompile Include="ParserTests.cpp" />

diff --git a/JSImpl/test/gmock.make b/JSImpl/test/gmock.make
index 73e4eac..37d54df 100644
--- a/JSImpl/test/gmock.make
+++ b/JSImpl/test/gmock.make
@@ -51,9 +51,9 @@ ifeq ($(config),debug)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS)
   LIBDEPS            +=
@@ -84,9 +84,9 @@ ifeq ($(config),release)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS)
   LIBDEPS            +=
@@ -108,72 +108,6 @@ ifeq ($(config),release)
   endef
 endif
 
-ifeq ($(config),debug64)
-  OBJDIR              = ../build/obj/Debug/x64/Debug/gmock
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/libgmock.a
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LIBDEPS            +=
-  LDDEPS             +=
-  LDRESP              =
-  LIBS               += $(LDDEPS)
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(AR)  -rcs $(TARGET)
-  OBJRESP             =
-  OBJECTS := \
-	$(OBJDIR)/googletest/googlemock/src/gmock-all.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR              = ../build/obj/Release/x64/Release/gmock
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/libgmock.a
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LIBDEPS            +=
-  LDDEPS             +=
-  LDRESP              =
-  LIBS               += $(LDDEPS)
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(AR)  -rcs $(TARGET)
-  OBJRESP             =
-  OBJECTS := \
-	$(OBJDIR)/googletest/googlemock/src/gmock-all.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
 OBJDIRS := \
 	$(OBJDIR) \
 	$(OBJDIR)/googletest/googlemock/src \
diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj
index 5a4490e..44afba9 100644
--- a/JSImpl/test/gmock.vcxproj
+++ b/JSImpl/test/gmock.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>{B686840F-229B-ACC0-EB1C-502057F0A8F1}</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>StaticLibrary</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <DebugSymbols>true</DebugSymbols>

-  </PropertyGroup>

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

     <VCProjectVersion>16.0</VCProjectVersion>

     <ConfigurationType>StaticLibrary</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>StaticLibrary</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>

@@ -76,24 +48,12 @@
     <TargetName>gmock</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

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

-    <TargetName>gmock</TargetName>

-    <TargetExt>.lib</TargetExt>

-  </PropertyGroup>

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

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

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

     <TargetName>gmock</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

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

-    <TargetName>gmock</TargetName>

-    <TargetExt>.lib</TargetExt>

-  </PropertyGroup>

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

     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

@@ -108,39 +68,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(OutDir)gmock.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-  <Lib>

-    <OutputFile>$(OutDir)gmock.lib</OutputFile>

-  </Lib>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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>$(OutDir)gmock.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -151,7 +79,6 @@
     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gmock.lib</OutputFile>

-    <TargetMachine>MachineX64</TargetMachine>

   </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -173,41 +100,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(OutDir)gmock.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-  <Lib>

-    <OutputFile>$(OutDir)gmock.lib</OutputFile>

-  </Lib>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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>$(OutDir)gmock.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -218,7 +111,6 @@
     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gmock.lib</OutputFile>

-    <TargetMachine>MachineX64</TargetMachine>

   </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>

diff --git a/JSImpl/test/gtest.make b/JSImpl/test/gtest.make
index 44e1cb0..675ddd5 100644
--- a/JSImpl/test/gtest.make
+++ b/JSImpl/test/gtest.make
@@ -51,9 +51,9 @@ ifeq ($(config),debug)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS)
   LIBDEPS            +=
@@ -84,9 +84,9 @@ ifeq ($(config),release)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS)
   LIBDEPS            +=
@@ -108,72 +108,6 @@ ifeq ($(config),release)
   endef
 endif
 
-ifeq ($(config),debug64)
-  OBJDIR              = ../build/obj/Debug/x64/Debug/gtest
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/libgtest.a
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LIBDEPS            +=
-  LDDEPS             +=
-  LDRESP              =
-  LIBS               += $(LDDEPS)
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(AR)  -rcs $(TARGET)
-  OBJRESP             =
-  OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest-all.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR              = ../build/obj/Release/x64/Release/gtest
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/libgtest.a
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LIBDEPS            +=
-  LDDEPS             +=
-  LDRESP              =
-  LIBS               += $(LDDEPS)
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(AR)  -rcs $(TARGET)
-  OBJRESP             =
-  OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest-all.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
 OBJDIRS := \
 	$(OBJDIR) \
 	$(OBJDIR)/googletest/googletest/src \
diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj
index 5e12d95..229231e 100644
--- a/JSImpl/test/gtest.vcxproj
+++ b/JSImpl/test/gtest.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>{EC34880F-5849-B0C0-21CB-53208D9EACF1}</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>StaticLibrary</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <DebugSymbols>true</DebugSymbols>

-  </PropertyGroup>

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

     <VCProjectVersion>16.0</VCProjectVersion>

     <ConfigurationType>StaticLibrary</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>StaticLibrary</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>

@@ -76,24 +48,12 @@
     <TargetName>gtest</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

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

-    <TargetName>gtest</TargetName>

-    <TargetExt>.lib</TargetExt>

-  </PropertyGroup>

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

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

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

     <TargetName>gtest</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

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

-    <TargetName>gtest</TargetName>

-    <TargetExt>.lib</TargetExt>

-  </PropertyGroup>

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

     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

@@ -108,39 +68,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(OutDir)gtest.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-  <Lib>

-    <OutputFile>$(OutDir)gtest.lib</OutputFile>

-  </Lib>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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>$(OutDir)gtest.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -151,7 +79,6 @@
     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest.lib</OutputFile>

-    <TargetMachine>MachineX64</TargetMachine>

   </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -173,41 +100,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(OutDir)gtest.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-  <Lib>

-    <OutputFile>$(OutDir)gtest.lib</OutputFile>

-  </Lib>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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>$(OutDir)gtest.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -218,7 +111,6 @@
     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest.lib</OutputFile>

-    <TargetMachine>MachineX64</TargetMachine>

   </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>

diff --git a/JSImpl/test/gtest_main.make b/JSImpl/test/gtest_main.make
index 8a0d8af..ecc5583 100644
--- a/JSImpl/test/gtest_main.make
+++ b/JSImpl/test/gtest_main.make
@@ -51,9 +51,9 @@ ifeq ($(config),debug)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS)
   LIBDEPS            +=
@@ -84,9 +84,9 @@ ifeq ($(config),release)
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS)
   LIBDEPS            +=
@@ -108,72 +108,6 @@ ifeq ($(config),release)
   endef
 endif
 
-ifeq ($(config),debug64)
-  OBJDIR              = ../build/obj/Debug/x64/Debug/gtest_main
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/libgtest_main.a
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LIBDEPS            +=
-  LDDEPS             +=
-  LDRESP              =
-  LIBS               += $(LDDEPS)
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(AR)  -rcs $(TARGET)
-  OBJRESP             =
-  OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest_main.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR              = ../build/obj/Release/x64/Release/gtest_main
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/libgtest_main.a
-  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
-  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
-  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LIBDEPS            +=
-  LDDEPS             +=
-  LDRESP              =
-  LIBS               += $(LDDEPS)
-  EXTERNAL_LIBS      +=
-  LINKOBJS            = $(OBJECTS)
-  LINKCMD             = $(AR)  -rcs $(TARGET)
-  OBJRESP             =
-  OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest_main.o \
-
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
 OBJDIRS := \
 	$(OBJDIR) \
 	$(OBJDIR)/googletest/googletest/src \
diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj
index aeec05d..c39b848 100644
--- a/JSImpl/test/gtest_main.vcxproj
+++ b/JSImpl/test/gtest_main.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>{30B03E7E-1C68-80CB-856F-592771461BBC}</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>StaticLibrary</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <DebugSymbols>true</DebugSymbols>

-  </PropertyGroup>

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

     <VCProjectVersion>16.0</VCProjectVersion>

     <ConfigurationType>StaticLibrary</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>StaticLibrary</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>

@@ -76,24 +48,12 @@
     <TargetName>gtest_main</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

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

-    <TargetName>gtest_main</TargetName>

-    <TargetExt>.lib</TargetExt>

-  </PropertyGroup>

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

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

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

     <TargetName>gtest_main</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

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

-    <TargetName>gtest_main</TargetName>

-    <TargetExt>.lib</TargetExt>

-  </PropertyGroup>

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

     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

@@ -108,39 +68,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(OutDir)gtest_main.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-  <Lib>

-    <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

-  </Lib>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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>$(OutDir)gtest_main.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -151,7 +79,6 @@
     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

-    <TargetMachine>MachineX64</TargetMachine>

   </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -173,41 +100,7 @@
       <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <LanguageStandard>stdcpp14</LanguageStandard>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <ProgramDataBaseFileName>$(OutDir)gtest_main.pdb</ProgramDataBaseFileName>

-      <DiagnosticsFormat>Caret</DiagnosticsFormat>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ResourceCompile>

-  <Lib>

-    <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

-  </Lib>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

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

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <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>$(OutDir)gtest_main.pdb</ProgramDataBaseFileName>

       <DiagnosticsFormat>Caret</DiagnosticsFormat>

@@ -218,7 +111,6 @@
     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

-    <TargetMachine>MachineX64</TargetMachine>

   </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>