Rename ParseHelper.cpp/h to ParseContext.cpp/h.
BUG=
ANGLEBUG=484
R=geofflang@chromium.org, shannonwoods@chromium.org
Review URL: https://codereview.appspot.com/14702044
diff --git a/src/build_angle.gypi b/src/build_angle.gypi
index 864ca5c..13c42f9 100644
--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -60,8 +60,8 @@
'compiler/OutputHLSL.cpp',
'compiler/OutputHLSL.h',
'compiler/parseConst.cpp',
- 'compiler/ParseHelper.cpp',
- 'compiler/ParseHelper.h',
+ 'compiler/ParseContext.cpp',
+ 'compiler/ParseContext.h',
'compiler/PoolAlloc.cpp',
'compiler/PoolAlloc.h',
'compiler/QualifierAlive.cpp',
diff --git a/src/compiler/Compiler.cpp b/src/compiler/Compiler.cpp
index ecd5f01..54ca708 100644
--- a/src/compiler/Compiler.cpp
+++ b/src/compiler/Compiler.cpp
@@ -11,7 +11,7 @@
#include "compiler/InitializeGLPosition.h"
#include "compiler/InitializeParseContext.h"
#include "compiler/MapLongVariableNames.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include "compiler/RenameFunction.h"
#include "compiler/ShHandle.h"
#include "compiler/UnfoldShortCircuitAST.h"
diff --git a/src/compiler/DetectDiscontinuity.cpp b/src/compiler/DetectDiscontinuity.cpp
index 7c3b68a..8cfe49b 100644
--- a/src/compiler/DetectDiscontinuity.cpp
+++ b/src/compiler/DetectDiscontinuity.cpp
@@ -10,7 +10,7 @@
#include "compiler/DetectDiscontinuity.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
namespace sh
{
diff --git a/src/compiler/OutputGLSLBase.h b/src/compiler/OutputGLSLBase.h
index df4ad68..69868c0 100644
--- a/src/compiler/OutputGLSLBase.h
+++ b/src/compiler/OutputGLSLBase.h
@@ -11,7 +11,7 @@
#include "compiler/ForLoopUnroll.h"
#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
class TOutputGLSLBase : public TIntermTraverser
{
diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index cde4120..49bc137 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -15,7 +15,7 @@
#include <GLES2/gl2.h>
#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include "compiler/Uniform.h"
namespace sh
diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/ParseContext.cpp
similarity index 99%
rename from src/compiler/ParseHelper.cpp
rename to src/compiler/ParseContext.cpp
index 1f8538e..9a27952 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/ParseContext.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/src/compiler/ParseHelper.h b/src/compiler/ParseContext.h
similarity index 100%
rename from src/compiler/ParseHelper.h
rename to src/compiler/ParseContext.h
diff --git a/src/compiler/SearchSymbol.h b/src/compiler/SearchSymbol.h
index 6bc0b90..224bc77 100644
--- a/src/compiler/SearchSymbol.h
+++ b/src/compiler/SearchSymbol.h
@@ -10,7 +10,7 @@
#define COMPILER_SEARCHSYMBOL_H_
#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
namespace sh
{
diff --git a/src/compiler/UnfoldShortCircuit.h b/src/compiler/UnfoldShortCircuit.h
index cb176a5..ae2989f 100644
--- a/src/compiler/UnfoldShortCircuit.h
+++ b/src/compiler/UnfoldShortCircuit.h
@@ -10,7 +10,7 @@
#define COMPILER_UNFOLDSHORTCIRCUIT_H_
#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
namespace sh
{
diff --git a/src/compiler/ValidateLimitations.cpp b/src/compiler/ValidateLimitations.cpp
index 736ceea..7b8b1c8 100644
--- a/src/compiler/ValidateLimitations.cpp
+++ b/src/compiler/ValidateLimitations.cpp
@@ -7,7 +7,7 @@
#include "compiler/ValidateLimitations.h"
#include "compiler/InfoSink.h"
#include "compiler/InitializeParseContext.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
namespace {
bool IsLoopIndex(const TIntermSymbol* symbol, const TLoopStack& stack) {
diff --git a/src/compiler/debug.cpp b/src/compiler/debug.cpp
index 53778bd..6a7b042 100644
--- a/src/compiler/debug.cpp
+++ b/src/compiler/debug.cpp
@@ -12,7 +12,7 @@
#include <stdio.h>
#include "compiler/InitializeParseContext.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
static const int kTraceBufferLen = 1024;
diff --git a/src/compiler/glslang.l b/src/compiler/glslang.l
index 60663f9..430f8ca 100644
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -37,7 +37,7 @@
%{
#include "compiler/glslang.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include "compiler/preprocessor/Token.h"
#include "compiler/util.h"
#include "glslang_tab.h"
diff --git a/src/compiler/glslang.y b/src/compiler/glslang.y
index c64f736..a8dceb4 100644
--- a/src/compiler/glslang.y
+++ b/src/compiler/glslang.y
@@ -35,7 +35,7 @@
#endif
#include "compiler/SymbolTable.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include "GLSLANG/ShaderLang.h"
#define YYENABLE_NLS 0
diff --git a/src/compiler/glslang_lex.cpp b/src/compiler/glslang_lex.cpp
index 14d1411..de3d82b 100644
--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/glslang_lex.cpp
@@ -782,7 +782,7 @@
*/
#include "compiler/glslang.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include "compiler/preprocessor/Token.h"
#include "compiler/util.h"
#include "glslang_tab.h"
diff --git a/src/compiler/glslang_tab.cpp b/src/compiler/glslang_tab.cpp
index af47a23..1f2e890 100644
--- a/src/compiler/glslang_tab.cpp
+++ b/src/compiler/glslang_tab.cpp
@@ -85,7 +85,7 @@
#endif
#include "compiler/SymbolTable.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include "GLSLANG/ShaderLang.h"
#define YYENABLE_NLS 0
diff --git a/src/compiler/parseConst.cpp b/src/compiler/parseConst.cpp
index 1cc5db8..65ed115 100644
--- a/src/compiler/parseConst.cpp
+++ b/src/compiler/parseConst.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
//
// Use this class to carry along data from node to node in
diff --git a/src/compiler/timing/RestrictFragmentShaderTiming.cpp b/src/compiler/timing/RestrictFragmentShaderTiming.cpp
index 538b731..b9d2bab 100644
--- a/src/compiler/timing/RestrictFragmentShaderTiming.cpp
+++ b/src/compiler/timing/RestrictFragmentShaderTiming.cpp
@@ -5,7 +5,7 @@
//
#include "compiler/InfoSink.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
#include "compiler/depgraph/DependencyGraphOutput.h"
#include "compiler/timing/RestrictFragmentShaderTiming.h"
diff --git a/src/compiler/translator.vcxproj b/src/compiler/translator.vcxproj
index 6fb5ef6..7325172 100644
--- a/src/compiler/translator.vcxproj
+++ b/src/compiler/translator.vcxproj
@@ -163,7 +163,7 @@
<ClCompile Include="OutputGLSLBase.cpp" />
<ClCompile Include="OutputHLSL.cpp" />
<ClCompile Include="parseConst.cpp" />
- <ClCompile Include="ParseHelper.cpp" />
+ <ClCompile Include="ParseContext.cpp" />
<ClCompile Include="PoolAlloc.cpp" />
<ClCompile Include="QualifierAlive.cpp" />
<ClCompile Include="RemoveTree.cpp" />
@@ -268,7 +268,7 @@
<ClInclude Include="OutputGLSL.h" />
<ClInclude Include="OutputGLSLBase.h" />
<ClInclude Include="OutputHLSL.h" />
- <ClInclude Include="ParseHelper.h" />
+ <ClInclude Include="ParseContext.h" />
<ClInclude Include="PoolAlloc.h" />
<ClInclude Include="QualifierAlive.h" />
<ClInclude Include="RemoveTree.h" />
diff --git a/src/compiler/translator.vcxproj.filters b/src/compiler/translator.vcxproj.filters
index a4e426a..b8cd730 100644
--- a/src/compiler/translator.vcxproj.filters
+++ b/src/compiler/translator.vcxproj.filters
@@ -80,9 +80,6 @@
<ClCompile Include="parseConst.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ParseHelper.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="PoolAlloc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -182,6 +179,9 @@
<ClCompile Include="UnfoldShortCircuitAST.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="ParseContext.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="BaseTypes.h">
@@ -241,9 +241,6 @@
<ClInclude Include="osinclude.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="ParseHelper.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="PoolAlloc.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -346,6 +343,9 @@
<ClInclude Include="UnfoldShortCircuitAST.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ParseContext.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="glslang.l">
