From 33c5848d11d95e85edc0e2323aaf15ac9cde5a69 Mon Sep 17 00:00:00 2001
From: martin dobrev <martindobrev0@gmail.com>
Date: Wed, 14 Nov 2018 09:35:50 +0200
Subject: Add source files to project

---
 JSImpl/solution/JSLib.vcxproj         | 32 ++++++++++++++++++++------------
 JSImpl/solution/JSLib.vcxproj.filters | 10 ++++++++--
 2 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'JSImpl/solution')

diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj
index 1d0f63a..0efb673 100644
--- a/JSImpl/solution/JSLib.vcxproj
+++ b/JSImpl/solution/JSLib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -56,12 +56,14 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      </PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader></PrecompiledHeader>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -69,11 +71,12 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</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>
@@ -85,12 +88,14 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      </PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader></PrecompiledHeader>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -98,11 +103,12 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</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,6 +120,7 @@
   <ItemGroup>
     <ClInclude Include="..\src\ASTInterpreter.h" />
     <ClInclude Include="..\src\ASTPrinter.h" />
+    <ClInclude Include="..\src\ByteCodeGenerator.h" />
     <ClInclude Include="..\src\CommonTypes.h" />
     <ClInclude Include="..\src\Expression.h" />
     <ClInclude Include="..\src\ExpressionDefinitions.h" />
@@ -127,6 +134,7 @@
     </ClCompile>
     <ClCompile Include="..\src\ASTPrinter.cpp">
     </ClCompile>
+    <ClCompile Include="..\src\ByteCodeGenerator.cpp" />
     <ClCompile Include="..\src\Expression.cpp">
     </ClCompile>
     <ClCompile Include="..\src\Lexer.cpp">
@@ -137,4 +145,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/JSImpl/solution/JSLib.vcxproj.filters b/JSImpl/solution/JSLib.vcxproj.filters
index afcbbb9..121d0ba 100644
--- a/JSImpl/solution/JSLib.vcxproj.filters
+++ b/JSImpl/solution/JSLib.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="src">
@@ -33,6 +33,9 @@
     <ClInclude Include="..\src\Parser.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\ByteCodeGenerator.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\ASTInterpreter.cpp">
@@ -50,5 +53,8 @@
     <ClCompile Include="..\src\Parser.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\ByteCodeGenerator.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
-- 
cgit v1.3.1-23-gd82d


From 2b9732a6cfdd1315f63cf6715d6c5a43b73a6797 Mon Sep 17 00:00:00 2001
From: NDobrev <martindobrev0@gmail.com>
Date: Thu, 15 Nov 2018 12:05:57 +0200
Subject: Fix proj files

---
 JSImpl/solution/JSLib.vcxproj         | 33 ++++++++++++++-------------------
 JSImpl/solution/JSLib.vcxproj.filters | 16 ++++++++--------
 2 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'JSImpl/solution')

diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj
index 0efb673..e880cf2 100644
--- a/JSImpl/solution/JSLib.vcxproj
+++ b/JSImpl/solution/JSLib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -56,14 +56,12 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader></PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -71,12 +69,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</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>
@@ -88,14 +85,12 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader></PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -103,12 +98,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</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>
@@ -134,7 +128,8 @@
     </ClCompile>
     <ClCompile Include="..\src\ASTPrinter.cpp">
     </ClCompile>
-    <ClCompile Include="..\src\ByteCodeGenerator.cpp" />
+    <ClCompile Include="..\src\ByteCodeGenerator.cpp">
+    </ClCompile>
     <ClCompile Include="..\src\Expression.cpp">
     </ClCompile>
     <ClCompile Include="..\src\Lexer.cpp">
@@ -145,4 +140,4 @@
   <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 121d0ba..5f447ee 100644
--- a/JSImpl/solution/JSLib.vcxproj.filters
+++ b/JSImpl/solution/JSLib.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="src">
@@ -12,6 +12,9 @@
     <ClInclude Include="..\src\ASTPrinter.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\ByteCodeGenerator.h">
+      <Filter>src</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\CommonTypes.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -33,9 +36,6 @@
     <ClInclude Include="..\src\Parser.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\ByteCodeGenerator.h">
-      <Filter>src</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\ASTInterpreter.cpp">
@@ -44,6 +44,9 @@
     <ClCompile Include="..\src\ASTPrinter.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\ByteCodeGenerator.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\Expression.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -53,8 +56,5 @@
     <ClCompile Include="..\src\Parser.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\ByteCodeGenerator.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
-- 
cgit v1.3.1-23-gd82d


From 255202e4096048ae72766522f7894830de10bd2f Mon Sep 17 00:00:00 2001
From: Dimitar Trendafilov <dimitar@coherent-labs.com>
Date: Thu, 15 Nov 2018 18:37:24 +0200
Subject: Fixed Linux build

---
 JSImpl/solution/JSLib.make | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'JSImpl/solution')

diff --git a/JSImpl/solution/JSLib.make b/JSImpl/solution/JSLib.make
index 1bf0a01..dd5157d 100644
--- a/JSImpl/solution/JSLib.make
+++ b/JSImpl/solution/JSLib.make
@@ -63,6 +63,7 @@ ifeq ($(config),debug64)
   OBJECTS := \
 	$(OBJDIR)/src/ASTInterpreter.o \
 	$(OBJDIR)/src/ASTPrinter.o \
+	$(OBJDIR)/src/ByteCodeGenerator.o \
 	$(OBJDIR)/src/Expression.o \
 	$(OBJDIR)/src/Lexer.o \
 	$(OBJDIR)/src/Parser.o \
@@ -96,6 +97,7 @@ ifeq ($(config),release64)
   OBJECTS := \
 	$(OBJDIR)/src/ASTInterpreter.o \
 	$(OBJDIR)/src/ASTPrinter.o \
+	$(OBJDIR)/src/ByteCodeGenerator.o \
 	$(OBJDIR)/src/Expression.o \
 	$(OBJDIR)/src/Lexer.o \
 	$(OBJDIR)/src/Parser.o \
@@ -171,6 +173,10 @@ $(OBJDIR)/src/ASTPrinter.o: ../src/ASTPrinter.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
+$(OBJDIR)/src/ByteCodeGenerator.o: ../src/ByteCodeGenerator.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
 $(OBJDIR)/src/Expression.o: ../src/Expression.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
-- 
cgit v1.3.1-23-gd82d