Merge branch 'feature/32bit' into master

9 files changed, 519 insertions, 73 deletions

diff --git a/JSImpl/solution/JSImpl.make b/JSImpl/solution/JSImpl.make
index 47c1963..f79241f 100644
--- a/JSImpl/solution/JSImpl.make
+++ b/JSImpl/solution/JSImpl.make
@@ -1,6 +1,6 @@
 # GNU Make project makefile autogenerated by GENie
 ifndef config
-  config=debug64
+  config=debug
 endif
 
 ifndef verbose
@@ -42,6 +42,70 @@ endif
 
 MAKEFILE = JSImpl.make
 
+ifeq ($(config),debug)
+  OBJDIR              = ../build/obj/Debug/Debug/JSImpl
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/JSImpl
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
+  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_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug"
+  LIBDEPS            += ../build/bin/Debug/libJSLib.a
+  LDDEPS             += ../build/bin/Debug/libJSLib.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/src/main.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release)
+  OBJDIR              = ../build/obj/Release/Release/JSImpl
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/JSImpl
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
+  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_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_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release"
+  LIBDEPS            += ../build/bin/Release/libJSLib.a
+  LDDEPS             += ../build/bin/Release/libJSLib.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/src/main.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
 ifeq ($(config),debug64)
   OBJDIR              = ../build/obj/Debug/x64/Debug/JSImpl
   TARGETDIR           = ../build/bin/Debug
@@ -55,11 +119,14 @@ ifeq ($(config),debug64)
   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" -m64
+  LIBDEPS            += ../build/bin/Debug/libJSLib.a
   LDDEPS             += ../build/bin/Debug/libJSLib.a
+  LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
   OBJECTS := \
 	$(OBJDIR)/src/main.o \
 
@@ -84,11 +151,14 @@ ifeq ($(config),release64)
   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" -m64
+  LIBDEPS            += ../build/bin/Release/libJSLib.a
   LDDEPS             += ../build/bin/Release/libJSLib.a
+  LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
   OBJECTS := \
 	$(OBJDIR)/src/main.o \
 
@@ -111,7 +181,7 @@ RESOURCES := \
 all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET)
 	@:
 
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIBS) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS)
+$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS)
 	@echo Linking JSImpl
 	$(SILENT) $(LINKCMD)
 	$(POSTBUILDCMDS)
@@ -150,6 +220,18 @@ $(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)
 	$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
 endif
 
+ifneq (,$(OBJRESP))
+$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+ifneq (,$(LDRESP))
+$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
 $(OBJDIR)/src/main.o: ../src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln
index 17799fc..bb2638e 100644
--- a/JSImpl/solution/JSImpl.sln
+++ b/JSImpl/solution/JSImpl.sln
@@ -1,6 +1,6 @@
 

 Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 14

+# Visual Studio Version 16

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spasm", "Spasm", "{9892E17D-8434-0C54-6DEF-1FA8593093A4}"

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}"

@@ -14,12 +14,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\soluti
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

-		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF}

-		{EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1}

-		{B686840F-229B-ACC0-EB1C-502057F0A8F1} = {B686840F-229B-ACC0-EB1C-502057F0A8F1}

 		{30B03E7E-1C68-80CB-856F-592771461BBC} = {30B03E7E-1C68-80CB-856F-592771461BBC}

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

+		{B686840F-229B-ACC0-EB1C-502057F0A8F1} = {B686840F-229B-ACC0-EB1C-502057F0A8F1}

+		{EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}"

@@ -46,48 +46,90 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\soluti
 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

 		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|Win32.ActiveCfg = Debug|Win32

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|Win32.Build.0 = Debug|Win32

 		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.ActiveCfg = Debug|x64

 		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.Build.0 = Debug|x64

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|Win32.ActiveCfg = Release|Win32

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|Win32.Build.0 = Release|Win32

 		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.ActiveCfg = Release|x64

 		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.Build.0 = Release|x64

+		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|Win32.ActiveCfg = Debug|Win32

