From ea2e9300ece89dffdc4a228dc86bea28a7cd58e2 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 17 Jun 2014 11:55:07 -0700 Subject: [PATCH] glsl/glcpp: Emit proper error for #define with a non-identifier Previously, if the preprocessor encountered a #define with a non-identifier, such as: #define 123 456 The lexer had no explicit rules to match non-identifiers in the start state. Because of this, flex's default rule was being invoked, (printing characters to stdout), and all text was being discarded by the compiler until the next identifier. As one can imagine, this led to all sorts of interesting and surprising results. Fix this by adding an explicit rule complementing the existing identifier-based rules that should catch all non-identifiers after #define and reliably give a well-formatted error message. A new test is added to "make check" to ensure this bug stays fixed. This commit also fixes the following Khronos GLES3 CTS test: define_non_identifier_vertex (The "fragment" variant was passing earlier only because the preprocessor was behaving so randomly and causing the compilation to fail. It's lucky, in fact, that the "vertex" version succesfully compiled so we could find and fix this bug.) Reviewed-by: Jordan Justen --- src/glsl/glcpp/glcpp-lex.l | 6 ++++++ src/glsl/glcpp/tests/129-define-non-identifier.c | 1 + src/glsl/glcpp/tests/129-define-non-identifier.c.expected | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 src/glsl/glcpp/tests/129-define-non-identifier.c create mode 100644 src/glsl/glcpp/tests/129-define-non-identifier.c.expected diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index cfb9f2a18be..0d4bfc8d443 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -259,6 +259,12 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? return OBJ_IDENTIFIER; } +[^_a-zA-Z]{NONSPACE}* { + BEGIN INITIAL; + glcpp_error(yylloc, yyextra, "#define followed by a non-identifier: %s", yytext); + return INTEGER_STRING; +} + {HASH}undef { yyextra->space_tokens = 0; return HASH_UNDEF; diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c b/src/glsl/glcpp/tests/129-define-non-identifier.c new file mode 100644 index 00000000000..a229179f18c --- /dev/null +++ b/src/glsl/glcpp/tests/129-define-non-identifier.c @@ -0,0 +1 @@ +#define 123 456 diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/glsl/glcpp/tests/129-define-non-identifier.c.expected new file mode 100644 index 00000000000..b460357fe20 --- /dev/null +++ b/src/glsl/glcpp/tests/129-define-non-identifier.c.expected @@ -0,0 +1,2 @@ +0:1(10): preprocessor error: #define followed by a non-identifier: 123 +0:1(10): preprocessor error: syntax error, unexpected INTEGER_STRING, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER -- 2.30.2