diff options
| author | Carl Worth <cworth@cworth.org> | 2014-06-20 14:58:48 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-07-29 15:11:49 -0700 |
| commit | 828686d4ebe055d1c6583192bc57742e101ff931 (patch) | |
| tree | fe6825369bfd1e755dd8b4f83e7121bc8e3744dc /src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected | |
| parent | 5dbdc341e8e8502ab5d98784a24b54c6f3907472 (diff) | |
| download | external_mesa3d-828686d4ebe055d1c6583192bc57742e101ff931.zip external_mesa3d-828686d4ebe055d1c6583192bc57742e101ff931.tar.gz external_mesa3d-828686d4ebe055d1c6583192bc57742e101ff931.tar.bz2 | |
glsl/glcpp: Drop extra, final newline from most output
The glcpp parser is line-based, so it needs to see a NEWLINE token at the end
of each line. This causes a trick for files that end without a final newline.
Previously, the lexer for glcpp punted in this case by unconditionally
returning a NEWLINE token at end-of-file, (causing most files to have an extra
blank line at the end). Here, we refine this by lexing end-of-file as a
NEWLINE token only if the immediately preceding token was not a NEWLINE token.
The patch is a minor change that only looks huge for two reasons:
1. Almost all glcpp test result ".expected" files are updated to drop
the extra newline.
2. All return statements from the lexer are adjusted to use a new
RETURN_TOKEN macro that tracks the last-token-was-a-newline state.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected')
| -rw-r--r-- | src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected b/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected index 68d489b..b0601d7 100644 --- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected +++ b/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected @@ -5,4 +5,3 @@ int foo(); - |