Skip to content

Replace arrays with IEnumerable<> in InjectedMethodAnalysisContext constructor #546

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
ds5678 wants to merge 1 commit into from
Closed

Replace arrays with IEnumerable<> in InjectedMethodAnalysisContext constructor #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 64 additions & 11 deletions Cpp2IL.Core/Model/Contexts/InjectedMethodAnalysisContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.Reflection;

namespace Cpp2IL.Core.Model.Contexts;
Expand All @@ -23,24 +24,76 @@ public InjectedMethodAnalysisContext(
string name,
TypeAnalysisContext returnType,
MethodAttributes attributes,
TypeAnalysisContext[] injectedParameterTypes,
string[]? injectedParameterNames = null,
ParameterAttributes[]? injectedParameterAttributes = null,
MethodImplAttributes defaultImplAttributes = MethodImplAttributes.Managed) : base(null, parent)
IEnumerable<TypeAnalysisContext> injectedParameterTypes,
IEnumerable<string>? injectedParameterNames = null,
IEnumerable<ParameterAttributes>? injectedParameterAttributes = null,
MethodImplAttributes implAttributes = MethodImplAttributes.Managed) : this(parent, name, returnType, attributes, GetParameters(injectedParameterTypes, injectedParameterNames, injectedParameterAttributes), implAttributes)
{
}

public InjectedMethodAnalysisContext(
TypeAnalysisContext parent,
string name,
TypeAnalysisContext returnType,
MethodAttributes attributes,
IEnumerable<(TypeAnalysisContext Type, string? Name, ParameterAttributes Attributes)> parameters,
MethodImplAttributes implAttributes = MethodImplAttributes.Managed) : base(null, parent)
{
DefaultName = name;
DefaultReturnType = returnType;
DefaultAttributes = attributes;

for (var i = 0; i < injectedParameterTypes.Length; i++)
var i = 0;
foreach (var (parameterType, parameterName, parameterAttributes) in parameters)
{
var injectedParameterType = injectedParameterTypes[i];
var injectedParameterName = injectedParameterNames?[i];
var injectedParameterAttribute = injectedParameterAttributes?[i] ?? ParameterAttributes.None;

Parameters.Add(new InjectedParameterAnalysisContext(injectedParameterName, injectedParameterType, injectedParameterAttribute, i, this));
Parameters.Add(new InjectedParameterAnalysisContext(parameterName, parameterType, parameterAttributes, i, this));
i++;
}

DefaultImplAttributes = defaultImplAttributes;
DefaultImplAttributes = implAttributes;
}

private static IEnumerable<(TypeAnalysisContext Type, string? Name, ParameterAttributes Attributes)> GetParameters(
IEnumerable<TypeAnalysisContext> parameterTypes,
IEnumerable<string>? parameterNames = null,
IEnumerable<ParameterAttributes>? parameterAttributes = null)
{
var typeEnumerator = parameterTypes.GetEnumerator();
var nameEnumerator = parameterNames?.GetEnumerator();
var attributeEnumerator = parameterAttributes?.GetEnumerator();
if (nameEnumerator != null)
{
if (attributeEnumerator != null)
{
while (typeEnumerator.MoveNext() && nameEnumerator.MoveNext() && attributeEnumerator.MoveNext())
{
yield return (typeEnumerator.Current, nameEnumerator.Current, attributeEnumerator.Current);
}
}
else
{
while (typeEnumerator.MoveNext() && nameEnumerator.MoveNext())
{
yield return (typeEnumerator.Current, nameEnumerator.Current, ParameterAttributes.None);
}
}
}
else
{
if (attributeEnumerator != null)
{
while (typeEnumerator.MoveNext() && attributeEnumerator.MoveNext())
{
yield return (typeEnumerator.Current, null, attributeEnumerator.Current);
}
}
else
{
while (typeEnumerator.MoveNext())
{
yield return (typeEnumerator.Current, null, ParameterAttributes.None);
}
}
}
}
}
3 changes: 2 additions & 1 deletion Cpp2IL.Core/Model/Contexts/InjectedTypeAnalysisContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.Reflection;

namespace Cpp2IL.Core.Model.Contexts;
Expand All @@ -22,7 +23,7 @@ public InjectedTypeAnalysisContext(AssemblyAnalysisContext containingAssembly, s
DefaultAttributes = typeAttributes;
}

public InjectedMethodAnalysisContext InjectMethodContext(string methodName, TypeAnalysisContext returnType, MethodAttributes attributes, params TypeAnalysisContext[] args)
public InjectedMethodAnalysisContext InjectMethodContext(string methodName, TypeAnalysisContext returnType, MethodAttributes attributes, params IEnumerable<TypeAnalysisContext> args)
{
var method = new InjectedMethodAnalysisContext(this, methodName, returnType, attributes, args);
Methods.Add(method);
Expand Down
4 changes: 2 additions & 2 deletions Cpp2IL.Core/Model/MultiAssemblyInjectedType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ public class MultiAssemblyInjectedType(InjectedTypeAnalysisContext[] injectedTyp
{
public InjectedTypeAnalysisContext[] InjectedTypes { get; } = injectedTypes;

public Dictionary<AssemblyAnalysisContext, InjectedMethodAnalysisContext> InjectMethodToAllAssemblies(string name, TypeAnalysisContext returnType, MethodAttributes attributes, params TypeAnalysisContext[] args)
public Dictionary<AssemblyAnalysisContext, InjectedMethodAnalysisContext> InjectMethodToAllAssemblies(string name, TypeAnalysisContext returnType, MethodAttributes attributes, params IEnumerable<TypeAnalysisContext> args)
=> InjectedTypes.ToDictionary(t => t.DeclaringAssembly, t => t.InjectMethodContext(name, returnType, attributes, args));

public Dictionary<AssemblyAnalysisContext, InjectedMethodAnalysisContext> InjectConstructor(bool isStatic, params TypeAnalysisContext[] args)
public Dictionary<AssemblyAnalysisContext, InjectedMethodAnalysisContext> InjectConstructor(bool isStatic, params IEnumerable<TypeAnalysisContext> args)
{
var attributes = isStatic
? MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Static
Expand Down
Loading