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

Refactor code that handles when included files are missing

Browse Source 
- Single unified routine for erroring out or handling missing dependencies
- Single three-state enum instead of two Booleans for missing dependencies
  (this causes `-MC` to imply `-MG` instead of needing `-MG -MC`)
- Functions than can miss included files return a Boolean for whether the
  parser should `YYACCEPT` and exit
This commit is contained in:
Rangi42
2025-07-18 14:03:23 -04:00
parent b80b30fba1
commit e7d63f5f6b
9 changed files with 72 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/parser.y
View File

@@ -1139,8 +1139,7 @@ export_def:
include:
label POP_INCLUDE string endofline {
fstk_RunInclude($3, false);
if (failedOnMissingInclude && !continueAfterMissingIncludes) {
if (fstk_RunInclude($3)) {
YYACCEPT;
}
}
@@ -1148,20 +1147,17 @@ include:
incbin:
POP_INCBIN string {
sect_BinaryFile($2, 0);
if (failedOnMissingInclude && !continueAfterMissingIncludes) {
if (sect_BinaryFile($2, 0)) {
YYACCEPT;
}
}
| POP_INCBIN string COMMA uconst {
sect_BinaryFile($2, $4);
if (failedOnMissingInclude && !continueAfterMissingIncludes) {
if (sect_BinaryFile($2, $4)) {
YYACCEPT;
}
}
| POP_INCBIN string COMMA uconst COMMA uconst {
sect_BinaryFileSlice($2, $4, $6);
if (failedOnMissingInclude && !continueAfterMissingIncludes) {
if (sect_BinaryFileSlice($2, $4, $6)) {
YYACCEPT;
}
}