mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-04 04:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

translate-c: support variable name shadowing

Browse Source
This commit is contained in:
Andrew Kelley 2017-11-26 17:30:43 -05:00
parent 9a8545d590
commit 93fac5f257
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/translate_c.cpp
View File

@ -157,6 +157,19 @@ static void add_global_weak_alias(Context *c, Buf *new_name, Buf *canon_name) {
alias->canon_name = canon_name;
}
static Buf *trans_lookup_zig_symbol(Context *c, TransScope *scope, Buf *c_symbol_name) {
while (scope != nullptr) {
if (scope->id == TransScopeIdVar) {
TransScopeVar *var_scope = (TransScopeVar *)scope;
if (buf_eql_buf(var_scope->c_name, c_symbol_name)) {
return var_scope->zig_name;
}
}
scope = scope->parent;
}
return c_symbol_name;
}
static AstNode * trans_create_node(Context *c, NodeType id) {
AstNode *node = allocate<AstNode>(1);
node->type = id;
@ -1650,13 +1663,14 @@ static AstNode *trans_implicit_cast_expr(Context *c, TransScope *scope, const Im
zig_unreachable();
}
static AstNode *trans_decl_ref_expr(Context *c, const DeclRefExpr *stmt, TransLRValue lrval) {
static AstNode *trans_decl_ref_expr(Context *c, TransScope *scope, const DeclRefExpr *stmt, TransLRValue lrval) {
const ValueDecl *value_decl = stmt->getDecl();
Buf *symbol_name = buf_create_from_str(decl_name(value_decl));
Buf *c_symbol_name = buf_create_from_str(decl_name(value_decl));
Buf *zig_symbol_name = trans_lookup_zig_symbol(c, scope, c_symbol_name);
if (lrval == TransLValue) {
c->ptr_params.put(symbol_name, true);
c->ptr_params.put(zig_symbol_name, true);
}
return trans_create_node_symbol(c, symbol_name);
return trans_create_node_symbol(c, zig_symbol_name);
}
static AstNode *trans_create_post_crement(Context *c, ResultUsed result_used, TransScope *scope,
@ -2562,7 +2576,7 @@ static int trans_stmt_extra(Context *c, TransScope *scope, const Stmt *stmt,
trans_implicit_cast_expr(c, scope, (const ImplicitCastExpr *)stmt));
case Stmt::DeclRefExprClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_decl_ref_expr(c, (const DeclRefExpr *)stmt, lrvalue));
trans_decl_ref_expr(c, scope, (const DeclRefExpr *)stmt, lrvalue));
case Stmt::UnaryOperatorClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_unary_operator(c, result_used, scope, (const UnaryOperator *)stmt));

20
test/translate_c.zig
View File

@ -1080,6 +1080,26 @@ pub fn addCases(cases: &tests.TranslateCContext) {
\\ return x + 13;
\\}
);
cases.add("variable name shadowing",
\\int foo(void) {
\\ int x = 1;
\\ {
\\ int x = 2;
\\ x += 1;
\\ }
\\ return x;
\\}
,
\\pub fn foo() -> c_int {
\\ var x: c_int = 1;
\\ {
\\ var x_0: c_int = 2;
\\ x_0 += 1;
\\ };
\\ return x;
\\}
);
}