Commit 6b9cb259 by Jamie Madill

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

TRAC #24002 Signed-off-by: Shannon Woods Signed-off-by: Geoff Lang
parent ee7010d4
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "compiler/translator/InitializeGLPosition.h" #include "compiler/translator/InitializeGLPosition.h"
#include "compiler/translator/InitializeParseContext.h" #include "compiler/translator/InitializeParseContext.h"
#include "compiler/translator/MapLongVariableNames.h" #include "compiler/translator/MapLongVariableNames.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include "compiler/translator/RenameFunction.h" #include "compiler/translator/RenameFunction.h"
#include "compiler/translator/ShHandle.h" #include "compiler/translator/ShHandle.h"
#include "compiler/translator/ValidateLimitations.h" #include "compiler/translator/ValidateLimitations.h"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "compiler/translator/DetectDiscontinuity.h" #include "compiler/translator/DetectDiscontinuity.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
namespace sh namespace sh
{ {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "compiler/translator/ForLoopUnroll.h" #include "compiler/translator/ForLoopUnroll.h"
#include "compiler/translator/intermediate.h" #include "compiler/translator/intermediate.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
class TOutputGLSLBase : public TIntermTraverser class TOutputGLSLBase : public TIntermTraverser
{ {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "compiler/translator/intermediate.h" #include "compiler/translator/intermediate.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include "compiler/translator/ShaderVariable.h" #include "compiler/translator/ShaderVariable.h"
namespace sh namespace sh
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define COMPILER_SEARCHSYMBOL_H_ #define COMPILER_SEARCHSYMBOL_H_
#include "compiler/translator/intermediate.h" #include "compiler/translator/intermediate.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
namespace sh namespace sh
{ {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define COMPILER_UNFOLDSHORTCIRCUIT_H_ #define COMPILER_UNFOLDSHORTCIRCUIT_H_
#include "compiler/translator/intermediate.h" #include "compiler/translator/intermediate.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
namespace sh namespace sh
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "compiler/translator/ValidateLimitations.h" #include "compiler/translator/ValidateLimitations.h"
#include "compiler/translator/InfoSink.h" #include "compiler/translator/InfoSink.h"
#include "compiler/translator/InitializeParseContext.h" #include "compiler/translator/InitializeParseContext.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
namespace { namespace {
bool IsLoopIndex(const TIntermSymbol* symbol, const TLoopStack& stack) { bool IsLoopIndex(const TIntermSymbol* symbol, const TLoopStack& stack) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "compiler/translator/ValidateOutputs.h" #include "compiler/translator/ValidateOutputs.h"
#include "compiler/translator/InfoSink.h" #include "compiler/translator/InfoSink.h"
#include "compiler/translator/InitializeParseContext.h" #include "compiler/translator/InitializeParseContext.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
ValidateOutputs::ValidateOutputs(TInfoSinkBase& sink, int maxDrawBuffers) ValidateOutputs::ValidateOutputs(TInfoSinkBase& sink, int maxDrawBuffers)
: mSink(sink), : mSink(sink),
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <stdio.h> #include <stdio.h>
#include "compiler/translator/InitializeParseContext.h" #include "compiler/translator/InitializeParseContext.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
static const int kTraceBufferLen = 1024; static const int kTraceBufferLen = 1024;
......
...@@ -37,7 +37,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp). ...@@ -37,7 +37,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
%{ %{
#include "compiler/translator/glslang.h" #include "compiler/translator/glslang.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include "compiler/preprocessor/Token.h" #include "compiler/preprocessor/Token.h"
#include "compiler/translator/util.h" #include "compiler/translator/util.h"
#include "glslang_tab.h" #include "glslang_tab.h"
......
...@@ -35,7 +35,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). ...@@ -35,7 +35,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
#endif #endif
#include "compiler/translator/SymbolTable.h" #include "compiler/translator/SymbolTable.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#define YYENABLE_NLS 0 #define YYENABLE_NLS 0
......
...@@ -996,7 +996,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp). ...@@ -996,7 +996,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
*/ */
#include "compiler/translator/glslang.h" #include "compiler/translator/glslang.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include "compiler/preprocessor/Token.h" #include "compiler/preprocessor/Token.h"
#include "compiler/translator/util.h" #include "compiler/translator/util.h"
#include "glslang_tab.h" #include "glslang_tab.h"
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
#endif #endif
#include "compiler/translator/SymbolTable.h" #include "compiler/translator/SymbolTable.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#define YYENABLE_NLS 0 #define YYENABLE_NLS 0
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
// //
// Use this class to carry along data from node to node in // Use this class to carry along data from node to node in
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// //
#include "compiler/translator/InfoSink.h" #include "compiler/translator/InfoSink.h"
#include "compiler/translator/ParseHelper.h" #include "compiler/translator/ParseContext.h"
#include "compiler/translator/depgraph/DependencyGraphOutput.h" #include "compiler/translator/depgraph/DependencyGraphOutput.h"
#include "compiler/translator/timing/RestrictFragmentShaderTiming.h" #include "compiler/translator/timing/RestrictFragmentShaderTiming.h"
......
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
<ClInclude Include="compiler\translator\HLSLLayoutEncoder.h"/> <ClInclude Include="compiler\translator\HLSLLayoutEncoder.h"/>
<ClInclude Include="compiler\translator\QualifierAlive.h"/> <ClInclude Include="compiler\translator\QualifierAlive.h"/>
<ClInclude Include="compiler\translator\ConstantUnion.h"/> <ClInclude Include="compiler\translator\ConstantUnion.h"/>
<ClInclude Include="compiler\translator\ParseContext.h"/>
<ClInclude Include="compiler\translator\Diagnostics.h"/> <ClInclude Include="compiler\translator\Diagnostics.h"/>
<ClInclude Include="compiler\translator\VersionGLSL.h"/> <ClInclude Include="compiler\translator\VersionGLSL.h"/>
<ClInclude Include="compiler\translator\HashNames.h"/> <ClInclude Include="compiler\translator\HashNames.h"/>
...@@ -166,7 +167,6 @@ ...@@ -166,7 +167,6 @@
<ClInclude Include="compiler\translator\VariablePacker.h"/> <ClInclude Include="compiler\translator\VariablePacker.h"/>
<ClInclude Include="compiler\translator\glslang.h"/> <ClInclude Include="compiler\translator\glslang.h"/>
<ClInclude Include="compiler\translator\SearchSymbol.h"/> <ClInclude Include="compiler\translator\SearchSymbol.h"/>
<ClInclude Include="compiler\translator\ParseHelper.h"/>
<ClInclude Include="compiler\translator\BlockLayoutEncoder.h"/> <ClInclude Include="compiler\translator\BlockLayoutEncoder.h"/>
<ClInclude Include="compiler\translator\MMap.h"/> <ClInclude Include="compiler\translator\MMap.h"/>
<ClInclude Include="compiler\translator\OutputHLSL.h"/> <ClInclude Include="compiler\translator\OutputHLSL.h"/>
...@@ -197,6 +197,7 @@ ...@@ -197,6 +197,7 @@
<ClCompile Include="compiler\translator\TranslatorHLSL.cpp"/> <ClCompile Include="compiler\translator\TranslatorHLSL.cpp"/>
<ClCompile Include="compiler\translator\OutputGLSLBase.cpp"/> <ClCompile Include="compiler\translator\OutputGLSLBase.cpp"/>
<ClCompile Include="compiler\translator\ShaderVariable.cpp"/> <ClCompile Include="compiler\translator\ShaderVariable.cpp"/>
<ClCompile Include="compiler\translator\ParseContext.cpp"/>
<ClCompile Include="compiler\translator\RemoveTree.cpp"/> <ClCompile Include="compiler\translator\RemoveTree.cpp"/>
<ClCompile Include="compiler\translator\InitializeDll.cpp"/> <ClCompile Include="compiler\translator\InitializeDll.cpp"/>
<ClCompile Include="compiler\translator\PoolAlloc.cpp"/> <ClCompile Include="compiler\translator\PoolAlloc.cpp"/>
...@@ -211,7 +212,6 @@ ...@@ -211,7 +212,6 @@
<ClCompile Include="compiler\translator\InitializeGLPosition.cpp"/> <ClCompile Include="compiler\translator\InitializeGLPosition.cpp"/>
<ClCompile Include="compiler\translator\VariablePacker.cpp"/> <ClCompile Include="compiler\translator\VariablePacker.cpp"/>
<ClCompile Include="compiler\translator\parseConst.cpp"/> <ClCompile Include="compiler\translator\parseConst.cpp"/>
<ClCompile Include="compiler\translator\ParseHelper.cpp"/>
<ClCompile Include="compiler\translator\VersionGLSL.cpp"/> <ClCompile Include="compiler\translator\VersionGLSL.cpp"/>
<ClCompile Include="compiler\translator\DetectCallDepth.cpp"/> <ClCompile Include="compiler\translator\DetectCallDepth.cpp"/>
<ClCompile Include="compiler\translator\InitializeParseContext.cpp"/> <ClCompile Include="compiler\translator\InitializeParseContext.cpp"/>
......
...@@ -133,6 +133,9 @@ ...@@ -133,6 +133,9 @@
<ClCompile Include="compiler\translator\ShaderVariable.cpp"> <ClCompile Include="compiler\translator\ShaderVariable.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="compiler\translator\ParseContext.cpp">
<Filter>compiler\translator</Filter>
</ClCompile>
<ClInclude Include="compiler\translator\ValidateOutputs.h"> <ClInclude Include="compiler\translator\ValidateOutputs.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -181,6 +184,9 @@ ...@@ -181,6 +184,9 @@
<ClCompile Include="compiler\translator\Diagnostics.cpp"> <ClCompile Include="compiler\translator\Diagnostics.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="compiler\translator\ParseContext.h">
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="compiler\translator\QualifierAlive.cpp"> <ClCompile Include="compiler\translator\QualifierAlive.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
...@@ -259,9 +265,6 @@ ...@@ -259,9 +265,6 @@
<ClInclude Include="compiler\translator\ValidateLimitations.h"> <ClInclude Include="compiler\translator\ValidateLimitations.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="compiler\translator\ParseHelper.cpp">
<Filter>compiler\translator</Filter>
</ClCompile>
<ClInclude Include="compiler\translator\Types.h"> <ClInclude Include="compiler\translator\Types.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -304,9 +307,6 @@ ...@@ -304,9 +307,6 @@
<ClCompile Include="compiler\translator\CodeGen.cpp"> <ClCompile Include="compiler\translator\CodeGen.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="compiler\translator\ParseHelper.h">
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="compiler\translator\IntermTraverse.cpp"> <ClCompile Include="compiler\translator\IntermTraverse.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
......
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
<ClInclude Include="compiler\translator\HLSLLayoutEncoder.h"/> <ClInclude Include="compiler\translator\HLSLLayoutEncoder.h"/>
<ClInclude Include="compiler\translator\QualifierAlive.h"/> <ClInclude Include="compiler\translator\QualifierAlive.h"/>
<ClInclude Include="compiler\translator\ConstantUnion.h"/> <ClInclude Include="compiler\translator\ConstantUnion.h"/>
<ClInclude Include="compiler\translator\ParseContext.h"/>
<ClInclude Include="compiler\translator\Diagnostics.h"/> <ClInclude Include="compiler\translator\Diagnostics.h"/>
<ClInclude Include="compiler\translator\VersionGLSL.h"/> <ClInclude Include="compiler\translator\VersionGLSL.h"/>
<ClInclude Include="compiler\translator\HashNames.h"/> <ClInclude Include="compiler\translator\HashNames.h"/>
...@@ -166,7 +167,6 @@ ...@@ -166,7 +167,6 @@
<ClInclude Include="compiler\translator\VariablePacker.h"/> <ClInclude Include="compiler\translator\VariablePacker.h"/>
<ClInclude Include="compiler\translator\glslang.h"/> <ClInclude Include="compiler\translator\glslang.h"/>
<ClInclude Include="compiler\translator\SearchSymbol.h"/> <ClInclude Include="compiler\translator\SearchSymbol.h"/>
<ClInclude Include="compiler\translator\ParseHelper.h"/>
<ClInclude Include="compiler\translator\BlockLayoutEncoder.h"/> <ClInclude Include="compiler\translator\BlockLayoutEncoder.h"/>
<ClInclude Include="compiler\translator\MMap.h"/> <ClInclude Include="compiler\translator\MMap.h"/>
<ClInclude Include="compiler\translator\OutputHLSL.h"/> <ClInclude Include="compiler\translator\OutputHLSL.h"/>
...@@ -197,6 +197,7 @@ ...@@ -197,6 +197,7 @@
<ClCompile Include="compiler\translator\TranslatorHLSL.cpp"/> <ClCompile Include="compiler\translator\TranslatorHLSL.cpp"/>
<ClCompile Include="compiler\translator\OutputGLSLBase.cpp"/> <ClCompile Include="compiler\translator\OutputGLSLBase.cpp"/>
<ClCompile Include="compiler\translator\ShaderVariable.cpp"/> <ClCompile Include="compiler\translator\ShaderVariable.cpp"/>
<ClCompile Include="compiler\translator\ParseContext.cpp"/>
<ClCompile Include="compiler\translator\RemoveTree.cpp"/> <ClCompile Include="compiler\translator\RemoveTree.cpp"/>
<ClCompile Include="compiler\translator\InitializeDll.cpp"/> <ClCompile Include="compiler\translator\InitializeDll.cpp"/>
<ClCompile Include="compiler\translator\PoolAlloc.cpp"/> <ClCompile Include="compiler\translator\PoolAlloc.cpp"/>
...@@ -211,7 +212,6 @@ ...@@ -211,7 +212,6 @@
<ClCompile Include="compiler\translator\InitializeGLPosition.cpp"/> <ClCompile Include="compiler\translator\InitializeGLPosition.cpp"/>
<ClCompile Include="compiler\translator\VariablePacker.cpp"/> <ClCompile Include="compiler\translator\VariablePacker.cpp"/>
<ClCompile Include="compiler\translator\parseConst.cpp"/> <ClCompile Include="compiler\translator\parseConst.cpp"/>
<ClCompile Include="compiler\translator\ParseHelper.cpp"/>
<ClCompile Include="compiler\translator\VersionGLSL.cpp"/> <ClCompile Include="compiler\translator\VersionGLSL.cpp"/>
<ClCompile Include="compiler\translator\DetectCallDepth.cpp"/> <ClCompile Include="compiler\translator\DetectCallDepth.cpp"/>
<ClCompile Include="compiler\translator\InitializeParseContext.cpp"/> <ClCompile Include="compiler\translator\InitializeParseContext.cpp"/>
......
...@@ -133,6 +133,9 @@ ...@@ -133,6 +133,9 @@
<ClCompile Include="compiler\translator\ShaderVariable.cpp"> <ClCompile Include="compiler\translator\ShaderVariable.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="compiler\translator\ParseContext.cpp">
<Filter>compiler\translator</Filter>
</ClCompile>
<ClInclude Include="compiler\translator\ValidateOutputs.h"> <ClInclude Include="compiler\translator\ValidateOutputs.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -181,6 +184,9 @@ ...@@ -181,6 +184,9 @@
<ClCompile Include="compiler\translator\Diagnostics.cpp"> <ClCompile Include="compiler\translator\Diagnostics.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="compiler\translator\ParseContext.h">
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="compiler\translator\QualifierAlive.cpp"> <ClCompile Include="compiler\translator\QualifierAlive.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
...@@ -259,9 +265,6 @@ ...@@ -259,9 +265,6 @@
<ClInclude Include="compiler\translator\ValidateLimitations.h"> <ClInclude Include="compiler\translator\ValidateLimitations.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="compiler\translator\ParseHelper.cpp">
<Filter>compiler\translator</Filter>
</ClCompile>
<ClInclude Include="compiler\translator\Types.h"> <ClInclude Include="compiler\translator\Types.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -304,9 +307,6 @@ ...@@ -304,9 +307,6 @@
<ClCompile Include="compiler\translator\CodeGen.cpp"> <ClCompile Include="compiler\translator\CodeGen.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="compiler\translator\ParseHelper.h">
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="compiler\translator\IntermTraverse.cpp"> <ClCompile Include="compiler\translator\IntermTraverse.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment