mesa/src/glsl/glcpp at a196ab1f8aacf657e591a0a15c80c3f37b9496b0 - mesa

Files

T

Carl Worth a196ab1f8a glsl/glcpp: Add explicit error for "#define without macro name"

Previously, glcpp would emit an error like this if <EOF> happened to occur
immediately after the "#define", but in general would just get confused,
(leading to un-helpful error messages).

To fix things to generate a clean error message, we do a few things:

	1. Don't require horizontal whitespace immediately after #define

	2. Add a production for the error case, (DEFINE_TOKEN followed
	   immediately by a NEWLINE token).

	3. Make the lexer reset to the <INITIAL> state after every NEWLINE.

This 3rd point prevents the lexer from getting so confused and generating
further spurious errors in the file because it was stuck in the <DEFINE> start
condition.

We also drop the similar error message from the <EOF> rule since the
newly-added rule will have already printed the error message.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

2014-08-07 16:08:28 -07:00

tests

glsl/glcpp: Add explicit error for "#define without macro name"

2014-08-07 16:08:28 -07:00

.gitignore

glcpp: Add back tests/*.out to .gitignore

2013-01-11 11:49:33 +01:00

glcpp-lex.l

glsl/glcpp: Add explicit error for "#define without macro name"

2014-08-07 16:08:28 -07:00

glcpp-parse.y

glsl/glcpp: Add explicit error for "#define without macro name"

2014-08-07 16:08:28 -07:00

glcpp.c

glsl/glcpp: Add a -d/--debug option to the standalone glcpp program

2014-07-29 15:11:49 -07:00

glcpp.h

util: Move ralloc to a new src/util directory.

2014-08-04 11:06:58 -07:00

pp.c

glcpp: Resolve implicit GLSL version to 100 if the API is ES.

2014-01-27 21:15:35 -08:00

README

glcpp: Update README for new support of __LINE__ and __FILE__.

2012-11-29 13:03:02 -08:00

README

glcpp -- GLSL "C" preprocessor

This is a simple preprocessor designed to provide the preprocessing
needs of the GLSL language. The requirements for this preprocessor are
specified in the GLSL 1.30 specification availble from:

http://www.opengl.org/registry/doc/GLSLangSpec.Full.1.30.10.pdf

This specification is not precise on some semantics, (for example,
#define and #if), defining these merely "as is standard for C++
preprocessors". To fill in these details, I've been using a draft of
the C99 standard as available from:

http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf

Any downstream compiler accepting output from glcpp should be prepared
to encounter and deal with the following preprocessor macros:

	#line
	#pragma
	#extension

All other macros will be handled according to the GLSL specification
and will not appear in the output.

Known limitations
-----------------
A file that ends with a function-like macro name as the last
non-whitespace token will result in a parse error, (where it should be
passed through as is).