Rename ParseHelper.cpp/h to ParseContext.cpp/h.

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',

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"

src/compiler/DetectDiscontinuity.cpp

@@ -10,7 +10,7 @@
 
 #include "compiler/DetectDiscontinuity.h"
 
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
 
 namespace sh
 {

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
 {

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

src/compiler/ParseHelper.cpp → 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>

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
 {

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
 {

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) {

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;
 

src/compiler/glslang.l

@@ -37,7 +37,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
 
 %{
 #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"

src/compiler/glslang.y

@@ -35,7 +35,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
 #endif
 
 #include "compiler/SymbolTable.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/ParseContext.h"
 #include "GLSLANG/ShaderLang.h"
 
 #define YYENABLE_NLS 0

src/compiler/glslang_lex.cpp

@@ -782,7 +782,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
 */
 
 #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"

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

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 

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"
 

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" />

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">