mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preprocessor: Rationalize, simplify, and correct the stack of input sources and their tokenization. This included

Browse Source 
- consistently dealing with EOF and its effect on error recovery (bug 11444, #1)
 - turning a simulated OO hierarchy of function pointers and typecasting into a real C++ class hierarchy
 - correctly handling '\' everywhere, in all classes of tokens, as a layer before preprocessing itself
 - conditionally handling '\n' in macro expansion input, depending on whether it is in a macro expression or not
 - delete some unused "memory cleanup" code


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24626 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-12-30 20:34:28 +00:00
parent 08d182470b
commit fcb4ed054c
16 changed files with 750 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Test/baseResults/cppSimple.vert.out
View File

@@ -6,15 +6,15 @@ ERROR: 0:85: '#error' : good3
ERROR: 0:89: '#error' : good4
ERROR: 0:93: '#error' : good5
ERROR: 0:97: '#error' : good6
ERROR: 0:101: 'preprocessor evaluation' : expected ')'
ERROR: 0:100: 'preprocessor evaluation' : expected ')'
ERROR: 0:101: '#error' : bad1
ERROR: 0:104: '#if' : unexpected tokens following directive
ERROR: 0:105: '#error' : bad2
ERROR: 0:109: 'preprocessor evaluation' : expected ')'
ERROR: 0:108: 'preprocessor evaluation' : expected ')'
ERROR: 0:109: '#error' : bad3
ERROR: 0:112: '#if' : unexpected tokens following directive
ERROR: 0:113: '#error' : bad4
ERROR: 0:117: 'preprocessor evaluation' : expected ')'
ERROR: 0:116: 'preprocessor evaluation' : expected ')'
ERROR: 0:117: '#error' : bad5
ERROR: 0:120: '#if' : unexpected tokens following directive
ERROR: 0:121: '#error' : bad6
@@ -74,8 +74,16 @@ ERROR: 12:20021: '#error' : line should be 20021
ERROR: 12:20046: '#define' : Macro redefined; different substitutions: SPACE_IN_MIDDLE
ERROR: 12:20052: '#error' : good evaluation 1
ERROR: 12:20056: '#error' : good evaluation 2
ERROR: 12:9001: 'preprocessor evaluation' : expected ')'
ERROR: 12:9003: '#if' : unexpected tokens following directive
ERROR: 12:9015: 'macro expansion' : expected '(' following FOOOM
ERROR: 12:9015: 'FOOOM' : undeclared identifier
ERROR: 12:9015: '=' : cannot convert from 'float' to 'int'
ERROR: 12:9016: 'macro expansion' : expected '(' following FOOOM
ERROR: 12:9017: 'preprocessor evaluation' : can't evaluate expression
ERROR: 12:9017: 'preprocessor evaluation' : bad expression
ERROR: 12:10003: '' : missing #endif
ERROR: 75 compilation errors. No code generated.
ERROR: 83 compilation errors. No code generated.
ERROR: node is still EOpNull!
@@ -165,6 +173,10 @@ ERROR: node is still EOpNull!
12:20034 6.000000
12:20034 6.000000
12:20034 6.000000
12:9012 Sequence
12:9012 move second child to first child (int)
12:9012 'R1' (int)
12:9012 'RECURSE' (int)
0:? Linker Objects
0:? 'sum' (float)
0:? 'linenumber' (int)
@@ -174,6 +186,9 @@ ERROR: node is still EOpNull!
0:? 'a' (int)
0:? 'n' (int)
0:? 'f' (double)
0:? 'RECURSE' (int)
0:? 'R1' (int)
0:? 'aoeua' (int)
0:? 'gl_VertexID' (gl_VertexId int)
0:? 'gl_InstanceID' (gl_InstanceId int)