mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-05 04:27:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix procedure overloading distinguishing

Browse Source
This commit is contained in:
Ginger Bill
2017-05-28 18:51:42 +01:00
parent f4924e39d4
commit 98dbbf11f3
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/checker.c
View File

@@ -1360,10 +1360,10 @@ void check_procedure_overloading(Checker *c, Entity *e) {
error(p->token, "Overloaded procedure `%.*s` as the same type as another procedure in this scope", LIT(name));
is_invalid = true;
break;
case ProcOverload_CallingConvention:
error(p->token, "Overloaded procedure `%.*s` as the same type as another procedure in this scope", LIT(name));
is_invalid = true;
break;
// case ProcOverload_CallingConvention:
// error(p->token, "Overloaded procedure `%.*s` as the same type as another procedure in this scope", LIT(name));
// is_invalid = true;
// break;
case ProcOverload_ParamVariadic:
error(p->token, "Overloaded procedure `%.*s` as the same type as another procedure in this scope", LIT(name));
is_invalid = true;
@@ -1377,6 +1377,7 @@ void check_procedure_overloading(Checker *c, Entity *e) {
case ProcOverload_ParamTypes:
// This is okay :)
break;
}
if (is_invalid) {

6
src/types.c
View File

@@ -1173,9 +1173,9 @@ ProcTypeOverloadKind are_proc_types_overload_safe(Type *x, Type *y) {
TypeProc px = base_type(x)->Proc;
TypeProc py = base_type(y)->Proc;
if (px.calling_convention != py.calling_convention) {
return ProcOverload_CallingConvention;
}
// if (px.calling_convention != py.calling_convention) {
// return ProcOverload_CallingConvention;
// }
if (px.param_count != py.param_count) {
return ProcOverload_ParamCount;