aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2017-05-28 18:51:42 +0100
committerGinger Bill <bill@gingerbill.org>2017-05-28 18:51:42 +0100
commit98dbbf11f3e19fefc08a34ba0f9a5a96e083ea78 (patch)
tree77d10889503946197a766f270a77c23cf5d63b54
parentf4924e39d487f95bbfbfbc83dd0ae237923505ae (diff)
Fix procedure overloading distinguishing
-rw-r--r--src/checker.c9
-rw-r--r--src/types.c6
2 files changed, 8 insertions, 7 deletions
diff --git a/src/checker.c b/src/checker.c
index 709a5ce29..ecd13eb36 100644
--- a/src/checker.c
+++ b/src/checker.c
@@ -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) {
diff --git a/src/types.c b/src/types.c
index e1cde37c2..bf699ecba 100644
--- a/src/types.c
+++ b/src/types.c
@@ -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;