gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 02:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify allocating multiple ds args

Browse Source 
Dealing with indexes is only necessary for `strfmt`
This commit is contained in:
Rangi
2021-12-01 20:24:31 -05:00
parent 7bdfc9da23
commit 20a26599a3
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/parser.y
View File

@@ -385,7 +385,7 @@ static void initDsArgList(struct DsArgList *args)
strerror(errno)); strerror(errno));
} }
static size_t nextDsArgListIndex(struct DsArgList *args) static void appendDsArgList(struct DsArgList *args, const struct Expression *expr)
{ {
if (args->nbArgs == args->capacity) { if (args->nbArgs == args->capacity) {
args->capacity = (args->capacity + 1) * 2; args->capacity = (args->capacity + 1) * 2;
@@ -394,7 +394,7 @@ static size_t nextDsArgListIndex(struct DsArgList *args)
fatalerror("realloc error while resizing ds arg list: %s\n", fatalerror("realloc error while resizing ds arg list: %s\n",
strerror(errno)); strerror(errno));
} }
return args->nbArgs++; args->args[args->nbArgs++] = *expr;
} }
static void freeDsArgList(struct DsArgList *args) static void freeDsArgList(struct DsArgList *args)
@@ -1144,14 +1144,10 @@ ds : T_POP_DS uconst { sect_Skip($2, true); }
ds_args : reloc_8bit { ds_args : reloc_8bit {
initDsArgList(&$$); initDsArgList(&$$);
size_t i = nextDsArgListIndex(&$$); appendDsArgList(&$$, &$1);
$$.args[i] = $1;
} }
| ds_args T_COMMA reloc_8bit { | ds_args T_COMMA reloc_8bit {
size_t i = nextDsArgListIndex(&$1); appendDsArgList(&$1, &$3);
$1.args[i] = $3;
$$ = $1; $$ = $1;
} }
; ;