darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-27 22:22:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

first part of parsing TOKEN_DOTS as part of a type when needed; allows declarations like: ...float x;

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-10-11 14:10:47 +02:00
parent 3d5fedcf39
commit 62ac7e9966
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
parser.c
View file

@ -3334,7 +3334,7 @@ static bool parse_statement(parser_t *parser, ast_block *block, ast_expression *
if (parser->tok == TOKEN_IDENT) if (parser->tok == TOKEN_IDENT)
typevar = parser_find_typedef(parser, parser_tokval(parser), 0); typevar = parser_find_typedef(parser, parser_tokval(parser), 0);
if (typevar || parser->tok == TOKEN_TYPENAME || parser->tok == '.') if (typevar || parser->tok == TOKEN_TYPENAME || parser->tok == '.' || parser->tok == TOKEN_DOTS)
{ {
/* local variable */ /* local variable */
if (!block) { if (!block) {
@ -4708,8 +4708,10 @@ static ast_value *parse_typename(parser_t *parser, ast_value **storebase, ast_va
ctx = parser_ctx(parser); ctx = parser_ctx(parser);
/* types may start with a dot */ /* types may start with a dot */
if (parser->tok == '.') { if (parser->tok == '.' || parser->tok == TOKEN_DOTS) {
isfield = true; isfield = true;
if (parser->tok == TOKEN_DOTS)
morefields += 2;
/* if we parsed a dot we need a typename now */ /* if we parsed a dot we need a typename now */
if (!parser_next(parser)) { if (!parser_next(parser)) {
parseerror(parser, "expected typename for field definition"); parseerror(parser, "expected typename for field definition");
@ -4719,8 +4721,13 @@ static ast_value *parse_typename(parser_t *parser, ast_value **storebase, ast_va
/* Further dots are handled seperately because they won't be part of the /* Further dots are handled seperately because they won't be part of the
* basetype * basetype
*/ */
while (parser->tok == '.') { while (true) {
if (parser->tok == '.')
++morefields; ++morefields;
else if (parser->tok == TOKEN_DOTS)
morefields += 3;
else
break;
if (!parser_next(parser)) { if (!parser_next(parser)) {
parseerror(parser, "expected typename for field definition"); parseerror(parser, "expected typename for field definition");
return NULL; return NULL;
@ -5766,7 +5773,7 @@ static bool parser_global_statement(parser_t *parser)
if (parser->tok == TOKEN_IDENT) if (parser->tok == TOKEN_IDENT)
istype = parser_find_typedef(parser, parser_tokval(parser), 0); istype = parser_find_typedef(parser, parser_tokval(parser), 0);
if (istype || parser->tok == TOKEN_TYPENAME || parser->tok == '.') if (istype || parser->tok == TOKEN_TYPENAME || parser->tok == '.' || parser->tok == TOKEN_DOTS)
{ {
return parse_variable(parser, NULL, false, CV_NONE, istype, false, false, 0, NULL); return parse_variable(parser, NULL, false, CV_NONE, istype, false, false, 0, NULL);
} }