Skip to content

fix expr stmt #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boomyl merged 2 commits into from
Aug 26, 2021
Merged

fix expr stmt #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ae7ca7
fix expr stmt
shenao78 Aug 26, 2021
c75eb13
fix expr stmt
shenao78 Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compiler/error.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ static ErrorDefinition dkc_error_message_format[] = {
{"字符字面量中包含了2个以上的字符。"},
{"类型转换不匹配。"},
{"函数调用类型不匹配。"},
{"返回值类型不匹配."},
{"返回值类型不匹配。"},
{"表达式的值没有被使用到。"},
{"dummy"}};

typedef struct
Expand Down
1 change: 1 addition & 0 deletions compiler/error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ typedef enum
TYPE_CAST_MISMATCH_ERR,
FUNCTION_CALL_TYPE_MISMATCH_ERR,
RETURN_TYPE_MISMATCH_ERR,
EXPR_EVALUATED_BUT_NOT_USED,
COMPILE_ERROR_COUNT_PLUS_1,
} CompileError;

Expand Down
15 changes: 15 additions & 0 deletions compiler/fix_tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,18 @@ fix_assign_stmt(Block *current_block, Statement *stmt)
}
}

static void
fix_expression_stmt(Block *current_block, Statement *stmt)
{
stmt->u.expr_s = fix_expression(current_block, stmt->u.expr_s);
if (stmt->u.expr_s->kind != FUNC_CALL_EXPRESSION)
{
compile_error(stmt->line_number,
EXPR_EVALUATED_BUT_NOT_USED,
MESSAGE_ARGUMENT_END);
}
}

static void
fix_statement(Block *current_block, Statement *statement, FuncDefinition *fd)
{
Expand All @@ -814,6 +826,9 @@ fix_statement(Block *current_block, Statement *statement, FuncDefinition *fd)
case ASSIGN_STATEMENT:
fix_assign_stmt(current_block, statement);
break;
case EXPRESSION_STATEMENT:
fix_expression_stmt(current_block, statement);
break;
default:
DBG_assert(0, ("bad case. kind..%d\n", statement->kind));
}
Expand Down