BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use more modern bison %parse-param and %lex-param rather than #defined YYPARSE_PARAM and YYLEX_PARAM. This should make it build across a broader range of modern versions of bison, as well as avoid void* and type casting.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25746 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2014-03-08 00:17:27 +00:00
parent 8922ce7353
commit 6b57784690
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glslang/Include/revision.h
View file

@ -9,5 +9,5 @@
// source have to figure out how to create revision.h just to get a build // source have to figure out how to create revision.h just to get a build
// going. However, if it is not updated, it can be a version behind. // going. However, if it is not updated, it can be a version behind.
#define GLSLANG_REVISION "25511" #define GLSLANG_REVISION "25512"
#define GLSLANG_DATE "2014/02/24 14:16:19" #define GLSLANG_DATE "2014/02/24 14:36:08"

4
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -43,7 +43,7 @@
#include "preprocessor/PpContext.h" #include "preprocessor/PpContext.h"
extern int yyparse(void*); extern int yyparse(glslang::TParseContext*);
namespace glslang { namespace glslang {
@ -143,7 +143,7 @@ bool TParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner& inp
{ {
currentScanner = &input; currentScanner = &input;
ppContext.setInput(input, versionWillBeError); ppContext.setInput(input, versionWillBeError);
yyparse((void*)this); yyparse(this);
finalErrorCheck(); finalErrorCheck();
return numErrors == 0; return numErrors == 0;

2
glslang/MachineIndependent/Scan.cpp
View file

@ -42,8 +42,8 @@
#include "../Include/Types.h" #include "../Include/Types.h"
#include "SymbolTable.h" #include "SymbolTable.h"
#include "glslang_tab.cpp.h"
#include "ParseHelper.h" #include "ParseHelper.h"
#include "glslang_tab.cpp.h"
#include "ScanContext.h" #include "ScanContext.h"
#include "Scan.h" #include "Scan.h"

8
glslang/MachineIndependent/glslang.y
View file

@ -97,15 +97,15 @@ using namespace glslang;
%{ %{
#define YYPARSE_PARAM voidParseContext #define parseContext (*pParseContext)
#define parseContext (*(TParseContext*)voidParseContext) #define yyerror(context, msg) context->parserError(msg)
#define YYLEX_PARAM parseContext
#define yyerror(msg) parseContext.parserError(msg)
extern int yylex(YYSTYPE*, TParseContext&); extern int yylex(YYSTYPE*, TParseContext&);
%} %}
%parse-param {glslang::TParseContext* pParseContext}
%lex-param {parseContext}
%pure_parser // enable thread safety %pure_parser // enable thread safety
%expect 1 // One shift reduce conflict because of if | else %expect 1 // One shift reduce conflict because of if | else