darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-03-22 02:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

'noreturn' is now an attribute and parsed as [[noreturn]]

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-12-22 18:09:33 +01:00
parent b38b3b08bd
commit 7cf0ba5aa8
4 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
parser.c
View file

@ -2350,8 +2350,40 @@ static bool parse_var_qualifiers(parser_t *parser, bool with_local, int *cvq, bo
bool had_noref = false;
bool had_noreturn = false;
*cvq = CV_WRONG;
for (;;) {
if (!strcmp(parser_tokval(parser), "const"))
if (parser->tok == TOKEN_ATTRIBUTE_OPEN) {
/* parse an attribute */
if (!parser_next(parser)) {
parseerror(parser, "expected attribute after `[[`");
return false;
}
if (!strcmp(parser_tokval(parser), "noreturn")) {
had_noreturn = true;
if (!parser_next(parser) || parser->tok != TOKEN_ATTRIBUTE_CLOSE) {
parseerror(parser, "`noreturn` attribute has no parameters, expected `]]`");
return false;
}
}
else if (!strcmp(parser_tokval(parser), "noref")) {
had_noref = true;
if (!parser_next(parser) || parser->tok != TOKEN_ATTRIBUTE_CLOSE) {
parseerror(parser, "`noref` attribute has no parameters, expected `]]`");
return false;
}
}
else
{
/* Skip tokens until we hit a ]] */
while (parser->tok != TOKEN_ATTRIBUTE_CLOSE) {
if (!parser_next(parser)) {
parseerror(parser, "error inside attribute");
return false;
}
}
}
}
else if (!strcmp(parser_tokval(parser), "const"))
had_const = true;
else if (!strcmp(parser_tokval(parser), "var"))
had_var = true;
@ -2359,8 +2391,6 @@ static bool parse_var_qualifiers(parser_t *parser, bool with_local, int *cvq, bo
had_var = true;
else if (!strcmp(parser_tokval(parser), "noref"))
had_noref = true;
else if (!strcmp(parser_tokval(parser), "noreturn"))
had_noreturn = true;
else if (!had_const && !had_var && !had_noref && !had_noreturn) {
return false;
}

2
tests/noreturn.qc
View file

@ -1,5 +1,5 @@
#ifndef NORETURN
#define NORETURN noreturn
#define NORETURN [[noreturn]]
#endif
void print(...) = #1;

2
tests/noreturn1.tmpl
View file

@ -1,4 +1,4 @@
I: noreturn.qc
D: noreturn keyword - should work
T: -compile
C: -std=fteqcc -Wall -Werror -DTEST=1 -DNORETURN=noreturn
C: -std=fteqcc -Wall -Werror -DTEST=1 -DNORETURN=[[noreturn]]

2
tests/noreturn2.tmpl
View file

@ -1,4 +1,4 @@
I: noreturn.qc
D: noreturn keyword - should fail
T: -compile
C: -std=fteqcc -Wall -Werror -DTEST=2 -DNORETURN=noreturn
C: -std=fteqcc -Wall -Werror -DTEST=2 -DNORETURN=[[noreturn]]