Skip to content

Simple Generics Support #6

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

Open
jcmm33 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Simple Generics Support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1aaf8d
Added Generics support
jcmm33 Oct 25, 2012
48136d9
Added generic support for nullable types.
jcmm33 Oct 25, 2012
056c286
CustomResolver added to CSharpContext
jcmm33 Nov 2, 2012
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
726 changes: 381 additions & 345 deletions Library/Parser/Context/ParserContext.cs
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 69 additions & 57 deletions Library/Parser/ExpressionParser/Expression/ContainerClasses/InstanceMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,70 @@
#region License
//=============================================================================
// Vici Core - Productivity Library for .NET 3.5
//
// Copyright (c) 2008-2012 Philippe Leybaert
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//=============================================================================
#endregion

using System;
using System.Reflection;

namespace Vici.Core.Parser
{
internal class InstanceMethod : MethodDefinition
{
private readonly object _object;

public InstanceMethod(MethodInfo methodInfo, object @object) : base(methodInfo)
{
_object = @object;
}

public InstanceMethod(Type type, string methodName, object @object) : base(type, methodName)
{
_object = @object;
}

public override object Invoke(Type[] types, object[] parameters, out Type returnType)
{
MethodInfo methodInfo = GetMethodInfo(types);

if (methodInfo == null)
throw new MissingMethodException(MethodName);

returnType = methodInfo.ReturnType;

return LazyBinder.Invoke(methodInfo, _object, parameters);
}
}
#region License
//=============================================================================
// Vici Core - Productivity Library for .NET 3.5
//
// Copyright (c) 2008-2012 Philippe Leybaert
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//=============================================================================
#endregion

using System;
using System.Reflection;

namespace Vici.Core.Parser
{
internal class InstanceMethod : MethodDefinition
{
private readonly object _object;

public InstanceMethod(MethodInfo methodInfo, object @object) : base(methodInfo)
{
_object = @object;
}

/// <summary>
/// Create an instance with an array of possible methods.
/// </summary>
/// <param name="methodInfo">An array of methods</param>
/// <param name="object">The instance object</param>
public InstanceMethod(MethodInfo[] methodInfo, object @object)
: base(methodInfo)
{
_object = @object;
}


public InstanceMethod(Type type, string methodName, object @object) : base(type, methodName)
{
_object = @object;
}

public override object Invoke(Type[] types, object[] parameters, out Type returnType)
{
MethodInfo methodInfo = GetMethodInfo(types);

if (methodInfo == null)
throw new MissingMethodException(MethodName);

returnType = methodInfo.ReturnType;

return LazyBinder.Invoke(methodInfo, _object, parameters);
}
}
}
189 changes: 106 additions & 83 deletions Library/Parser/ExpressionParser/Expression/ContainerClasses/MethodDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,84 +1,107 @@
#region License
//=============================================================================
// Vici Core - Productivity Library for .NET 3.5
//
// Copyright (c) 2008-2012 Philippe Leybaert
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//=============================================================================
#endregion

using System;
using System.Reflection;

namespace Vici.Core.Parser
{
internal abstract class MethodDefinition : IMethodDefinition
{
protected readonly Type _type;
protected readonly string _methodName;
protected readonly MethodInfo _methodInfo;

protected MethodDefinition(MethodInfo methodInfo)
{
_methodInfo = methodInfo;
}

protected MethodDefinition(Type type, string methodName)
{
_type = type;
_methodName = methodName;
}

public string MethodName
{
get { return _methodName; }
}

public Type Type
{
get { return _type; }
}

public MethodInfo GetMethodInfo(Type[] parameterTypes)
{
if (_methodInfo != null)
return _methodInfo;

Type t = _type;

while (t != null)
{
MethodInfo methodInfo = t.Inspector().GetMethod(_methodName, BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, parameterTypes);

if (methodInfo != null)
return methodInfo;

t = t.Inspector().BaseType;
}

return null;


//return _methodInfo ?? _type.GetMethod(_methodName, BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, binder ?? LazyBinder.Default, parameterTypes, null);
}

public abstract object Invoke(Type[] types, object[] parameters, out Type returnType);
}
#region License
//=============================================================================
// Vici Core - Productivity Library for .NET 3.5
//
// Copyright (c) 2008-2012 Philippe Leybaert
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//=============================================================================
#endregion

using System;
using System.Reflection;

namespace Vici.Core.Parser
{
internal abstract class MethodDefinition : IMethodDefinition
{
protected readonly Type _type;
protected readonly string _methodName;

/// <summary>
/// THe array of suitable methods
/// </summary>
protected readonly MethodInfo[] _methodInfo;

protected MethodDefinition(MethodInfo methodInfo)
{
_methodInfo = new MethodInfo[1] { methodInfo };
}

/// <summary>
/// Create an instance with an array of suitable methods.
/// </summary>
/// <param name="methodInfo">The array of methods</param>
protected MethodDefinition(MethodInfo[] methodInfo)
{
_methodInfo = methodInfo;
}

protected MethodDefinition(Type type, string methodName)
{
_type = type;
_methodName = methodName;
}

public string MethodName
{
get { return _methodName; }
}

public Type Type
{
get { return _type; }
}

public MethodInfo GetMethodInfo(Type[] parameterTypes)
{
// If method information was provided then we use them
if (_methodInfo != null)
{
// only a single method, lets run with that one
if (_methodInfo.Length == 1)
{
return _methodInfo[0];
}

// more than one method, now need to select the best...
return LazyBinder.SelectBestMethod(_methodInfo, parameterTypes);
}

Type t = _type;

while (t != null)
{
MethodInfo methodInfo = t.Inspector().GetMethod(_methodName, BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, parameterTypes);

if (methodInfo != null)
return methodInfo;

t = t.Inspector().BaseType;
}

return null;


//return _methodInfo ?? _type.GetMethod(_methodName, BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, binder ?? LazyBinder.Default, parameterTypes, null);
}

public abstract object Invoke(Type[] types, object[] parameters, out Type returnType);
}
}
Loading