From ae3672608dcf77fdc642c77c9a3db378c0e16cd9 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 9 Nov 2017 23:36:10 +0000 Subject: Fix link_name overriding --- src/check_decl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/check_decl.cpp') diff --git a/src/check_decl.cpp b/src/check_decl.cpp index 7b71f43b6..940e9cc3b 100644 --- a/src/check_decl.cpp +++ b/src/check_decl.cpp @@ -429,9 +429,9 @@ void init_entity_foreign_library(Checker *c, Entity *e) { } } -String handle_link_name(Checker *c, Token token, String link_name, String link_prefix, bool link_prefix_overridden) { +String handle_link_name(Checker *c, Token token, String link_name, String link_prefix) { if (link_prefix.len > 0) { - if (link_name.len > 0 && !link_prefix_overridden) { + if (link_name.len > 0) { error(token, "`link_name` and `link_prefix` cannot be used together"); } else { isize len = link_prefix.len + token.string.len; @@ -485,7 +485,7 @@ void check_proc_decl(Checker *c, Entity *e, DeclInfo *d) { } - ac.link_name = handle_link_name(c, e->token, ac.link_name, ac.link_prefix, ac.link_prefix_overridden); + ac.link_name = handle_link_name(c, e->token, ac.link_name, ac.link_prefix); if (d->scope->file != nullptr && e->token.string == "main") { if (pt->param_count != 0 || @@ -635,7 +635,7 @@ void check_var_decl(Checker *c, Entity *e, Entity **entities, isize entity_count check_decl_attributes(c, decl->attributes, var_decl_attribute, &ac); } - ac.link_name = handle_link_name(c, e->token, ac.link_name, ac.link_prefix, ac.link_prefix_overridden); + ac.link_name = handle_link_name(c, e->token, ac.link_name, ac.link_prefix); e->Variable.thread_local_model = ac.thread_local_model; String context_name = str_lit("variable declaration"); -- cgit v1.2.3