Skip to content

Commit 083c9cd

Browse files
committed
fix extending class with conflicting method's name
1 parent 84a595d commit 083c9cd

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@kaoscript/runtime",
33
"description": "The default runtime for kaoscript",
4-
"version": "0.4.0",
4+
"version": "0.4.1",
55
"author": {
66
"name": "Baptiste Augrain",
77
"email": "daiyam@zokugun.org"

src/runtime.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* runtime.js
3-
* Version 0.4.0
3+
* Version 0.4.1
44
* September 14th, 2016
55
*
66
* Copyright (c) 2016 Baptiste Augrain
@@ -836,7 +836,7 @@ var Helper = {
836836
var name = options.name;
837837
var methods = [];
838838

839-
if(options.class.__ks_reflect && options.class.__ks_reflect.classMethods[name]) {
839+
if(options.class.__ks_reflect && Type.isArray(options.class.__ks_reflect.classMethods[name])) {
840840
methods.push.apply(methods, options.class.__ks_reflect.classMethods[name]);
841841
}
842842

@@ -846,7 +846,7 @@ var Helper = {
846846
classMethods: {}
847847
};
848848
}
849-
if(!options.sealed.__ks_reflect.classMethods[name]) {
849+
if(!Type.isArray(options.sealed.__ks_reflect.classMethods[name])) {
850850
options.sealed.__ks_reflect.classMethods[name] = [];
851851
}
852852
methods.push.apply(methods, options.sealed.__ks_reflect.classMethods[name]);
@@ -881,7 +881,7 @@ var Helper = {
881881
var name = options.name;
882882
var reflect = options.class.__ks_reflect;
883883

884-
if(!reflect.classMethods[name]) {
884+
if(!Type.isArray(reflect.classMethods[name])) {
885885
reflect.classMethods[name] = [];
886886
}
887887

@@ -922,7 +922,7 @@ var Helper = {
922922
var name = options.name;
923923
var methods = [];
924924

925-
if(options.class.__ks_reflect && options.class.__ks_reflect.instanceMethods[name]) {
925+
if(options.class.__ks_reflect && Type.isArray(options.class.__ks_reflect.instanceMethods[name])) {
926926
methods.push.apply(methods, options.class.__ks_reflect.instanceMethods[name]);
927927
}
928928

@@ -932,7 +932,7 @@ var Helper = {
932932
classMethods: {}
933933
};
934934
}
935-
if(!options.sealed.__ks_reflect.instanceMethods[name]) {
935+
if(!Type.isArray(options.sealed.__ks_reflect.instanceMethods[name])) {
936936
options.sealed.__ks_reflect.instanceMethods[name] = [];
937937
}
938938
methods.push.apply(methods, options.sealed.__ks_reflect.instanceMethods[name]);
@@ -977,7 +977,7 @@ var Helper = {
977977
var name = options.name;
978978
var reflect = options.class.__ks_reflect;
979979

980-
if(!reflect.instanceMethods[name]) {
980+
if(!Type.isArray(reflect.instanceMethods[name])) {
981981
reflect.instanceMethods[name] = [];
982982
}
983983

0 commit comments

Comments
 (0)