+		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|Win32.Build.0 = Debug|Win32

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.ActiveCfg = Debug|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.Build.0 = Debug|x64

+		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|Win32.ActiveCfg = Release|Win32

+		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|Win32.Build.0 = Release|Win32

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.ActiveCfg = Release|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.Build.0 = Release|x64

+		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|Win32.Build.0 = Debug|Win32

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.ActiveCfg = Debug|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.Build.0 = Debug|x64

+		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|Win32.ActiveCfg = Release|Win32

+		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|Win32.Build.0 = Release|Win32

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.ActiveCfg = Release|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.Build.0 = Release|x64

+		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|Win32.Build.0 = Debug|Win32

 		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|x64.ActiveCfg = Debug|x64

 		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|x64.Build.0 = Debug|x64

+		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|Win32.ActiveCfg = Release|Win32

+		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|Win32.Build.0 = Release|Win32

 		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|x64.ActiveCfg = Release|x64

 		{B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|x64.Build.0 = Release|x64

+		{30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|Win32.ActiveCfg = Debug|Win32

+		{30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|Win32.Build.0 = Debug|Win32

 		{30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.ActiveCfg = Debug|x64

 		{30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.Build.0 = Debug|x64

+		{30B03E7E-1C68-80CB-856F-592771461BBC}.Release|Win32.ActiveCfg = Release|Win32

+		{30B03E7E-1C68-80CB-856F-592771461BBC}.Release|Win32.Build.0 = Release|Win32

 		{30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.ActiveCfg = Release|x64

 		{30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.Build.0 = Release|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|Win32.Build.0 = Debug|Win32

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.ActiveCfg = Debug|x64

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.Build.0 = Debug|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|Win32.ActiveCfg = Release|Win32

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|Win32.Build.0 = Release|Win32

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.ActiveCfg = Release|x64

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.Build.0 = Release|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|Win32.Build.0 = Debug|Win32

 		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.ActiveCfg = Debug|x64

 		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.Build.0 = Debug|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|Win32.ActiveCfg = Release|Win32

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|Win32.Build.0 = Release|Win32

 		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.ActiveCfg = Release|x64

 		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.Build.0 = Release|x64

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|Win32.Build.0 = Debug|Win32

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.ActiveCfg = Debug|x64

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.Build.0 = Debug|x64

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|Win32.ActiveCfg = Release|Win32

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|Win32.Build.0 = Release|Win32

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.ActiveCfg = Release|x64

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.Build.0 = Release|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|Win32.ActiveCfg = Debug|Win32

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|Win32.Build.0 = Debug|Win32

 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.ActiveCfg = Debug|x64

 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.Build.0 = Debug|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|Win32.ActiveCfg = Release|Win32

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|Win32.Build.0 = Release|Win32

 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|x64.ActiveCfg = Release|x64

 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|x64.Build.0 = Release|x64

+		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|Win32.ActiveCfg = Debug|Win32

+		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|Win32.Build.0 = Debug|Win32

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.ActiveCfg = Debug|x64

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.Build.0 = Debug|x64

+		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|Win32.ActiveCfg = Release|Win32

+		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|Win32.Build.0 = Release|Win32

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.ActiveCfg = Release|x64

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj
index 0aa8deb..8db08cc 100644
--- a/JSImpl/solution/JSImpl.vcxproj
+++ b/JSImpl/solution/JSImpl.vcxproj
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

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

   <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

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

@@ -13,32 +21,62 @@
   <PropertyGroup Label="Globals">

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

     <RootNamespace>JSImpl</RootNamespace>

-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>

     <Keyword>Win32Proj</Keyword>

   </PropertyGroup>

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

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

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <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>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

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

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <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>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

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

+    <IntDir>..\build\obj\Debug\Debug\JSImpl\</IntDir>

+    <TargetName>JSImpl</TargetName>

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

@@ -46,6 +84,13 @@
     <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>

+    <TargetName>JSImpl</TargetName>

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

@@ -53,21 +98,53 @@
     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

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

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

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

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

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

     </ClCompile>

     <ResourceCompile>

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

@@ -76,26 +153,61 @@
       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

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

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

       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

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

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

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

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

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

     </ClCompile>

     <ResourceCompile>

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

@@ -106,6 +218,7 @@
       <ProgramDatabaseFile>$(OutDir)JSImpl.pdb</ProgramDatabaseFile>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

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

       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

       <TargetMachine>MachineX64</TargetMachine>

diff --git a/JSImpl/solution/JSImpl.vcxproj.filters b/JSImpl/solution/JSImpl.vcxproj.filters
index daeea8c..a140a04 100644
--- a/JSImpl/solution/JSImpl.vcxproj.filters
+++ b/JSImpl/solution/JSImpl.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

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

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

   <ItemGroup>

     <Filter Include="src">

       <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>

diff --git a/JSImpl/solution/JSLib.make b/JSImpl/solution/JSLib.make
index dd5157d..9770cb0 100644
--- a/JSImpl/solution/JSLib.make
+++ b/JSImpl/solution/JSLib.make
@@ -1,6 +1,6 @@
 # GNU Make project makefile autogenerated by GENie
 ifndef config
-  config=debug64
+  config=debug
 endif
 
 ifndef verbose
@@ -42,6 +42,82 @@ endif
 
 MAKEFILE = JSLib.make
 
+ifeq ($(config),debug)
+  OBJDIR              = ../build/obj/Debug/Debug/JSLib
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/libJSLib.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
+  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_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS)
+  LIBDEPS            +=
+  LDDEPS             +=
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/src/ASTInterpreter.o \
+	$(OBJDIR)/src/ASTPrinter.o \
+	$(OBJDIR)/src/ByteCodeGenerator.o \
+	$(OBJDIR)/src/Expression.o \
+	$(OBJDIR)/src/JSONParser.o \
+	$(OBJDIR)/src/Lexer.o \
+	$(OBJDIR)/src/Parser.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release)
+  OBJDIR              = ../build/obj/Release/Release/JSLib
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/libJSLib.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
+  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_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_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS)
+  LIBDEPS            +=
+  LDDEPS             +=
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/src/ASTInterpreter.o \
+	$(OBJDIR)/src/ASTPrinter.o \
+	$(OBJDIR)/src/ByteCodeGenerator.o \
+	$(OBJDIR)/src/Expression.o \
+	$(OBJDIR)/src/JSONParser.o \
+	$(OBJDIR)/src/Lexer.o \
+	$(OBJDIR)/src/Parser.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
 ifeq ($(config),debug64)
   OBJDIR              = ../build/obj/Debug/x64/Debug/JSLib
   TARGETDIR           = ../build/bin/Debug
@@ -55,16 +131,20 @@ ifeq ($(config),debug64)
   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)/src/ASTInterpreter.o \
 	$(OBJDIR)/src/ASTPrinter.o \
 	$(OBJDIR)/src/ByteCodeGenerator.o \
 	$(OBJDIR)/src/Expression.o \
+	$(OBJDIR)/src/JSONParser.o \
 	$(OBJDIR)/src/Lexer.o \
 	$(OBJDIR)/src/Parser.o \
 
@@ -89,16 +169,20 @@ ifeq ($(config),release64)
   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)/src/ASTInterpreter.o \
 	$(OBJDIR)/src/ASTPrinter.o \
 	$(OBJDIR)/src/ByteCodeGenerator.o \
 	$(OBJDIR)/src/Expression.o \
+	$(OBJDIR)/src/JSONParser.o \
 	$(OBJDIR)/src/Lexer.o \
 	$(OBJDIR)/src/Parser.o \
 
@@ -121,7 +205,7 @@ RESOURCES := \
 all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET)
 	@:
 
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIBS) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS)
+$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS)
 	@echo Archiving JSLib
 ifeq (posix,$(SHELLTYPE))
 	$(SILENT) rm -f  $(TARGET)
