876e510bda
The last remaining thing here was that when a line ended with a macro, and the parser looked ahead to the newline token, the lexer was printing that newline before the parser printed the expansion of the macro. The fix is simple, just make the lexer tell the parser that a newline is needed, and the parser can wait until reducing a production to print that newline. With this, we now pass the entire test suite with simply "diff -u", so we no longer have any diff options hiding whitespace bugs from us. Hurrah!
182 lines
3.8 KiB
Plaintext
182 lines
3.8 KiB
Plaintext
%{
|
|
/*
|
|
* Copyright © 2010 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "glcpp.h"
|
|
#include "glcpp-parse.h"
|
|
%}
|
|
|
|
%option reentrant noyywrap
|
|
%option extra-type="glcpp_parser_t *"
|
|
|
|
%x ST_DEFINE
|
|
%x ST_DEFINE_OBJ_OR_FUNC
|
|
%x ST_DEFINE_PARAMETER
|
|
%x ST_DEFINE_VALUE
|
|
%x ST_UNDEF
|
|
%x ST_UNDEF_END
|
|
|
|
SPACE [[:space:]]
|
|
NONSPACE [^[:space:]]
|
|
NEWLINE [\n]
|
|
HSPACE [ \t]
|
|
HASH ^{HSPACE}*#{HSPACE}*
|
|
IDENTIFIER [_a-zA-Z][_a-zA-Z0-9]*
|
|
TOKEN [^[:space:](),]+
|
|
|
|
%%
|
|
|
|
{HASH}undef{HSPACE}* {
|
|
BEGIN ST_UNDEF;
|
|
return UNDEF;
|
|
}
|
|
|
|
<ST_UNDEF>{IDENTIFIER} {
|
|
BEGIN ST_UNDEF_END;
|
|
yylval.str = xtalloc_strdup (yyextra, yytext);
|
|
return IDENTIFIER;
|
|
}
|
|
|
|
<ST_UNDEF_END>{HSPACE}*
|
|
|
|
<ST_UNDEF_END>\n {
|
|
BEGIN INITIAL;
|
|
}
|
|
|
|
/* We use the ST_DEFINE and ST_DEFVAL states so that we can
|
|
* pass a space token, (yes, a token for whitespace!), since
|
|
* the preprocessor specification requires distinguishing
|
|
* "#define foo()" from "#define foo ()".
|
|
*/
|
|
{HASH}define{HSPACE}* {
|
|
BEGIN ST_DEFINE;
|
|
return DEFINE;
|
|
}
|
|
|
|
<ST_DEFINE>{IDENTIFIER} {
|
|
BEGIN ST_DEFINE_OBJ_OR_FUNC;
|
|
yylval.str = xtalloc_strdup (yyextra, yytext);
|
|
return IDENTIFIER;
|
|
}
|
|
|
|
<ST_DEFINE_OBJ_OR_FUNC>\n {
|
|
BEGIN INITIAL;
|
|
return NEWLINE;
|
|
}
|
|
|
|
<ST_DEFINE_OBJ_OR_FUNC>{HSPACE}+ {
|
|
BEGIN ST_DEFINE_VALUE;
|
|
return SPACE;
|
|
}
|
|
|
|
<ST_DEFINE_OBJ_OR_FUNC>"(" {
|
|
BEGIN ST_DEFINE_PARAMETER;
|
|
return '(';
|
|
}
|
|
|
|
<ST_DEFINE_PARAMETER>{IDENTIFIER} {
|
|
yylval.str = xtalloc_strdup (yyextra, yytext);
|
|
return IDENTIFIER;
|
|
}
|
|
|
|
<ST_DEFINE_PARAMETER>"," {
|
|
return ',';
|
|
}
|
|
|
|
<ST_DEFINE_PARAMETER>")" {
|
|
BEGIN ST_DEFINE_VALUE;
|
|
return ')';
|
|
}
|
|
|
|
<ST_DEFINE_PARAMETER>{HSPACE}+
|
|
|
|
<ST_DEFINE_VALUE>{TOKEN} {
|
|
yylval.token.type = TOKEN;
|
|
yylval.token.value = xtalloc_strdup (yyextra, yytext);
|
|
return TOKEN;
|
|
}
|
|
|
|
<ST_DEFINE_VALUE>[(),] {
|
|
yylval.token.type = TOKEN;
|
|
yylval.token.value = xtalloc_strdup (yyextra, yytext);
|
|
return TOKEN;
|
|
}
|
|
|
|
<ST_DEFINE_VALUE>{HSPACE}+
|
|
|
|
<ST_DEFINE_VALUE>\n {
|
|
BEGIN INITIAL;
|
|
return NEWLINE;
|
|
}
|
|
|
|
{IDENTIFIER} {
|
|
int parameter_index;
|
|
yylval.str = xtalloc_strdup (yyextra, yytext);
|
|
switch (glcpp_parser_classify_token (yyextra, yylval.str,
|
|
¶meter_index))
|
|
{
|
|
case TOKEN_CLASS_ARGUMENT:
|
|
talloc_free (yylval.str);
|
|
/* We don't return a value here since the
|
|
* current token will be replaced by new
|
|
* tokens. */
|
|
glcpp_parser_push_expansion_argument (yyextra,
|
|
parameter_index);
|
|
break;
|
|
case TOKEN_CLASS_IDENTIFIER:
|
|
return IDENTIFIER;
|
|
break;
|
|
case TOKEN_CLASS_IDENTIFIER_FINALIZED:
|
|
return IDENTIFIER_FINALIZED;
|
|
break;
|
|
case TOKEN_CLASS_FUNC_MACRO:
|
|
return FUNC_MACRO;
|
|
break;
|
|
case TOKEN_CLASS_OBJ_MACRO:
|
|
return OBJ_MACRO;
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
[(),] {
|
|
return yytext[0];
|
|
}
|
|
|
|
{TOKEN} {
|
|
yylval.token.type = TOKEN;
|
|
yylval.token.value = xtalloc_strdup (yyextra, yytext);
|
|
return TOKEN;
|
|
}
|
|
|
|
\n {
|
|
yyextra->need_newline = 1;
|
|
}
|
|
|
|
{HSPACE}+
|
|
|
|
%%
|