Move the new preprocessor out of the 'new' directory.
TRAC #21966
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: http://angleproject.googlecode.com/svn/trunk@1326 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/samples/samples.sln b/samples/samples.sln
index c1213fd..0ec4e4b 100644
--- a/samples/samples.sln
+++ b/samples/samples.sln
@@ -32,7 +32,7 @@
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
diff --git a/src/ANGLE.sln b/src/ANGLE.sln
index ce33263..81c1382 100644
--- a/src/ANGLE.sln
+++ b/src/ANGLE.sln
@@ -9,7 +9,7 @@
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
diff --git a/src/build_angle.gypi b/src/build_angle.gypi
index de43776..174f035 100644
--- a/src/build_angle.gypi
+++ b/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',
diff --git a/src/common/version.h b/src/common/version.h
index 0ada1d7..5d9c1b0 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
#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)
diff --git a/src/compiler/Diagnostics.cpp b/src/compiler/Diagnostics.cpp
index 8aa1cb6..06f370d 100644
--- a/src/compiler/Diagnostics.cpp
+++ b/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),
diff --git a/src/compiler/Diagnostics.h b/src/compiler/Diagnostics.h
index 3670414..43dfcb7 100644
--- a/src/compiler/Diagnostics.h
+++ b/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;
diff --git a/src/compiler/DirectiveHandler.h b/src/compiler/DirectiveHandler.h
index 21d3dfc..a08b7a8 100644
--- a/src/compiler/DirectiveHandler.h
+++ b/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;
diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/ParseHelper.cpp
index 508f172..6ab99fe 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/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"
///////////////////////////////////////////////////////////////////////
//
diff --git a/src/compiler/ParseHelper.h b/src/compiler/ParseHelper.h
index 824ee00..668e52a 100644
--- a/src/compiler/ParseHelper.h
+++ b/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"
diff --git a/src/compiler/glslang.l b/src/compiler/glslang.l
index 532a5f2..8300ff6 100644
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -38,7 +38,7 @@
%{
#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"
diff --git a/src/compiler/glslang_lex.cpp b/src/compiler/glslang_lex.cpp
index 184a570..66ae97e 100644
--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/glslang_lex.cpp
@@ -807,7 +807,7 @@
#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"
diff --git a/src/compiler/preprocessor/new/Diagnostics.cpp b/src/compiler/preprocessor/Diagnostics.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/Diagnostics.cpp
rename to src/compiler/preprocessor/Diagnostics.cpp
diff --git a/src/compiler/preprocessor/new/Diagnostics.h b/src/compiler/preprocessor/Diagnostics.h
similarity index 100%
rename from src/compiler/preprocessor/new/Diagnostics.h
rename to src/compiler/preprocessor/Diagnostics.h
diff --git a/src/compiler/preprocessor/new/DirectiveHandler.cpp b/src/compiler/preprocessor/DirectiveHandler.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/DirectiveHandler.cpp
rename to src/compiler/preprocessor/DirectiveHandler.cpp
diff --git a/src/compiler/preprocessor/new/DirectiveHandler.h b/src/compiler/preprocessor/DirectiveHandler.h
similarity index 100%
rename from src/compiler/preprocessor/new/DirectiveHandler.h
rename to src/compiler/preprocessor/DirectiveHandler.h
diff --git a/src/compiler/preprocessor/new/DirectiveParser.cpp b/src/compiler/preprocessor/DirectiveParser.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/DirectiveParser.cpp
rename to src/compiler/preprocessor/DirectiveParser.cpp
diff --git a/src/compiler/preprocessor/new/DirectiveParser.h b/src/compiler/preprocessor/DirectiveParser.h
similarity index 100%
rename from src/compiler/preprocessor/new/DirectiveParser.h
rename to src/compiler/preprocessor/DirectiveParser.h
diff --git a/src/compiler/preprocessor/new/ExpressionParser.cpp b/src/compiler/preprocessor/ExpressionParser.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/ExpressionParser.cpp
rename to src/compiler/preprocessor/ExpressionParser.cpp
diff --git a/src/compiler/preprocessor/new/ExpressionParser.h b/src/compiler/preprocessor/ExpressionParser.h
similarity index 100%
rename from src/compiler/preprocessor/new/ExpressionParser.h
rename to src/compiler/preprocessor/ExpressionParser.h
diff --git a/src/compiler/preprocessor/new/ExpressionParser.y b/src/compiler/preprocessor/ExpressionParser.y
similarity index 100%
rename from src/compiler/preprocessor/new/ExpressionParser.y
rename to src/compiler/preprocessor/ExpressionParser.y
diff --git a/src/compiler/preprocessor/new/Input.cpp b/src/compiler/preprocessor/Input.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/Input.cpp
rename to src/compiler/preprocessor/Input.cpp
diff --git a/src/compiler/preprocessor/new/Input.h b/src/compiler/preprocessor/Input.h
similarity index 100%
rename from src/compiler/preprocessor/new/Input.h
rename to src/compiler/preprocessor/Input.h
diff --git a/src/compiler/preprocessor/new/Lexer.cpp b/src/compiler/preprocessor/Lexer.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/Lexer.cpp
rename to src/compiler/preprocessor/Lexer.cpp
diff --git a/src/compiler/preprocessor/new/Lexer.h b/src/compiler/preprocessor/Lexer.h
similarity index 100%
rename from src/compiler/preprocessor/new/Lexer.h
rename to src/compiler/preprocessor/Lexer.h
diff --git a/src/compiler/preprocessor/new/Macro.cpp b/src/compiler/preprocessor/Macro.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/Macro.cpp
rename to src/compiler/preprocessor/Macro.cpp
diff --git a/src/compiler/preprocessor/new/Macro.h b/src/compiler/preprocessor/Macro.h
similarity index 100%
rename from src/compiler/preprocessor/new/Macro.h
rename to src/compiler/preprocessor/Macro.h
diff --git a/src/compiler/preprocessor/new/MacroExpander.cpp b/src/compiler/preprocessor/MacroExpander.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/MacroExpander.cpp
rename to src/compiler/preprocessor/MacroExpander.cpp
diff --git a/src/compiler/preprocessor/new/MacroExpander.h b/src/compiler/preprocessor/MacroExpander.h
similarity index 100%
rename from src/compiler/preprocessor/new/MacroExpander.h
rename to src/compiler/preprocessor/MacroExpander.h
diff --git a/src/compiler/preprocessor/new/Preprocessor.cpp b/src/compiler/preprocessor/Preprocessor.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/Preprocessor.cpp
rename to src/compiler/preprocessor/Preprocessor.cpp
diff --git a/src/compiler/preprocessor/new/Preprocessor.h b/src/compiler/preprocessor/Preprocessor.h
similarity index 100%
rename from src/compiler/preprocessor/new/Preprocessor.h
rename to src/compiler/preprocessor/Preprocessor.h
diff --git a/src/compiler/preprocessor/new/SourceLocation.h b/src/compiler/preprocessor/SourceLocation.h
similarity index 100%
rename from src/compiler/preprocessor/new/SourceLocation.h
rename to src/compiler/preprocessor/SourceLocation.h
diff --git a/src/compiler/preprocessor/new/Token.cpp b/src/compiler/preprocessor/Token.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/Token.cpp
rename to src/compiler/preprocessor/Token.cpp
diff --git a/src/compiler/preprocessor/new/Token.h b/src/compiler/preprocessor/Token.h
similarity index 100%
rename from src/compiler/preprocessor/new/Token.h
rename to src/compiler/preprocessor/Token.h
diff --git a/src/compiler/preprocessor/new/Tokenizer.cpp b/src/compiler/preprocessor/Tokenizer.cpp
similarity index 100%
rename from src/compiler/preprocessor/new/Tokenizer.cpp
rename to src/compiler/preprocessor/Tokenizer.cpp
diff --git a/src/compiler/preprocessor/new/Tokenizer.h b/src/compiler/preprocessor/Tokenizer.h
similarity index 100%
rename from src/compiler/preprocessor/new/Tokenizer.h
rename to src/compiler/preprocessor/Tokenizer.h
diff --git a/src/compiler/preprocessor/new/Tokenizer.l b/src/compiler/preprocessor/Tokenizer.l
similarity index 100%
rename from src/compiler/preprocessor/new/Tokenizer.l
rename to src/compiler/preprocessor/Tokenizer.l
diff --git a/src/compiler/preprocessor/new/generate_parser.sh b/src/compiler/preprocessor/generate_parser.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/compiler/preprocessor/new/generate_parser.sh
rename to src/compiler/preprocessor/generate_parser.sh
diff --git a/src/compiler/preprocessor/new/numeric_lex.h b/src/compiler/preprocessor/numeric_lex.h
similarity index 100%
rename from src/compiler/preprocessor/new/numeric_lex.h
rename to src/compiler/preprocessor/numeric_lex.h
diff --git a/src/compiler/preprocessor/new/pp_utils.h b/src/compiler/preprocessor/pp_utils.h
similarity index 100%
rename from src/compiler/preprocessor/new/pp_utils.h
rename to src/compiler/preprocessor/pp_utils.h
diff --git a/src/compiler/preprocessor/new/preprocessor.vcxproj b/src/compiler/preprocessor/preprocessor.vcxproj
similarity index 99%
rename from src/compiler/preprocessor/new/preprocessor.vcxproj
rename to src/compiler/preprocessor/preprocessor.vcxproj
index 15fe572..b39b0e7 100644
--- a/src/compiler/preprocessor/new/preprocessor.vcxproj
+++ b/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" />
diff --git a/src/compiler/preprocessor/new/preprocessor.vcxproj.filters b/src/compiler/preprocessor/preprocessor.vcxproj.filters
similarity index 98%
rename from src/compiler/preprocessor/new/preprocessor.vcxproj.filters
rename to src/compiler/preprocessor/preprocessor.vcxproj.filters
index 9438424..2df91e2 100644
--- a/src/compiler/preprocessor/new/preprocessor.vcxproj.filters
+++ b/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>
diff --git a/src/compiler/translator_common.vcxproj b/src/compiler/translator_common.vcxproj
index 52c1871..6d8d530 100644
--- a/src/compiler/translator_common.vcxproj
+++ b/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>
