mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

parseh: do not create macro alias for extern vars

Browse source
This commit is contained in:
Andrew Kelley 2016-02-01 00:01:30 -07:00
parent c1b5518a65
commit 6b2e29c6ac
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/parseh.cpp
View file

@ -26,6 +26,11 @@ struct MacroSymbol {
Buf *value;
};
struct GlobalValue {
TypeTableEntry *type;
bool is_const;
};
struct Context {
ImportTableEntry *import;
ZigList<ErrorMsg *> *errors;
@ -34,7 +39,7 @@ struct Context {
TypeTableEntry *c_void_type;
AstNode *root;
HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> global_type_table;
HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> global_value_table;
HashMap<Buf *, GlobalValue, buf_hash, buf_eql_buf> global_value_table;
HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> struct_type_table;
HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> struct_decl_table;
HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> enum_type_table;
@ -737,7 +742,7 @@ static void visit_enum_decl(Context *c, const EnumDecl *enum_decl) {
AstNode *field_access_node = create_field_access_node(c, buf_ptr(full_type_name), buf_ptr(field_name));
AstNode *var_node = create_var_decl_node(c, buf_ptr(enum_val_name), field_access_node);
var_decls.append(var_node);
c->global_value_table.put(enum_val_name, enum_type);
c->global_value_table.put(enum_val_name, {enum_type, true});
}
// create llvm type for root struct
@ -1036,7 +1041,7 @@ static void visit_var_decl(Context *c, const VarDecl *var_decl) {
AstNode *type_node = make_type_node(c, var_type);
AstNode *var_node = create_typed_var_decl_node(c, true, buf_ptr(name), type_node, init_node);
c->root->data.root.top_level_decls.append(var_node);
c->global_value_table.put(name, var_type);
c->global_value_table.put(name, {var_type, true});
return;
}
@ -1045,7 +1050,7 @@ static void visit_var_decl(Context *c, const VarDecl *var_decl) {
AstNode *var_node = create_typed_var_decl_node(c, is_const, buf_ptr(name), type_node, nullptr);
var_node->data.variable_declaration.is_extern = true;
c->root->data.root.top_level_decls.append(var_node);
c->global_value_table.put(name, var_type);
c->global_value_table.put(name, {var_type, is_const});
return;
}
@ -1095,6 +1100,22 @@ static bool name_exists(Context *c, Buf *name) {
return false;
}
static bool name_exists_and_const(Context *c, Buf *name) {
if (c->global_type_table.maybe_get(name)) {
return true;
}
if (c->fn_table.maybe_get(name)) {
return true;
}
if (c->macro_table.maybe_get(name)) {
return true;
}
if (auto entry = c->global_value_table.maybe_get(name)) {
return entry->value.is_const;
}
return false;
}
static void render_aliases(Context *c) {
for (int i = 0; i < c->aliases.length; i += 1) {
AstNode *alias_node = c->aliases.at(i);
@ -1232,7 +1253,7 @@ static void process_macro(Context *c, Buf *name, Buf *value) {
static void process_symbol_macros(Context *c) {
for (int i = 0; i < c->macro_symbols.length; i += 1) {
MacroSymbol ms = c->macro_symbols.at(i);
if (name_exists(c, ms.value)) {
if (name_exists_and_const(c, ms.value)) {
AstNode *var_node = create_var_decl_node(c, buf_ptr(ms.name),
create_symbol_node(c, buf_ptr(ms.value)));
c->macro_table.put(ms.name, var_node);

13
test/run_tests.cpp
View file

@ -2108,6 +2108,19 @@ Foo fun(Foo *a);
"pub type c_void = u8;",
"pub const Foo = c_void;",
"pub extern fn fun(a: ?&c_void);");
add_parseh_case("ignore #define for non-const", R"SOURCE(
struct Foo {
int x;
};
extern void (*fn_ptr)(void);
#define Foo fn_ptr
)SOURCE", 3,
"pub type c_void = u8;",
"pub const Foo = struct_Foo;",
R"OUTPUT(export struct struct_Foo {
x: c_int,
})OUTPUT");
}
static void print_compiler_invocation(TestCase *test_case) {