commit | 828686d4ebe055d1c6583192bc57742e101ff931 | [log] [tgz] |
---|---|---|
author | Carl Worth <cworth@cworth.org> | Fri Jun 20 14:58:48 2014 -0700 |
committer | Carl Worth <cworth@cworth.org> | Tue Jul 29 15:11:49 2014 -0700 |
tree | fe6825369bfd1e755dd8b4f83e7121bc8e3744dc | |
parent | 5dbdc341e8e8502ab5d98784a24b54c6f3907472 [diff] |
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>