@@ -165,6 +249,18 @@ $(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)
 	$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
 endif
 
+ifneq (,$(OBJRESP))
+$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+ifneq (,$(LDRESP))
+$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
 $(OBJDIR)/src/ASTInterpreter.o: ../src/ASTInterpreter.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
@@ -181,6 +277,10 @@ $(OBJDIR)/src/Expression.o: ../src/Expression.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
+$(OBJDIR)/src/JSONParser.o: ../src/JSONParser.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
 $(OBJDIR)/src/Lexer.o: ../src/Lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj
index 054b726..67600b0 100644
--- a/JSImpl/solution/JSLib.vcxproj
+++ b/JSImpl/solution/JSLib.vcxproj
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

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

   <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

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

@@ -13,98 +21,197 @@
   <PropertyGroup Label="Globals">

     <ProjectGuid>{19EA680D-85FE-90BE-4E80-341EBA538DEF}</ProjectGuid>

     <RootNamespace>JSLib</RootNamespace>

-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>

     <Keyword>Win32Proj</Keyword>

   </PropertyGroup>

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

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

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <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>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

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

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <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>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

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

+    <IntDir>..\build\obj\Debug\Debug\JSLib\</IntDir>

+    <TargetName>JSLib</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

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

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

     <IntDir>..\build\obj\Debug\x64\Debug\JSLib\</IntDir>

     <TargetName>JSLib</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

