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

Factor printing assert failures into functions

Browse Source 
Saves some code duplication
This commit is contained in:
ISSOtm
2020-09-27 09:24:24 +02:00
parent 9fee0603b1
commit ba051e10fb
1 changed files with 36 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/asm/asmy.y
View File

@@ -462,6 +462,36 @@ static void strsubUTF8(char *dest, const char *src, uint32_t pos, uint32_t len)
dest[destIndex] = 0; dest[destIndex] = 0;
} }
static inline void failAssert(enum AssertionType type)
{
switch (type) {
case ASSERT_FATAL:
fatalerror("Assertion failed");
case ASSERT_ERROR:
yyerror("Assertion failed");
break;
case ASSERT_WARN:
warning(WARNING_ASSERT,
"Assertion failed");
break;
}
}
static inline void failAssertMsg(enum AssertionType type, char const *msg)
{
switch (type) {
case ASSERT_FATAL:
fatalerror("Assertion failed: %s", msg);
case ASSERT_ERROR:
yyerror("Assertion failed: %s", msg);
break;
case ASSERT_WARN:
warning(WARNING_ASSERT,
"Assertion failed: %s", msg);
break;
}
}
%} %}
%union %union
@@ -817,17 +847,7 @@ assert : T_POP_ASSERT assert_type relocexpr
yyerror("Assertion creation failed: %s", yyerror("Assertion creation failed: %s",
strerror(errno)); strerror(errno));
} else if ($3.nVal == 0) { } else if ($3.nVal == 0) {
switch ($2) { failAssert($2);
case ASSERT_FATAL:
fatalerror("Assertion failed");
case ASSERT_ERROR:
yyerror("Assertion failed");
break;
case ASSERT_WARN:
warning(WARNING_ASSERT,
"Assertion failed");
break;
}
} }
rpn_Free(&$3); rpn_Free(&$3);
} }
@@ -839,57 +859,19 @@ assert : T_POP_ASSERT assert_type relocexpr
yyerror("Assertion creation failed: %s", yyerror("Assertion creation failed: %s",
strerror(errno)); strerror(errno));
} else if ($3.nVal == 0) { } else if ($3.nVal == 0) {
switch ($2) { failAssertMsg($2, $5);
case ASSERT_FATAL:
fatalerror("Assertion failed: %s",
$5);
case ASSERT_ERROR:
yyerror("Assertion failed: %s",
$5);
break;
case ASSERT_WARN:
warning(WARNING_ASSERT,
"Assertion failed: %s",
$5);
break;
}
} }
rpn_Free(&$3); rpn_Free(&$3);
} }
| T_POP_STATIC_ASSERT assert_type const | T_POP_STATIC_ASSERT assert_type const
{ {
if ($3 == 0) { if ($3 == 0)
switch ($2) { failAssert($2);
case ASSERT_FATAL:
fatalerror("Assertion failed");
case ASSERT_ERROR:
yyerror("Assertion failed");
break;
case ASSERT_WARN:
warning(WARNING_ASSERT,
"Assertion failed");
break;
}
}
} }
| T_POP_STATIC_ASSERT assert_type const ',' string | T_POP_STATIC_ASSERT assert_type const ',' string
{ {
if ($3 == 0) { if ($3 == 0)
switch ($2) { failAssertMsg($2, $5);
case ASSERT_FATAL:
fatalerror("Assertion failed: %s",
$5);
case ASSERT_ERROR:
yyerror("Assertion failed: %s",
$5);
break;
case ASSERT_WARN:
warning(WARNING_ASSERT,
"Assertion failed: %s",
$5);
break;
}
}
} }
; ;