Skip to content

G
glslang
Commit c973c004 by John Kessenich
Options

Non-functional: Use better token names for the preprocessor.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23624 e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent 1f4104fb
Showing with 56 additions and 56 deletions
glslang/MachineIndependent/Scan.cpp
...@@ -483,7 +483,7 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token) ...@@ -483,7 +483,7 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
loc = ppToken.loc; loc = ppToken.loc;
parserToken->sType.lex.loc = loc; parserToken->sType.lex.loc = loc;
switch (ppToken.ppToken) { switch (ppToken.token) {
case ';': afterType = false; return SEMICOLON; case ';': afterType = false; return SEMICOLON;
case ',': afterType = false; return COMMA; case ',': afterType = false; return COMMA;
case ':': return COLON; case ':': return COLON;
......
glslang/MachineIndependent/preprocessor/PpContext.h
...@@ -90,7 +90,7 @@ public: ...@@ -90,7 +90,7 @@ public:
static const int maxTokenLength = 1024; static const int maxTokenLength = 1024;
TSourceLoc loc; TSourceLoc loc;
int ppToken; int token;
int ival; int ival;
double dval; double dval;
int atom; int atom;
...@@ -108,7 +108,7 @@ public: ...@@ -108,7 +108,7 @@ public:
void setPreamble(const char* preamble, size_t length); void setPreamble(const char* preamble, size_t length);
void setShaderStrings(char* strings[], size_t lengths[], int numStrings); void setShaderStrings(char* strings[], size_t lengths[], int numStrings);
const char* tokenize(TPpToken* yylvalpp); const char* tokenize(TPpToken* ppToken);
struct InputSrc { struct InputSrc {
struct InputSrc *prev; struct InputSrc *prev;
...@@ -230,25 +230,25 @@ protected: ...@@ -230,25 +230,25 @@ protected:
int InitCPP(); int InitCPP();
int FinalCPP(); int FinalCPP();
int CPPdefine(TPpToken * yylvalpp); int CPPdefine(TPpToken * ppToken);
int CPPundef(TPpToken * yylvalpp); int CPPundef(TPpToken * ppToken);
int CPPelse(int matchelse, TPpToken * yylvalpp); int CPPelse(int matchelse, TPpToken * ppToken);
int eval(int token, int prec, int *res, int *err, TPpToken * yylvalpp); int eval(int token, int prec, int *res, int *err, TPpToken * ppToken);
int CPPif (TPpToken * yylvalpp); int CPPif (TPpToken * ppToken);
int CPPifdef(int defined, TPpToken * yylvalpp); int CPPifdef(int defined, TPpToken * ppToken);
int CPPline(TPpToken * yylvalpp); int CPPline(TPpToken * ppToken);
int CPPerror(TPpToken * yylvalpp); int CPPerror(TPpToken * ppToken);
int CPPpragma(TPpToken * yylvalpp); int CPPpragma(TPpToken * ppToken);
int CPPversion(TPpToken * yylvalpp); int CPPversion(TPpToken * ppToken);
int CPPextension(TPpToken * yylvalpp); int CPPextension(TPpToken * ppToken);
int readCPPline(TPpToken * yylvalpp); int readCPPline(TPpToken * ppToken);
void FreeMacro(MacroSymbol *s); void FreeMacro(MacroSymbol *s);
void PushEofSrc(); void PushEofSrc();
void PopEofSrc(); void PopEofSrc();
TokenStream* PrescanMacroArg(TokenStream *a, TPpToken * yylvalpp); TokenStream* PrescanMacroArg(TokenStream *a, TPpToken * ppToken);
static int macro_scan(TPpContext* pp, InputSrc *inInput, TPpToken * yylvalpp); static int macro_scan(TPpContext* pp, InputSrc *inInput, TPpToken * ppToken);
static int zero_scan(TPpContext* pp, InputSrc *inInput, TPpToken * yylvalpp); static int zero_scan(TPpContext* pp, InputSrc *inInput, TPpToken * ppToken);
int MacroExpand(int atom, TPpToken* yylvalpp, int expandUndef); int MacroExpand(int atom, TPpToken* ppToken, int expandUndef);
int ChkCorrectElseNesting(); int ChkCorrectElseNesting();
// //
...@@ -267,24 +267,24 @@ protected: ...@@ -267,24 +267,24 @@ protected:
int lReadByte(TokenStream *pTok); int lReadByte(TokenStream *pTok);
TokenStream *NewTokenStream(const char *name, MemoryPool *pool); TokenStream *NewTokenStream(const char *name, MemoryPool *pool);
void DeleteTokenStream(TokenStream *pTok); void DeleteTokenStream(TokenStream *pTok);
void RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp); void RecordToken(TokenStream *pTok, int token, TPpToken * ppToken);
void RewindTokenStream(TokenStream *pTok); void RewindTokenStream(TokenStream *pTok);
int ReadToken(TokenStream *pTok, TPpToken * yylvalpp); int ReadToken(TokenStream *pTok, TPpToken * ppToken);
int ReadFromTokenStream(TokenStream *ts, int name, int (*final)(TPpContext *)); int ReadFromTokenStream(TokenStream *ts, int name, int (*final)(TPpContext *));
void UngetToken(int token, TPpToken * yylvalpp); void UngetToken(int token, TPpToken * ppToken);
void DumpTokenStream(FILE *fp, TokenStream *s, TPpToken * yylvalpp); void DumpTokenStream(FILE *fp, TokenStream *s, TPpToken * ppToken);
struct TokenInputSrc { struct TokenInputSrc {
InputSrc base; InputSrc base;
TokenStream *tokens; TokenStream *tokens;
int (*final)(TPpContext *); int (*final)(TPpContext *);
}; };
static int scan_token(TPpContext*, TokenInputSrc *in, TPpToken * yylvalpp); static int scan_token(TPpContext*, TokenInputSrc *in, TPpToken * ppToken);
struct UngotToken { struct UngotToken {
InputSrc base; InputSrc base;
int token; int token;
TPpToken lval; TPpToken lval;
}; };
static int reget_token(TPpContext *, UngotToken *t, TPpToken * yylvalpp); static int reget_token(TPpContext *, UngotToken *t, TPpToken * ppToken);
// //
// From PpScanner.cpp // From PpScanner.cpp
...@@ -298,8 +298,8 @@ protected: ...@@ -298,8 +298,8 @@ protected:
static void str_ungetch(TPpContext*, StringInputSrc *in, int ch, TPpToken *type); static void str_ungetch(TPpContext*, StringInputSrc *in, int ch, TPpToken *type);
int ScanFromString(char *s); int ScanFromString(char *s);
int check_EOF(int token); int check_EOF(int token);
int lFloatConst(char *str, int len, int ch, TPpToken * yylvalpp); int lFloatConst(char *str, int len, int ch, TPpToken * ppToken);
static int byte_scan(TPpContext*, InputSrc *in, TPpToken * yylvalpp); static int byte_scan(TPpContext*, InputSrc *in, TPpToken * ppToken);
// //
// From PpAtom.cpp // From PpAtom.cpp
......
glslang/MachineIndependent/preprocessor/PpTokens.cpp
...@@ -243,7 +243,7 @@ void TPpContext::DeleteTokenStream(TokenStream *pTok) ...@@ -243,7 +243,7 @@ void TPpContext::DeleteTokenStream(TokenStream *pTok)
* *
*/ */
void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp) void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * ppToken)
{ {
const char *s; const char *s;
char *str = NULL; char *str = NULL;
...@@ -256,7 +256,7 @@ void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp) ...@@ -256,7 +256,7 @@ void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp)
case CPP_IDENTIFIER: case CPP_IDENTIFIER:
case CPP_TYPEIDENTIFIER: case CPP_TYPEIDENTIFIER:
case CPP_STRCONSTANT: case CPP_STRCONSTANT:
s = GetAtomString(yylvalpp->atom); s = GetAtomString(ppToken->atom);
while (*s) while (*s)
lAddByte(pTok, (unsigned char) *s++); lAddByte(pTok, (unsigned char) *s++);
lAddByte(pTok, 0); lAddByte(pTok, 0);
...@@ -265,7 +265,7 @@ void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp) ...@@ -265,7 +265,7 @@ void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp)
case CPP_UINTCONSTANT: case CPP_UINTCONSTANT:
case CPP_FLOATCONSTANT: case CPP_FLOATCONSTANT:
case CPP_DOUBLECONSTANT: case CPP_DOUBLECONSTANT:
str = yylvalpp->name; str = ppToken->name;
while (*str){ while (*str){
lAddByte(pTok, (unsigned char) *str); lAddByte(pTok, (unsigned char) *str);
str++; str++;
...@@ -273,7 +273,7 @@ void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp) ...@@ -273,7 +273,7 @@ void TPpContext::RecordToken(TokenStream *pTok, int token, TPpToken * yylvalpp)
lAddByte(pTok, 0); lAddByte(pTok, 0);
break; break;
case '(': case '(':
lAddByte(pTok, (unsigned char)(yylvalpp->ival ? 1 : 0)); lAddByte(pTok, (unsigned char)(ppToken->ival ? 1 : 0));
default: default:
break; break;
} }
...@@ -297,7 +297,7 @@ void TPpContext::RewindTokenStream(TokenStream *pTok) ...@@ -297,7 +297,7 @@ void TPpContext::RewindTokenStream(TokenStream *pTok)
* *
*/ */
int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp) int TPpContext::ReadToken(TokenStream *pTok, TPpToken *ppToken)
{ {
//TODO: PP: why is this different than byte_scan //TODO: PP: why is this different than byte_scan
...@@ -306,7 +306,7 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp) ...@@ -306,7 +306,7 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp)
char ch; char ch;
ltoken = lReadByte(pTok); ltoken = lReadByte(pTok);
yylvalpp->loc = parseContext.currentLoc; ppToken->loc = parseContext.currentLoc;
if (ltoken >= 0) { if (ltoken >= 0) {
if (ltoken > 127) if (ltoken > 127)
ltoken += 128; ltoken += 128;
...@@ -325,13 +325,13 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp) ...@@ -325,13 +325,13 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp)
len++; len++;
ch = lReadByte(pTok); ch = lReadByte(pTok);
} else { } else {
parseContext.error(yylvalpp->loc,"name too long", "", ""); parseContext.error(ppToken->loc,"name too long", "", "");
break; break;
} }
} }
tokenText[len] = '\0'; tokenText[len] = '\0';
assert(ch == '\0'); assert(ch == '\0');
yylvalpp->atom = LookUpAddString(tokenText); ppToken->atom = LookUpAddString(tokenText);
return CPP_IDENTIFIER; return CPP_IDENTIFIER;
break; break;
case CPP_STRCONSTANT: case CPP_STRCONSTANT:
...@@ -344,7 +344,7 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp) ...@@ -344,7 +344,7 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp)
} }
tokenText[len] = 0; tokenText[len] = 0;
yylvalpp->atom = LookUpAddString(tokenText); ppToken->atom = LookUpAddString(tokenText);
break; break;
case CPP_FLOATCONSTANT: case CPP_FLOATCONSTANT:
case CPP_DOUBLECONSTANT: case CPP_DOUBLECONSTANT:
...@@ -357,14 +357,14 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp) ...@@ -357,14 +357,14 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp)
len++; len++;
ch = lReadByte(pTok); ch = lReadByte(pTok);
} else { } else {
parseContext.error(yylvalpp->loc,"float literal too long", "", ""); parseContext.error(ppToken->loc,"float literal too long", "", "");
break; break;
} }
} }
tokenText[len] = '\0'; tokenText[len] = '\0';
assert(ch == '\0'); assert(ch == '\0');
strcpy(yylvalpp->name, tokenText); strcpy(ppToken->name, tokenText);
yylvalpp->dval = atof(yylvalpp->name); ppToken->dval = atof(ppToken->name);
break; break;
case CPP_INTCONSTANT: case CPP_INTCONSTANT:
case CPP_UINTCONSTANT: case CPP_UINTCONSTANT:
...@@ -377,17 +377,17 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp) ...@@ -377,17 +377,17 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp)
len++; len++;
ch = lReadByte(pTok); ch = lReadByte(pTok);
} else { } else {
parseContext.error(yylvalpp->loc,"integer literal too long", "", ""); parseContext.error(ppToken->loc,"integer literal too long", "", "");
break; break;
} }
} }
tokenText[len] = '\0'; tokenText[len] = '\0';
assert(ch == '\0'); assert(ch == '\0');
strcpy(yylvalpp->name,tokenText); strcpy(ppToken->name,tokenText);
yylvalpp->ival = atoi(yylvalpp->name); ppToken->ival = atoi(ppToken->name);
break; break;
case '(': case '(':
yylvalpp->ival = lReadByte(pTok); ppToken->ival = lReadByte(pTok);
break; break;
} }
return ltoken; return ltoken;
...@@ -395,9 +395,9 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp) ...@@ -395,9 +395,9 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *yylvalpp)
return EOF; return EOF;
} // ReadToken } // ReadToken
int TPpContext::scan_token(TPpContext* pp, TokenInputSrc *in, TPpToken * yylvalpp) int TPpContext::scan_token(TPpContext* pp, TokenInputSrc *in, TPpToken * ppToken)
{ {
int token = pp->ReadToken(in->tokens, yylvalpp); int token = pp->ReadToken(in->tokens, ppToken);
int (*final)(TPpContext *); int (*final)(TPpContext *);
if (token == '\n') { if (token == '\n') {
in->base.line++; in->base.line++;
...@@ -411,7 +411,7 @@ int TPpContext::scan_token(TPpContext* pp, TokenInputSrc *in, TPpToken * yylvalp ...@@ -411,7 +411,7 @@ int TPpContext::scan_token(TPpContext* pp, TokenInputSrc *in, TPpToken * yylvalp
if (final && !final(pp)) if (final && !final(pp))
return -1; return -1;
return pp->currentInput->scan(pp, pp->currentInput, yylvalpp); return pp->currentInput->scan(pp, pp->currentInput, ppToken);
} }
int TPpContext::ReadFromTokenStream(TokenStream *ts, int name, int (*final)(TPpContext *)) int TPpContext::ReadFromTokenStream(TokenStream *ts, int name, int (*final)(TPpContext *))
...@@ -430,10 +430,10 @@ int TPpContext::ReadFromTokenStream(TokenStream *ts, int name, int (*final)(TPpC ...@@ -430,10 +430,10 @@ int TPpContext::ReadFromTokenStream(TokenStream *ts, int name, int (*final)(TPpC
return 1; return 1;
} }
int TPpContext::reget_token(TPpContext* pp, UngotToken *t, TPpToken * yylvalpp) int TPpContext::reget_token(TPpContext* pp, UngotToken *t, TPpToken * ppToken)
{ {
int token = t->token; int token = t->token;
*yylvalpp = t->lval; *ppToken = t->lval;
pp->currentInput = t->base.prev; pp->currentInput = t->base.prev;
free(t); free(t);
return token; return token;
...@@ -441,12 +441,12 @@ int TPpContext::reget_token(TPpContext* pp, UngotToken *t, TPpToken * yylvalpp) ...@@ -441,12 +441,12 @@ int TPpContext::reget_token(TPpContext* pp, UngotToken *t, TPpToken * yylvalpp)
typedef int (*scanFnPtr_t); typedef int (*scanFnPtr_t);
void TPpContext::UngetToken(int token, TPpToken * yylvalpp) void TPpContext::UngetToken(int token, TPpToken * ppToken)
{ {
UngotToken *t = (UngotToken *) malloc(sizeof(UngotToken)); UngotToken *t = (UngotToken *) malloc(sizeof(UngotToken));
memset(t, 0, sizeof(UngotToken)); memset(t, 0, sizeof(UngotToken));
t->token = token; t->token = token;
t->lval = *yylvalpp; t->lval = *ppToken;
t->base.scan = (int(*)(TPpContext*, struct InputSrc *, TPpToken *))reget_token; t->base.scan = (int(*)(TPpContext*, struct InputSrc *, TPpToken *))reget_token;
t->base.prev = currentInput; t->base.prev = currentInput;
t->base.name = currentInput->name; t->base.name = currentInput->name;
...@@ -455,28 +455,28 @@ void TPpContext::UngetToken(int token, TPpToken * yylvalpp) ...@@ -455,28 +455,28 @@ void TPpContext::UngetToken(int token, TPpToken * yylvalpp)
} }
void TPpContext::DumpTokenStream(FILE *fp, TokenStream *s, TPpToken * yylvalpp) void TPpContext::DumpTokenStream(FILE *fp, TokenStream *s, TPpToken * ppToken)
{ {
int token; int token;
if (fp == 0) fp = stdout; if (fp == 0) fp = stdout;
RewindTokenStream(s); RewindTokenStream(s);
while ((token = ReadToken(s, yylvalpp)) > 0) { while ((token = ReadToken(s, ppToken)) > 0) {
switch (token) { switch (token) {
case CPP_IDENTIFIER: case CPP_IDENTIFIER:
case CPP_TYPEIDENTIFIER: case CPP_TYPEIDENTIFIER:
printf("%s ", GetAtomString(yylvalpp->atom)); printf("%s ", GetAtomString(ppToken->atom));
break; break;
case CPP_STRCONSTANT: case CPP_STRCONSTANT:
printf("\"%s\"", GetAtomString(yylvalpp->atom)); printf("\"%s\"", GetAtomString(ppToken->atom));
break; break;
case CPP_FLOATCONSTANT: case CPP_FLOATCONSTANT:
case CPP_DOUBLECONSTANT: case CPP_DOUBLECONSTANT:
printf("%g9.6 ", yylvalpp->dval); printf("%g9.6 ", ppToken->dval);
break; break;
case CPP_INTCONSTANT: case CPP_INTCONSTANT:
case CPP_UINTCONSTANT: case CPP_UINTCONSTANT:
printf("%d ", yylvalpp->ival); printf("%d ", ppToken->ival);
break; break;
default: default:
if (token >= 127) if (token >= 127)
......
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