Merge with master.
This commit is contained in:
@@ -20,12 +20,13 @@
|
||||
* Handle failed assertion
|
||||
*/
|
||||
void __noreturn
|
||||
jerry_AssertFail( const char *assertion, /**< assertion condition string */
|
||||
const char *file, /**< file name */
|
||||
const uint32_t line) /** line */
|
||||
jerry_AssertFail(const char *assertion, /**< assertion condition string */
|
||||
const char *file, /**< file name */
|
||||
const uint32_t line) /** line */
|
||||
{
|
||||
__printf("Assertion '%s' failed at %s:%u\n",
|
||||
assertion, file, line);
|
||||
|
||||
__exit( -ERR_GENERAL);
|
||||
} /* jerry_AssertFail */
|
||||
|
||||
|
||||
@@ -404,7 +404,7 @@ pp_keyword (keyword kw)
|
||||
}
|
||||
|
||||
static void
|
||||
intend ()
|
||||
intend (void)
|
||||
{
|
||||
for (int i = 0; i < intendation; i++)
|
||||
__putchar (' ');
|
||||
@@ -548,7 +548,7 @@ dump_postfix (operand op, const char *operation)
|
||||
static void
|
||||
pp_assignment_expression (assignment_expression expr)
|
||||
{
|
||||
if (expr.var)
|
||||
if (expr.oper != AO_NONE && expr.var)
|
||||
__printf ("%s", expr.var);
|
||||
|
||||
switch (expr.oper)
|
||||
@@ -1087,7 +1087,7 @@ pp_statement (statement stmt)
|
||||
prev_stmt = stmt.type;
|
||||
}
|
||||
|
||||
void pp_finish ()
|
||||
void pp_finish (void)
|
||||
{
|
||||
if (prev_stmt == STMT_BLOCK_END)
|
||||
__putchar ('\n');
|
||||
|
||||
@@ -20,9 +20,9 @@
|
||||
* Handle failed assertion
|
||||
*/
|
||||
void __noreturn
|
||||
jerry_AssertFail( const char *assertion, /**< assertion condition string */
|
||||
const char *file, /**< file name */
|
||||
const uint32_t line) /** line */
|
||||
jerry_AssertFail(const char *assertion, /**< assertion condition string */
|
||||
const char *file, /**< file name */
|
||||
const uint32_t line) /** line */
|
||||
{
|
||||
__exit( -ERR_GENERAL);
|
||||
} /* jerry_AssertFail */
|
||||
|
||||
Reference in New Issue
Block a user