Skip to content

Update methodbinder.cs #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
den-run-ai wants to merge 5 commits into from
Closed

Update methodbinder.cs #137

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4b1028
Update methodbinder.cs
Feb 8, 2016
e17d9bc
Update methodbinder.cs
Feb 9, 2016
64e0b4c
Update methodbinder.cs
Feb 9, 2016
1c80917
Update methodbinder.cs
Feb 9, 2016
44702a8
Update methodbinder.cs
Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update methodbinder.cs
  • Loading branch information
denfromufa committed Feb 8, 2016
commit e4b10281cdbbf2c3eff3d3a5ee35e2ad98235130
28 changes: 24 additions & 4 deletions src/runtime/methodbinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ internal void AddMethod(MethodBase m) {
//====================================================================

internal static MethodInfo MatchSignature(MethodInfo[] mi, Type[] tp) {
int count = tp.Length;
if (tp == null) {
return null;
}
int count = tp.Length;
for (int i = 0; i < mi.Length; i++) {
ParameterInfo[] pi = mi[i].GetParameters();
if (pi.Length != count) {
Expand Down Expand Up @@ -99,7 +102,10 @@ internal static MethodInfo MatchParameters(MethodInfo[] mi, Type[] tp) {

internal static MethodInfo MatchSignatureAndParameters(MethodInfo[] mi, Type[] genericTp, Type[] sigTp)
{
int genericCount = genericTp.Length;
if ((genericTp == null) || (sigTp == null)) {
return null;
}
int genericCount = genericTp.Length;
int signatureCount = sigTp.Length;
for (int i = 0; i < mi.Length; i++)
{
Expand Down Expand Up @@ -239,9 +245,10 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw,
else {
_methods = GetMethods();
}

Type type;
for (int i = 0; i < _methods.Length; i++) {
MethodBase mi = _methods[i];

if (mi.IsGenericMethod) { isGeneric = true; }
ParameterInfo[] pi = mi.GetParameters();
int clrnargs = pi.Length;
Expand Down Expand Up @@ -287,7 +294,20 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw,
{
op = Runtime.PyTuple_GetItem(args, n);
}
Type type = pi[n].ParameterType;

type = Converter.GetTypeByAlias(Runtime.PyObject_Type(op));

if (type != null) {
if (pi[n].ParameterType != type) {
Exceptions.Clear();
margs = null;
break;
}
}
else {
type = pi[n].ParameterType;
}

if (pi[n].IsOut || type.IsByRef)
{
outs++;
Expand Down