🌐 AI搜索 & 代理 主页
Skip to content

Mixins for standard collections that implement collections.abc interfaces #1543

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

Merged
lostmsu merged 9 commits into from
Sep 23, 2021
Merged

Mixins for standard collections that implement collections.abc interfaces #1543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5cb300a
added a few mixins to reflected .NET collection types, that implement…
lostmsu May 24, 2020
cd044c8
fixed MappingMixin implementation (untested)
lostmsu Jun 3, 2020
85897e3
fixed implementation of mixins for Mapping and MutableMapping (still …
lostmsu Jun 17, 2020
38ac73b
fixed mixin calls to TryGetValue
lostmsu Jun 17, 2020
b77b7ce
added a few tests for collection mixins
lostmsu Sep 5, 2021
a38849e
mentioned collection mixins in changelog
lostmsu Sep 5, 2021
6b20409
refactored LoadExtraModules for Mixins into LoadSubmodule + LoadMixins
lostmsu May 29, 2020
197689e
added a workaround for tp_clear implementations, that do not check, t…
lostmsu Sep 22, 2021
6ae373c
merge latest master
lostmsu Sep 23, 2021
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
refactored LoadExtraModules for Mixins into LoadSubmodule + LoadMixins
  • Loading branch information
@lostmsu
lostmsu committed Sep 22, 2021
commit 6b20409df7b5d5787d165c587d91b7f37a815b1f
12 changes: 12 additions & 0 deletions src/runtime/Util.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,17 @@ internal static void WriteCLong(IntPtr type, int offset, Int64 flags)
/// </summary>
internal static IntPtr Coalesce(this IntPtr primary, IntPtr fallback)
=> primary == IntPtr.Zero ? fallback : primary;

/// <summary>
/// Gets substring after last occurrence of <paramref name="symbol"/>
/// </summary>
internal static string AfterLast(this string str, char symbol)
{
if (str is null)
throw new ArgumentNullException(nameof(str));

int last = str.LastIndexOf(symbol);
return last >= 0 ? str.Substring(last + 1) : null;
}
}
}
37 changes: 23 additions & 14 deletions src/runtime/pythonengine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
Expand Down Expand Up @@ -235,7 +236,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,
Exec(clr_py, module_globals, locals.Reference);
}

LoadExtraModules(module_globals);
LoadMixins(module_globals);

// add the imported module to the clr module, and copy the API functions
// and decorators into the main clr module.
Expand Down Expand Up @@ -267,23 +268,31 @@ static BorrowedReference DefineModule(string name)
return module;
}

static void LoadExtraModules(BorrowedReference targetModuleDict)
static void LoadMixins(BorrowedReference targetModuleDict)
{
Assembly assembly = Assembly.GetExecutingAssembly();
foreach (string nested in new[] { "collections" })
foreach (string nested in new[] {"collections"})
{
var module = DefineModule("clr._extras." + nested);
var module_globals = Runtime.PyModule_GetDict(module);
string resourceName = typeof(PythonEngine).Namespace + ".Mixins." + nested + ".py";
using (var stream = assembly.GetManifestResourceStream(resourceName))
using (var reader = new StreamReader(stream))
{
string pyCode = reader.ReadToEnd();
Exec(pyCode, module_globals.DangerousGetAddress(), module_globals.DangerousGetAddress());
}
LoadSubmodule(targetModuleDict,
fullName: "clr._extras." + nested,
resourceName: typeof(PythonEngine).Namespace + ".Mixins." + nested + ".py");
}
}

Runtime.PyDict_SetItemString(targetModuleDict, nested, module);
static void LoadSubmodule(BorrowedReference targetModuleDict, string fullName, string resourceName)
{
string memberName = fullName.AfterLast('.');
Debug.Assert(memberName != null);
Assembly assembly = Assembly.GetExecutingAssembly();
var module = DefineModule(fullName);
var module_globals = Runtime.PyModule_GetDict(module);
using (var stream = assembly.GetManifestResourceStream(resourceName))
using (var reader = new StreamReader(stream))
{
string pyCode = reader.ReadToEnd();
Exec(pyCode, module_globals.DangerousGetAddress(), module_globals.DangerousGetAddress());
}

Runtime.PyDict_SetItemString(targetModuleDict, memberName, module);
}

static void OnDomainUnload(object _, EventArgs __)
Expand Down