wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Parse #line directives.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura
2021-01-25 11:23:56 -06:00
committed by Alexandre Julliard
parent 6520fb153e
commit 160db8306f
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/vkd3d-shader/preproc.l
View File

@@ -52,6 +52,7 @@ static void update_location(struct preproc_ctx *ctx);
%s ERROR %s ERROR
%s INCLUDE %s INCLUDE
%s LINE
NEWLINE \r?\n NEWLINE \r?\n
WS [ \t] WS [ \t]
@@ -91,9 +92,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
<INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;}
<INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;}
<INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;}
<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} <INITIAL,LINE>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;}
<INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} <INITIAL,LINE>0[0-7]*[ul]{0,2} {return T_INTEGER;}
<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} <INITIAL,LINE>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;}
<INITIAL>## {return T_CONCAT;} <INITIAL>## {return T_CONCAT;}
@@ -103,7 +104,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
<INITIAL>">>"=? {return T_TEXT;} <INITIAL>">>"=? {return T_TEXT;}
<INITIAL>[-+*/%&|^]= {return T_TEXT;} <INITIAL>[-+*/%&|^]= {return T_TEXT;}
<INCLUDE>\"[^"]*\" {return T_STRING;} <INCLUDE,LINE>\"[^"]*\" {return T_STRING;}
<INCLUDE>\<[^>]*\> {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;}
/* C strings (including escaped quotes). */ /* C strings (including escaped quotes). */
@@ -131,6 +132,12 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
return T_INCLUDE; return T_INCLUDE;
} }
if (!strcmp(p, "line"))
{
BEGIN(LINE);
return T_LINE;
}
if (!strcmp(p, "define")) if (!strcmp(p, "define"))
return T_DEFINE; return T_DEFINE;
if (!strcmp(p, "elif")) if (!strcmp(p, "elif"))
@@ -155,8 +162,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
return T_TEXT; return T_TEXT;
} }
<INITIAL,INCLUDE>\\{NEWLINE} {} <INITIAL,INCLUDE,LINE>\\{NEWLINE} {}
<INITIAL,INCLUDE,ERROR>{NEWLINE} { <INITIAL,INCLUDE,ERROR,LINE>{NEWLINE} {
BEGIN(INITIAL); BEGIN(INITIAL);
return T_NEWLINE; return T_NEWLINE;
} }
@@ -371,6 +378,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
case T_IFDEF: case T_IFDEF:
case T_IFNDEF: case T_IFNDEF:
case T_INCLUDE: case T_INCLUDE:
case T_LINE:
case T_PRAGMA: case T_PRAGMA:
case T_UNDEF: case T_UNDEF:
ctx->current_directive = token; ctx->current_directive = token;

12
libs/vkd3d-shader/preproc.y
View File

@@ -327,6 +327,7 @@ static void free_parse_arg_names(struct parse_arg_names *args)
%token T_IFDEF "#ifdef" %token T_IFDEF "#ifdef"
%token T_IFNDEF "#ifndef" %token T_IFNDEF "#ifndef"
%token T_INCLUDE "#include" %token T_INCLUDE "#include"
%token T_LINE "#line"
%token T_PRAGMA "#pragma" %token T_PRAGMA "#pragma"
%token T_UNDEF "#undef" %token T_UNDEF "#undef"
@@ -671,6 +672,17 @@ directive
} }
vkd3d_free($2); vkd3d_free($2);
} }
| T_LINE T_INTEGER T_NEWLINE
{
FIXME("#line directive.\n");
vkd3d_free($2);
}
| T_LINE T_INTEGER T_STRING T_NEWLINE
{
FIXME("#line directive.\n");
vkd3d_free($2);
vkd3d_free($3);
}
primary_expr primary_expr
: T_INTEGER : T_INTEGER