diff options
| author | Carl Worth <[email protected]> | 2012-06-09 16:31:06 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2012-06-26 15:23:49 -0700 |
| commit | aac78ce8234d96932c38b3f48b1d828077bc0027 (patch) | |
| tree | a4e067870c6e57d69aeb68f8ea6717adf4cdee78 /src/glsl/glcpp/tests | |
| parent | 39f8c46eaa4d1c3b072cd97d256fe973c1791b14 (diff) | |
glsl: glcpp: Move handling of #line directives from lexer to parser.
The GLSL specification requires that #line directives be interpreted
after macro expansion. Our existing implementation of #line macros in
the lexer prevents conformance on this point.
Moving the handling of #line from the lexer to the parser gives us the
macro expansion we need. An additional benefit is that the
preprocessor also now supports comments on the same line as #line
directives.
Finally, the preprocessor now emits the (fully-macro-expanded) #line
directives into the output. This allows the full GLSL compiler to also
see and interpret these directives so it can also generate correct
line numbers in error messages.
Signed-off-by: Carl Worth <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/tests')
| -rw-r--r-- | src/glsl/glcpp/tests/091-hash-line.c.expected | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/glsl/glcpp/tests/091-hash-line.c.expected index e663398c160..ea29149bc62 100644 --- a/src/glsl/glcpp/tests/091-hash-line.c.expected +++ b/src/glsl/glcpp/tests/091-hash-line.c.expected @@ -3,11 +3,11 @@ 1:0(1): preprocessor error: #error source 1, line 0 error 2:30(1): preprocessor error: #error source 2, line 30 error +#line 0 +#line 25 +#line 0 1 - - - - +#line 30 2 |