+    <IntDir>..\build\obj\Release\Release\JSLib\</IntDir>

+    <TargetName>JSLib</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

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

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

     <IntDir>..\build\obj\Release\x64\Release\JSLib\</IntDir>

     <TargetName>JSLib</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

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

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)JSLib.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

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

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)JSLib.lib</OutputFile>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)JSLib.pdb</ProgramDatabaseFile>

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

+      <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp14</LanguageStandard>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <ProgramDataBaseFileName>$(OutDir)JSLib.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

     </ClCompile>

     <ResourceCompile>

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

     </ResourceCompile>

-    <Lib>

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

-      <TargetMachine>MachineX64</TargetMachine>

-    </Lib>

+  <Lib>

+    <OutputFile>$(OutDir)JSLib.lib</OutputFile>

+    <TargetMachine>MachineX64</TargetMachine>

+  </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)JSLib.pdb</ProgramDatabaseFile>

     </Link>

   </ItemDefinitionGroup>

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

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

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

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)JSLib.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

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

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)JSLib.lib</OutputFile>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)JSLib.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

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

+      <PrecompiledHeader></PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp14</LanguageStandard>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <ProgramDataBaseFileName>$(OutDir)JSLib.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

     </ClCompile>

     <ResourceCompile>

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

     </ResourceCompile>

-    <Lib>

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

-      <TargetMachine>MachineX64</TargetMachine>

-    </Lib>

+  <Lib>

+    <OutputFile>$(OutDir)JSLib.lib</OutputFile>

+    <TargetMachine>MachineX64</TargetMachine>

+  </Lib>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -114,34 +221,35 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="..\src\ASTInterpreter.h" />

+    <ClInclude Include="..\src\ExpressionVisitor.h" />

+    <ClInclude Include="..\src\ExpressionsFwd.h" />

     <ClInclude Include="..\src\ASTPrinter.h" />

+    <ClInclude Include="..\src\ASTInterpreter.h" />

+    <ClInclude Include="..\src\ExpressionDefinitions.h" />

+    <ClInclude Include="..\src\Parser.h" />

     <ClInclude Include="..\src\ByteCodeGenerator.h" />

-    <ClInclude Include="..\src\CommonTypes.h" />

     <ClInclude Include="..\src\Expression.h" />

-    <ClInclude Include="..\src\ExpressionDefinitions.h" />

-    <ClInclude Include="..\src\ExpressionsFwd.h" />

-    <ClInclude Include="..\src\ExpressionVisitor.h" />

-    <ClInclude Include="..\src\JSONParser.h" />

     <ClInclude Include="..\src\Lexer.h" />

-    <ClInclude Include="..\src\Parser.h" />

