Skip to content

Object identity, Interfaces and Attributes #2019

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
rmadsen-ks wants to merge 15 commits into from
Closed

Object identity, Interfaces and Attributes #2019

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ab531f8
1776 Inherit Generic Virtual Method Bug: Unit Test
rmadsen-ks Apr 27, 2022
bfcf1d1
1776 Inherit Generic Virtual Method Bug: Fix
rmadsen-ks Apr 28, 2022
eb4ce37
1774-ClassWithoutnamespace
rmadsen-ks Apr 29, 2022
a2c80cd
better support for multiple inheritance
rmadsen-ks May 3, 2022
65c2c00
Fixed issue with protected constructors and classes with no constructor
rmadsen-ks May 3, 2022
28f4717
Added supporr for class/property/method attributes.
rmadsen-ks May 5, 2022
014ef2e
- Expanded the way attributes amy be added
rmadsen-ks May 5, 2022
2449bd2
added support for creating abstract classes using a __clr_abstract__ …
rmadsen-ks May 6, 2022
7980fc4
Improved AttributeError when looking for a symbol that does not exist…
rmadsen-ks May 24, 2022
cf2c27a
Added test to detect an issue with object construction.
rmadsen-ks Jun 28, 2022
adc6613
Added support for marking properties with python types.
rmadsen-ks Sep 2, 2022
9373a03
Fixed issue calling base-base class implementation of methods.
rmadsen-ks Sep 2, 2022
ab12481
Merged with Pythonnet 3.0 RC.6.
rmadsen-ks Oct 28, 2022
c290bf9
Merge branch 'master' of github.com:pythonnet/pythonnet into 1776-Inh…
rmadsen-ks Nov 18, 2022
bb988cd
Cleanup and comments
rmadsen-ks Nov 18, 2022
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
Prev Previous commit
Next Next commit
Fixed issue with protected constructors and classes with no constructor
  • Loading branch information
@rmadsen-ks
rmadsen-ks committed Oct 31, 2022
commit 65c2c008834bc4380aad322fb4a72ef7c5a68752
14 changes: 10 additions & 4 deletions src/runtime/Types/ClassDerived.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,17 @@ internal static Type CreateDerivedType(string name,
FieldAttributes.Private);

// override any constructors
ConstructorInfo[] constructors = baseClass.GetConstructors();
ConstructorInfo[] constructors = baseClass.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
foreach (ConstructorInfo ctor in constructors)
{
AddConstructor(ctor, baseType, typeBuilder);
}

if (constructors.Length == 0)
{
AddConstructor(null, baseType, typeBuilder);
}

// Override any properties explicitly overridden in python
var pyProperties = new HashSet<string>();
if (py_dict != null && Runtime.PyDict_Check(py_dict))
Expand Down Expand Up @@ -303,7 +308,7 @@ internal static Type CreateDerivedType(string name,
/// <param name="typeBuilder">TypeBuilder for the new type the ctor is to be added to</param>
private static void AddConstructor(ConstructorInfo ctor, Type baseType, TypeBuilder typeBuilder)
{
ParameterInfo[] parameters = ctor.GetParameters();
ParameterInfo[] parameters = ctor?.GetParameters() ?? Array.Empty<ParameterInfo>();
Type[] parameterTypes = (from param in parameters select param.ParameterType).ToArray();

// create a method for calling the original constructor
Expand All @@ -322,14 +327,15 @@ private static void AddConstructor(ConstructorInfo ctor, Type baseType, TypeBuil
{
il.Emit(OpCodes.Ldarg, i + 1);
}
il.Emit(OpCodes.Call, ctor);
if(ctor != null)
il.Emit(OpCodes.Call, ctor);
il.Emit(OpCodes.Ret);

// override the original method with a new one that dispatches to python
ConstructorBuilder cb = typeBuilder.DefineConstructor(MethodAttributes.Public |
MethodAttributes.ReuseSlot |
MethodAttributes.HideBySig,
ctor.CallingConvention,
ctor?.CallingConvention ?? CallingConventions.Any,
parameterTypes);
il = cb.GetILGenerator();
il.DeclareLocal(typeof(object[]));
Expand Down