4 commits

Author	SHA1	Message	Date
Carl Worth	828686d4eb	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>	2014-07-29 15:11:49 -07:00
Carl Worth	ce5d0a296c	glcpp: Fix 064-version.c expected result to track recent change. ... In commit 6be3a8b70a, the #version directive was fixed to stop generating a spurious newline. Here we simply update the expected result for the single test which includes a #version directive.	2010-08-17 22:23:43 -07:00
Carl Worth	4f9a64407c	glcpp: Fix expected result for the 064-version.c test. ... Commit d4a04f3155 caused this test case to produce an additional blank line, which is otherwise harmless, but does need to be reflected in the .expected file for the test to pass.	2010-08-10 18:25:30 -07:00
Eric Anholt	2928588267	glsl2: Move the compiler to the subdirectory it will live in in Mesa.	2010-06-24 15:36:00 -07:00

Renamed from glcpp/tests/064-version.c.expected (Browse further)