Fixed a couple places that missed the error check for #else/#elif after #else.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24378 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
@@ -1,6 +1,12 @@
|
||||
cppNest.vert
|
||||
ERROR: 0:144: '#elif' : #elif after #else
|
||||
ERROR: 0:152: '#else' : #else after #else
|
||||
ERROR: 0:161: '#elif' : #elif after #else
|
||||
ERROR: 0:169: '#else' : #else after #else
|
||||
ERROR: 4 compilation errors. No code generated.
|
||||
|
||||
0:? Sequence
|
||||
|
||||
ERROR: node is still EOpNull!
|
||||
0:5 Sequence
|
||||
0:5 move second child to first child (float)
|
||||
0:5 'sum' (float)
|
||||
|
||||
@@ -31,7 +31,7 @@ ERROR: 0:143: '#define' : can't use with built-in names (containing consecutive
|
||||
ERROR: 0:144: '#define' : can't use with built-in names (containing consecutive underscores)
|
||||
ERROR: 0:145: '#define' : can't use with built-in names (containing consecutive underscores)
|
||||
ERROR: 0:148: '#else' : unexpected tokens following directive
|
||||
ERROR: 0:149: '#else' : #elif after #else
|
||||
ERROR: 0:149: '#elif' : #elif after #else
|
||||
ERROR: 0:155: '#else' : unexpected tokens following directive
|
||||
ERROR: 0:158: '#else' : #else after #else
|
||||
ERROR: 0:160: '#endif' : unexpected tokens following directive
|
||||
|
||||
@@ -134,3 +134,39 @@ sum += 600000.0;
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// ERROR cases...
|
||||
|
||||
#if 0
|
||||
int;
|
||||
#else
|
||||
int;
|
||||
#elif 1
|
||||
int;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
int;
|
||||
#else
|
||||
int;
|
||||
#else
|
||||
int;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
#if 0
|
||||
int;
|
||||
#else
|
||||
int;
|
||||
#elif 1
|
||||
int;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
int;
|
||||
#else
|
||||
int;
|
||||
#else
|
||||
int;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user