mesa/src/glsl/glcpp at eb26f0d5b68f0218d4c79c1825d0d9e6a905e199 - mesa

Files

T

Carl Worth eb26f0d5b6 glcpp: Don't include the newline when discarding single-line comments

Matching the newline here meant having to do some redundant work here,
(incrementing line number, resetting column number, and returning a
NEWLINE token), that could otherwise simply be left to the existing rule
which matches a newline.

Worse, when the comment rule matches the newline as well, the parser
can lookahead and see a token for something that should actually be skipped.

For example, in a case like this:

	#if 0 // comment here
	fail
	#else
	win
	#endif

Both fail and win appear in the output, (not that the condition is being
evaluated incorrectly---merely that one token after the comment's newline
was being lexed/parse regardless of the condition).

This commit fixes the above test case, (which is also remarkably similar
to 087-if-comments which now passes).

2010-08-17 22:17:09 -07:00

tests

glcpp: Add testcase for #if handling bug that breaks Savage2.

2010-08-17 17:51:10 -07:00

.gitignore

glcpp: Add generated source files.

2010-07-28 13:48:32 -07:00

glcpp-lex.c

glcpp: Refresh autogenerated lexer and parser.

2010-08-16 13:43:43 -07:00

glcpp-lex.l

glcpp: Don't include the newline when discarding single-line comments

2010-08-17 22:17:09 -07:00

glcpp-parse.c

glcpp: Refresh autogenerated lexer and parser.

2010-08-16 13:43:43 -07:00

glcpp-parse.h

glsl2: Refresh autogenerated bison parser.

2010-08-13 17:16:43 -07:00

glcpp-parse.y

glcpp: Remove spurious newline generated by #version handling.

2010-08-16 13:43:35 -07:00

glcpp.c

glsl2: Conditionally define preprocessor tokens for optional extensions

2010-07-01 20:40:08 -07:00

glcpp.h

glcpp: Remove xtalloc wrappers in favor of plain talloc.

2010-08-04 15:57:20 -07:00

Makefile.am

glcpp: Remove xtalloc wrappers in favor of plain talloc.

2010-08-04 15:57:20 -07:00

pp.c

glsl2: Include string.h in preprocessor

2010-08-13 18:36:55 +01:00

README

glsl2: Move the compiler to the subdirectory it will live in in Mesa.

2010-06-24 15:36:00 -07: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.08.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 the C99
standard (for which I had a convenient copy) as available from:

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

Known limitations
-----------------
Macro invocations cannot include embedded newlines.

The __LINE__, __FILE__, and __VERSION__ macros are not yet supported.

The argument of the 'defined' operator cannot yet include enclosing
parentheses.

The #error, #pragma, #extension, #version, and #line macros are not
yet supported.

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).