mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-06 07:38:48 +00:00
Merge pull request #4327 from beaumccartney/fix-deferred-attrib-error-report
fix #4326
This commit is contained in:
+8
-8
@@ -6206,7 +6206,7 @@ gb_internal void check_deferred_procedures(Checker *c) {
|
|||||||
}
|
}
|
||||||
if ((src_params == nullptr && dst_params != nullptr) ||
|
if ((src_params == nullptr && dst_params != nullptr) ||
|
||||||
(src_params != nullptr && dst_params == nullptr)) {
|
(src_params != nullptr && dst_params == nullptr)) {
|
||||||
error(src->token, "Deferred procedure '%.*s' parameters do not match the inputs of initial procedure '%.*s'", LIT(src->token.string), LIT(dst->token.string));
|
error(src->token, "Deferred procedure '%.*s' parameters do not match the inputs of initial procedure '%.*s'", LIT(dst->token.string), LIT(src->token.string));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6219,8 +6219,8 @@ gb_internal void check_deferred_procedures(Checker *c) {
|
|||||||
gbString s = type_to_string(src_params);
|
gbString s = type_to_string(src_params);
|
||||||
gbString d = type_to_string(dst_params);
|
gbString d = type_to_string(dst_params);
|
||||||
error(src->token, "Deferred procedure '%.*s' parameters do not match the inputs of initial procedure '%.*s':\n\t(%s) =/= (%s)",
|
error(src->token, "Deferred procedure '%.*s' parameters do not match the inputs of initial procedure '%.*s':\n\t(%s) =/= (%s)",
|
||||||
LIT(src->token.string), LIT(dst->token.string),
|
LIT(dst->token.string), LIT(src->token.string),
|
||||||
s, d
|
d, s
|
||||||
);
|
);
|
||||||
gb_string_free(d);
|
gb_string_free(d);
|
||||||
gb_string_free(s);
|
gb_string_free(s);
|
||||||
@@ -6236,7 +6236,7 @@ gb_internal void check_deferred_procedures(Checker *c) {
|
|||||||
}
|
}
|
||||||
if ((src_results == nullptr && dst_params != nullptr) ||
|
if ((src_results == nullptr && dst_params != nullptr) ||
|
||||||
(src_results != nullptr && dst_params == nullptr)) {
|
(src_results != nullptr && dst_params == nullptr)) {
|
||||||
error(src->token, "Deferred procedure '%.*s' parameters do not match the results of initial procedure '%.*s'", LIT(src->token.string), LIT(dst->token.string));
|
error(src->token, "Deferred procedure '%.*s' parameters do not match the results of initial procedure '%.*s'", LIT(dst->token.string), LIT(src->token.string));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6249,8 +6249,8 @@ gb_internal void check_deferred_procedures(Checker *c) {
|
|||||||
gbString s = type_to_string(src_results);
|
gbString s = type_to_string(src_results);
|
||||||
gbString d = type_to_string(dst_params);
|
gbString d = type_to_string(dst_params);
|
||||||
error(src->token, "Deferred procedure '%.*s' parameters do not match the results of initial procedure '%.*s':\n\t(%s) =/= (%s)",
|
error(src->token, "Deferred procedure '%.*s' parameters do not match the results of initial procedure '%.*s':\n\t(%s) =/= (%s)",
|
||||||
LIT(src->token.string), LIT(dst->token.string),
|
LIT(dst->token.string), LIT(src->token.string),
|
||||||
s, d
|
d, s
|
||||||
);
|
);
|
||||||
gb_string_free(d);
|
gb_string_free(d);
|
||||||
gb_string_free(s);
|
gb_string_free(s);
|
||||||
@@ -6302,8 +6302,8 @@ gb_internal void check_deferred_procedures(Checker *c) {
|
|||||||
gbString s = type_to_string(tsrc);
|
gbString s = type_to_string(tsrc);
|
||||||
gbString d = type_to_string(dst_params);
|
gbString d = type_to_string(dst_params);
|
||||||
error(src->token, "Deferred procedure '%.*s' parameters do not match the results of initial procedure '%.*s':\n\t(%s) =/= (%s)",
|
error(src->token, "Deferred procedure '%.*s' parameters do not match the results of initial procedure '%.*s':\n\t(%s) =/= (%s)",
|
||||||
LIT(src->token.string), LIT(dst->token.string),
|
LIT(dst->token.string), LIT(src->token.string),
|
||||||
s, d
|
d, s
|
||||||
);
|
);
|
||||||
gb_string_free(d);
|
gb_string_free(d);
|
||||||
gb_string_free(s);
|
gb_string_free(s);
|
||||||
|
|||||||
Reference in New Issue
Block a user