Move all js implementation related files in shared project

6 files changed, 105 insertions, 75 deletions

diff --git a/JSImpl/JS.Common/JS.Common.vcxitems b/JSImpl/JS.Common/JS.Common.vcxitems
new file mode 100644
index 0000000..0aa7ad7
--- /dev/null
+++ b/JSImpl/JS.Common/JS.Common.vcxitems
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}</ItemsProjectGuid>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\ASTInterpreter.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\ASTPrinter.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\Expression.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\Lexer.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\Parser.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ASTInterpreter.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ASTPrinter.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\CommonTypes.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\Expression.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ExpressionDefinitions.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ExpressionsFwd.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ExpressionVisitor.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\Lexer.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\Parser.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/JSImpl/JS.Common/JS.Common.vcxitems.filters b/JSImpl/JS.Common/JS.Common.vcxitems.filters
new file mode 100644
index 0000000..9d4ce31
--- /dev/null
+++ b/JSImpl/JS.Common/JS.Common.vcxitems.filters
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Expressions">
+      <UniqueIdentifier>{456619f8-e093-4a34-aaa1-cc84813b928c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Lexer">
+      <UniqueIdentifier>{bc30bfe3-9613-4c4e-9d84-1731eacf1d90}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Parser">
+      <UniqueIdentifier>{5834345c-efe8-4e4b-98e5-04f2851f4388}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Visitors">
+      <UniqueIdentifier>{8c9cc117-30cd-4035-ba75-8dd0e2668e4e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\Expression.cpp">
+      <Filter>Expressions</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\Lexer.cpp">
+      <Filter>Lexer</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\Parser.cpp">
+      <Filter>Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\ASTInterpreter.cpp">
+      <Filter>Visitors</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\src\ASTPrinter.cpp">
+      <Filter>Visitors</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\Expression.h">
+      <Filter>Expressions</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ExpressionDefinitions.h">
+      <Filter>Expressions</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ExpressionsFwd.h">
+      <Filter>Expressions</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\Lexer.h">
+      <Filter>Lexer</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\Parser.h">
+      <Filter>Parser</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ASTInterpreter.h">
+      <Filter>Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ASTPrinter.h">
+      <Filter>Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\ExpressionVisitor.h">
+      <Filter>Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\src\CommonTypes.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln
index bee6a3e..a2f0672 100644
--- a/JSImpl/solution/JSImpl.sln
+++ b/JSImpl/solution/JSImpl.sln
@@ -5,7 +5,13 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj", "{EE0F8C6F-3619-4A46-BC19-FAEAD4167EE4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JS.Common", "..\JS.Common\JS.Common.vcxitems", "{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\JS.Common\JS.Common.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9
+		..\JS.Common\JS.Common.vcxitems*{ee0f8c6f-3619-4a46-bc19-faead4167ee4}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj
index e8645d7..32d6b96 100644
--- a/JSImpl/solution/JSImpl.vcxproj
+++ b/JSImpl/solution/JSImpl.vcxproj
@@ -54,6 +54,7 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
+    <Import Project="..\JS.Common\JS.Common.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -116,25 +117,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\ASTInterpreter.h" />
-    <ClInclude Include="..\src\ASTPrinter.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\Lexer.h" />
-    <ClInclude Include="..\src\Parser.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\ASTInterpreter.cpp" />
-    <ClCompile Include="..\src\ASTPrinter.cpp" />
-    <ClCompile Include="..\src\Expression.cpp" />
-    <ClCompile Include="..\src\Lexer.cpp" />
     <ClCompile Include="..\src\main.cpp" />
-    <ClCompile Include="..\src\Parser.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/JSImpl/solution/JSImpl.vcxproj.filters b/JSImpl/solution/JSImpl.vcxproj.filters
index 4a47e55..de250fc 100644
--- a/JSImpl/solution/JSImpl.vcxproj.filters
+++ b/JSImpl/solution/JSImpl.vcxproj.filters
@@ -1,62 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Expressions">
-      <UniqueIdentifier>{9e65384d-2e18-4a3f-9b02-4abf632f9f06}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Lexer">
-      <UniqueIdentifier>{177dbff8-a919-4a03-89ba-cb0a96e9e21e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Visitors">
-      <UniqueIdentifier>{948e229c-5a7a-4b3c-a75a-4b1b299c9e38}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Parser">
-      <UniqueIdentifier>{cf3787a3-5a0e-49f9-9a9f-99e14b57f391}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\Expression.h">
-      <Filter>Expressions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ExpressionDefinitions.h">
-      <Filter>Expressions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ExpressionsFwd.h">
-      <Filter>Expressions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Lexer.h">
-      <Filter>Lexer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Parser.h">
-      <Filter>Parser</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ASTPrinter.h">
-      <Filter>Visitors</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ExpressionVisitor.h">
-      <Filter>Visitors</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\CommonTypes.h" />
-    <ClInclude Include="..\src\ASTInterpreter.h">
-      <Filter>Visitors</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\Expression.cpp">
-      <Filter>Expressions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Lexer.cpp">
-      <Filter>Lexer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Parser.cpp">
-      <Filter>Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ASTPrinter.cpp">
-      <Filter>Visitors</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\main.cpp" />
-    <ClCompile Include="..\src\ASTInterpreter.cpp">
-      <Filter>Visitors</Filter>
-    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/JSImpl/src/main.cpp b/JSImpl/src/main.cpp
index a7d489c..3cb3be5 100644
--- a/JSImpl/src/main.cpp
+++ b/JSImpl/src/main.cpp
@@ -259,7 +259,7 @@ int main()
 	EXECUTE_TEST(TestScientificNotationNumber);
 
 	//TestParseUnaryExpr();
-  RunParseCalc();
+	RunParseCalc();
 
 #if defined(_WIN32)
 	std::system("pause");