Move the new preprocessor out of the 'new' directory.

samples/samples.sln

@@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_common", "..\src
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostSubBuffer", "gles2_book\PostSubBuffer\PostSubBuffer.vcxproj", "{667CE95F-5DD8-4495-8C18-5CA8A175B12D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "..\src\compiler\preprocessor\new\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "..\src\compiler\preprocessor\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/ANGLE.sln

@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_hlsl", "compiler
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_common", "compiler\translator_common.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "compiler\preprocessor\new\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "compiler\preprocessor\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/build_angle.gypi

@@ -19,31 +19,32 @@
       'include_dirs': [
       ],
       'sources': [
-        'compiler/preprocessor/new/Diagnostics.cpp',
-        'compiler/preprocessor/new/Diagnostics.h',
-        'compiler/preprocessor/new/DirectiveHandler.cpp',
-        'compiler/preprocessor/new/DirectiveHandler.h',
-        'compiler/preprocessor/new/DirectiveParser.cpp',
-        'compiler/preprocessor/new/DirectiveParser.h',
-        'compiler/preprocessor/new/ExpressionParser.cpp',
-        'compiler/preprocessor/new/ExpressionParser.h',
-        'compiler/preprocessor/new/Input.cpp',
-        'compiler/preprocessor/new/Input.h',
-        'compiler/preprocessor/new/Lexer.cpp',
-        'compiler/preprocessor/new/Lexer.h',
-        'compiler/preprocessor/new/Macro.cpp',
-        'compiler/preprocessor/new/Macro.h',
-        'compiler/preprocessor/new/MacroExpander.cpp',
-        'compiler/preprocessor/new/MacroExpander.h',
-        'compiler/preprocessor/new/numeric_lex.h',
-        'compiler/preprocessor/new/pp_utils.h',
-        'compiler/preprocessor/new/Preprocessor.cpp',
-        'compiler/preprocessor/new/Preprocessor.h',
-        'compiler/preprocessor/new/SourceLocation.h',
-        'compiler/preprocessor/new/Token.cpp',
-        'compiler/preprocessor/new/Token.h',
-        'compiler/preprocessor/new/Tokenizer.cpp',
-        'compiler/preprocessor/new/Tokenizer.h',
+        'compiler/preprocessor/Diagnostics.cpp',
+        'compiler/preprocessor/Diagnostics.h',
+        'compiler/preprocessor/DirectiveHandler.cpp',
+        'compiler/preprocessor/DirectiveHandler.h',
+        'compiler/preprocessor/DirectiveParser.cpp',
+        'compiler/preprocessor/DirectiveParser.h',
+        'compiler/preprocessor/ExpressionParser.cpp',
+        'compiler/preprocessor/ExpressionParser.h',
+        'compiler/preprocessor/Input.cpp',
+        'compiler/preprocessor/Input.h',
+        'compiler/preprocessor/length_limits.h',
+        'compiler/preprocessor/Lexer.cpp',
+        'compiler/preprocessor/Lexer.h',
+        'compiler/preprocessor/Macro.cpp',
+        'compiler/preprocessor/Macro.h',
+        'compiler/preprocessor/MacroExpander.cpp',
+        'compiler/preprocessor/MacroExpander.h',
+        'compiler/preprocessor/numeric_lex.h',
+        'compiler/preprocessor/pp_utils.h',
+        'compiler/preprocessor/Preprocessor.cpp',
+        'compiler/preprocessor/Preprocessor.h',
+        'compiler/preprocessor/SourceLocation.h',
+        'compiler/preprocessor/Token.cpp',
+        'compiler/preprocessor/Token.h',
+        'compiler/preprocessor/Tokenizer.cpp',
+        'compiler/preprocessor/Tokenizer.h',
       ],
     },
     {
@@ -119,7 +120,6 @@
         'compiler/VariableInfo.h',
         'compiler/VariablePacker.cpp',
         'compiler/VariablePacker.h',
-        'compiler/preprocessor/length_limits.h',
         # Dependency graph
         'compiler/depgraph/DependencyGraph.cpp',
         'compiler/depgraph/DependencyGraph.h',

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1325
+#define BUILD_REVISION 1326
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/Diagnostics.cpp

@@ -8,7 +8,7 @@
 
 #include "compiler/debug.h"
 #include "compiler/InfoSink.h"
-#include "compiler/preprocessor/new/SourceLocation.h"
+#include "compiler/preprocessor/SourceLocation.h"
 
 TDiagnostics::TDiagnostics(TInfoSink& infoSink) :
     mInfoSink(infoSink),

src/compiler/Diagnostics.h

@@ -7,7 +7,7 @@
 #ifndef COMPILER_DIAGNOSTICS_H_
 #define COMPILER_DIAGNOSTICS_H_
 
-#include "compiler/preprocessor/new/Diagnostics.h"
+#include "compiler/preprocessor/Diagnostics.h"
 
 class TInfoSink;
 

src/compiler/DirectiveHandler.h

@@ -9,7 +9,7 @@
 
 #include "compiler/ExtensionBehavior.h"
 #include "compiler/Pragma.h"
-#include "compiler/preprocessor/new/DirectiveHandler.h"
+#include "compiler/preprocessor/DirectiveHandler.h"
 
 class TDiagnostics;
 

src/compiler/ParseHelper.cpp

@@ -10,7 +10,7 @@
 #include <stdio.h>
 
 #include "compiler/glslang.h"
-#include "compiler/preprocessor/new/SourceLocation.h"
+#include "compiler/preprocessor/SourceLocation.h"
 
 ///////////////////////////////////////////////////////////////////////
 //

src/compiler/ParseHelper.h

@@ -9,7 +9,7 @@
 #include "compiler/Diagnostics.h"
 #include "compiler/DirectiveHandler.h"
 #include "compiler/localintermediate.h"
-#include "compiler/preprocessor/new/Preprocessor.h"
+#include "compiler/preprocessor/Preprocessor.h"
 #include "compiler/ShHandle.h"
 #include "compiler/SymbolTable.h"
 

src/compiler/glslang.l

@@ -38,7 +38,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
 %{
 #include "compiler/glslang.h"
 #include "compiler/ParseHelper.h"
-#include "compiler/preprocessor/new/Token.h"
+#include "compiler/preprocessor/Token.h"
 #include "compiler/util.h"
 #include "glslang_tab.h"
 

src/compiler/glslang_lex.cpp

@@ -807,7 +807,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
 
 #include "compiler/glslang.h"
 #include "compiler/ParseHelper.h"
-#include "compiler/preprocessor/new/Token.h"
+#include "compiler/preprocessor/Token.h"
 #include "compiler/util.h"
 #include "glslang_tab.h"
 

src/compiler/preprocessor/new/preprocessor.vcxproj → src/compiler/preprocessor/preprocessor.vcxproj

@@ -147,7 +147,7 @@
     <ClCompile Include="Tokenizer.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\length_limits.h" />
+    <ClInclude Include="length_limits.h" />
     <ClInclude Include="Diagnostics.h" />
     <ClInclude Include="DirectiveHandler.h" />
     <ClInclude Include="DirectiveParser.h" />

src/compiler/preprocessor/new/preprocessor.vcxproj.filters → src/compiler/preprocessor/preprocessor.vcxproj.filters

@@ -88,7 +88,7 @@
     <ClInclude Include="Tokenizer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\length_limits.h">
+    <ClInclude Include="length_limits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

src/compiler/translator_common.vcxproj

@@ -266,7 +266,7 @@
     <ClInclude Include="depgraph\DependencyGraphOutput.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="preprocessor\new\preprocessor.vcxproj">
+    <ProjectReference Include="preprocessor\preprocessor.vcxproj">
       <Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <Private>true</Private>