+    <ClInclude Include="..\src\JSONParser.h" />

+    <ClInclude Include="..\src\CommonTypes.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\ASTInterpreter.cpp">

-    </ClCompile>

-    <ClCompile Include="..\src\ASTPrinter.cpp">

-    </ClCompile>

     <ClCompile Include="..\src\ByteCodeGenerator.cpp">

     </ClCompile>

     <ClCompile Include="..\src\Expression.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\JSONParser.cpp" />

-    <ClCompile Include="..\src\Lexer.cpp">

+    <ClCompile Include="..\src\JSONParser.cpp">

     </ClCompile>

     <ClCompile Include="..\src\Parser.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\ASTInterpreter.cpp">

+    </ClCompile>

+    <ClCompile Include="..\src\ASTPrinter.cpp">

+    </ClCompile>

+    <ClCompile Include="..\src\Lexer.cpp">

+    </ClCompile>

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/JSImpl/solution/JSLib.vcxproj.filters b/JSImpl/solution/JSLib.vcxproj.filters
index e38ebc7..d4af527 100644
--- a/JSImpl/solution/JSLib.vcxproj.filters
+++ b/JSImpl/solution/JSLib.vcxproj.filters
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>

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

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

   <ItemGroup>

     <Filter Include="src">

       <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>

     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\src\ASTInterpreter.h">

+    <ClInclude Include="..\src\ExpressionVisitor.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ASTPrinter.h">

+    <ClInclude Include="..\src\ExpressionsFwd.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ByteCodeGenerator.h">

+    <ClInclude Include="..\src\ASTPrinter.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\CommonTypes.h">

+    <ClInclude Include="..\src\ASTInterpreter.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\Expression.h">

+    <ClInclude Include="..\src\ExpressionDefinitions.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionDefinitions.h">

+    <ClInclude Include="..\src\Parser.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionsFwd.h">

+    <ClInclude Include="..\src\ByteCodeGenerator.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionVisitor.h">

+    <ClInclude Include="..\src\Expression.h">

       <Filter>src</Filter>

     </ClInclude>

     <ClInclude Include="..\src\Lexer.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\Parser.h">

+    <ClInclude Include="..\src\JSONParser.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\JSONParser.h">

+    <ClInclude Include="..\src\CommonTypes.h">

       <Filter>src</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\ASTInterpreter.cpp">

+    <ClCompile Include="..\src\ByteCodeGenerator.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ASTPrinter.cpp">

+    <ClCompile Include="..\src\Expression.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ByteCodeGenerator.cpp">

+    <ClCompile Include="..\src\JSONParser.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\Expression.cpp">

+    <ClCompile Include="..\src\Parser.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\Lexer.cpp">

+    <ClCompile Include="..\src\ASTInterpreter.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\Parser.cpp">

+    <ClCompile Include="..\src\ASTPrinter.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\JSONParser.cpp">

+    <ClCompile Include="..\src\Lexer.cpp">

       <Filter>src</Filter>

     </ClCompile>

   </ItemGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile
index 00cafb3..fe89e52 100644
--- a/JSImpl/solution/Makefile
+++ b/JSImpl/solution/Makefile
@@ -2,7 +2,7 @@
 # Type "make help" for usage help
 
 ifndef config
-  config=debug64
+  config=debug
 endif
 export config
 
@@ -68,6 +68,8 @@ help:
 	@echo "Usage: make [config=name] [target]"
 	@echo ""
 	@echo "CONFIGURATIONS:"
+	@echo "   debug"
+	@echo "   release"
 	@echo "   debug64"
 	@echo "   release64"
 	@echo ""
diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua
index aa5889d..247f72d 100644
--- a/JSImpl/solution/genie.lua
+++ b/JSImpl/solution/genie.lua
@@ -1,6 +1,5 @@
 solution 'JSImpl'
     configurations {'Debug', 'Release'}
-    platforms { 'x64' }
     flags {
         'FatalWarnings',
         'ExtraWarnings',