Merge branch 'master' into lexer-errors-handling

2 files changed, 31 insertions, 27 deletions

diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj
index e55b38d..99b34cc 100644
--- a/JSImpl/solution/JSImpl.vcxproj
+++ b/JSImpl/solution/JSImpl.vcxproj
@@ -115,6 +115,7 @@
     <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" />
diff --git a/JSImpl/solution/JSImpl.vcxproj.filters b/JSImpl/solution/JSImpl.vcxproj.filters
index d56f6a1..314e0f3 100644
--- a/JSImpl/solution/JSImpl.vcxproj.filters
+++ b/JSImpl/solution/JSImpl.vcxproj.filters
@@ -1,53 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    <Filter Include="Expressions">
+      <UniqueIdentifier>{9e65384d-2e18-4a3f-9b02-4abf632f9f06}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    <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\CommonTypes.h">
-      <Filter>Header Files</Filter>
+    <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>Header Files</Filter>
+      <Filter>Lexer</Filter>
     </ClInclude>
     <ClInclude Include="..\src\Parser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Expression.h">
-      <Filter>Header Files</Filter>
+      <Filter>Parser</Filter>
     </ClInclude>
     <ClInclude Include="..\src\ASTPrinter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ExpressionsFwd.h">
-      <Filter>Header Files</Filter>
+      <Filter>Visitors</Filter>
     </ClInclude>
     <ClInclude Include="..\src\ExpressionVisitor.h">
-      <Filter>Header Files</Filter>
+      <Filter>Visitors</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\CommonTypes.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Lexer.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Expression.cpp">
+      <Filter>Expressions</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\main.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Lexer.cpp">
+      <Filter>Lexer</Filter>
     </ClCompile>
     <ClCompile Include="..\src\Parser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Expression.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\src\ASTPrinter.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Visitors</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\main.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file