Skip to content

Commit f9f08a0

Browse files
filmorfilmor
committed
Move code to subdirectories and rename or split up
1 parent 7450c5c commit f9f08a0

File tree

113 files changed

+676
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+676
-687
lines changed

‎src/runtime/assemblymanager.cs renamed to ‎src/runtime/AssemblyManager.cs

File renamed without changes.

‎src/runtime/classmanager.cs renamed to ‎src/runtime/ClassManager.cs

File renamed without changes.

‎src/runtime/Codecs/IPyObjectDecoder.cs

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
namespace Python.Runtime;
2+
3+
using System;
4+
5+
/// <summary>
6+
/// Defines <see cref="PyObject"/> conversion to CLR types (unmarshalling)
7+
/// </summary>
8+
public interface IPyObjectDecoder
9+
{
10+
/// <summary>
11+
/// Checks if this decoder can decode from <paramref name="objectType"/> to <paramref name="targetType"/>
12+
/// </summary>
13+
bool CanDecode(PyType objectType, Type targetType);
14+
/// <summary>
15+
/// Attempts do decode <paramref name="pyObj"/> into a variable of specified type
16+
/// </summary>
17+
/// <typeparam name="T">CLR type to decode into</typeparam>
18+
/// <param name="pyObj">Object to decode</param>
19+
/// <param name="value">The variable, that will receive decoding result</param>
20+
/// <returns></returns>
21+
bool TryDecode<T>(PyObject pyObj, out T? value);
22+
}

‎src/runtime/Codecs/IPyObjectEncoder.cs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
namespace Python.Runtime;
2+
3+
using System;
4+
5+
/// <summary>
6+
/// Defines conversion from CLR objects into Python objects (e.g. <see cref="PyObject"/>) (marshalling)
7+
/// </summary>
8+
public interface IPyObjectEncoder
9+
{
10+
/// <summary>
11+
/// Checks if encoder can encode CLR objects of specified type
12+
/// </summary>
13+
bool CanEncode(Type type);
14+
/// <summary>
15+
/// Attempts to encode CLR object <paramref name="value"/> into Python object
16+
/// </summary>
17+
PyObject? TryEncode(object value);
18+
}

‎src/runtime/converterextensions.cs renamed to ‎src/runtime/Codecs/PyObjectConversions.cs

+1-34
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,8 @@ namespace Python.Runtime
66
using System.Diagnostics;
77
using System.Linq;
88
using System.Reflection;
9-
using Python.Runtime.Codecs;
10-
11-
/// <summary>
12-
/// Defines <see cref="PyObject"/> conversion to CLR types (unmarshalling)
13-
/// </summary>
14-
public interface IPyObjectDecoder
15-
{
16-
/// <summary>
17-
/// Checks if this decoder can decode from <paramref name="objectType"/> to <paramref name="targetType"/>
18-
/// </summary>
19-
bool CanDecode(PyType objectType, Type targetType);
20-
/// <summary>
21-
/// Attempts do decode <paramref name="pyObj"/> into a variable of specified type
22-
/// </summary>
23-
/// <typeparam name="T">CLR type to decode into</typeparam>
24-
/// <param name="pyObj">Object to decode</param>
25-
/// <param name="value">The variable, that will receive decoding result</param>
26-
/// <returns></returns>
27-
bool TryDecode<T>(PyObject pyObj, out T? value);
28-
}
299

30-
/// <summary>
31-
/// Defines conversion from CLR objects into Python objects (e.g. <see cref="PyObject"/>) (marshalling)
32-
/// </summary>
33-
public interface IPyObjectEncoder
34-
{
35-
/// <summary>
36-
/// Checks if encoder can encode CLR objects of specified type
37-
/// </summary>
38-
bool CanEncode(Type type);
39-
/// <summary>
40-
/// Attempts to encode CLR object <paramref name="value"/> into Python object
41-
/// </summary>
42-
PyObject? TryEncode(object value);
43-
}
10+
using Python.Runtime.Codecs;
4411

4512
/// <summary>
4613
/// This class allows to register additional marshalling codecs.

‎src/runtime/converter.cs renamed to ‎src/runtime/Converter.cs

File renamed without changes.

‎src/runtime/delegatemanager.cs renamed to ‎src/runtime/DelegateManager.cs

File renamed without changes.

‎src/runtime/exceptions.cs renamed to ‎src/runtime/Exceptions.cs

-81
Original file line numberDiff line numberDiff line change
@@ -5,87 +5,6 @@
55

66
namespace Python.Runtime
77
{
8-
/// <summary>
9-
/// Base class for Python types that reflect managed exceptions based on
10-
/// System.Exception
11-
/// </summary>
12-
/// <remarks>
13-
/// The Python wrapper for managed exceptions LIES about its inheritance
14-
/// tree. Although the real System.Exception is a subclass of
15-
/// System.Object the Python type for System.Exception does NOT claim that
16-
/// it subclasses System.Object. Instead TypeManager.CreateType() uses
17-
/// Python's exception.Exception class as base class for System.Exception.
18-
/// </remarks>
19-
[Serializable]
20-
internal class ExceptionClassObject : ClassObject
21-
{
22-
internal ExceptionClassObject(Type tp) : base(tp)
23-
{
24-
}
25-
26-
internal static Exception? ToException(BorrowedReference ob)
27-
{
28-
var co = GetManagedObject(ob) as CLRObject;
29-
return co?.inst as Exception;
30-
}
31-
32-
/// <summary>
33-
/// Exception __repr__ implementation
34-
/// </summary>
35-
public new static NewReference tp_repr(BorrowedReference ob)
36-
{
37-
Exception? e = ToException(ob);
38-
if (e == null)
39-
{
40-
return Exceptions.RaiseTypeError("invalid object");
41-
}
42-
string name = e.GetType().Name;
43-
string message;
44-
if (e.Message != String.Empty)
45-
{
46-
message = String.Format("{0}('{1}')", name, e.Message);
47-
}
48-
else
49-
{
50-
message = String.Format("{0}()", name);
51-
}
52-
return Runtime.PyString_FromString(message);
53-
}
54-
55-
/// <summary>
56-
/// Exception __str__ implementation
57-
/// </summary>
58-
public new static NewReference tp_str(BorrowedReference ob)
59-
{
60-
Exception? e = ToException(ob);
61-
if (e == null)
62-
{
63-
return Exceptions.RaiseTypeError("invalid object");
64-
}
65-
66-
string message = e.ToString();
67-
string fullTypeName = e.GetType().FullName;
68-
string prefix = fullTypeName + ": ";
69-
if (message.StartsWith(prefix))
70-
{
71-
message = message.Substring(prefix.Length);
72-
}
73-
else if (message.StartsWith(fullTypeName))
74-
{
75-
message = message.Substring(fullTypeName.Length);
76-
}
77-
return Runtime.PyString_FromString(message);
78-
}
79-
80-
public override bool Init(BorrowedReference obj, BorrowedReference args, BorrowedReference kw)
81-
{
82-
if (!base.Init(obj, args, kw)) return false;
83-
84-
var e = (CLRObject)GetManagedObject(obj)!;
85-
86-
return Exceptions.SetArgsAndCause(obj, (Exception)e.inst);
87-
}
88-
}
898

909
/// <summary>
9110
/// Encapsulates the Python exception APIs.

‎src/runtime/finalizer.cs renamed to ‎src/runtime/Finalizer.cs

File renamed without changes.

‎src/runtime/importhook.cs renamed to ‎src/runtime/ImportHook.cs

File renamed without changes.

‎src/runtime/interfaces.cs renamed to ‎src/runtime/Interfaces.cs

File renamed without changes.

‎src/runtime/intern.cs renamed to ‎src/runtime/InternString.cs

File renamed without changes.

‎src/runtime/interop.cs renamed to ‎src/runtime/Interop.cs

File renamed without changes.

‎src/runtime/loader.cs renamed to ‎src/runtime/Loader.cs

File renamed without changes.

‎src/runtime/methodbinder.cs renamed to ‎src/runtime/MethodBinder.cs

File renamed without changes.

‎src/runtime/native/ABI.cs renamed to ‎src/runtime/Native/ABI.cs

File renamed without changes.

‎src/runtime/BorrowedReference.cs renamed to ‎src/runtime/Native/BorrowedReference.cs

File renamed without changes.

‎src/runtime/CustomMarshaler.cs renamed to ‎src/runtime/Native/CustomMarshaler.cs

File renamed without changes.

‎src/runtime/native/GeneratedTypeOffsets.cs renamed to ‎src/runtime/Native/GeneratedTypeOffsets.cs

File renamed without changes.

‎src/runtime/native/ITypeOffsets.cs renamed to ‎src/runtime/Native/ITypeOffsets.cs

File renamed without changes.

‎src/runtime/platform/LibDL.cs renamed to ‎src/runtime/Native/LibDL.cs

File renamed without changes.

‎src/runtime/platform/LibraryLoader.cs renamed to ‎src/runtime/Native/LibraryLoader.cs

File renamed without changes.

‎src/runtime/nativecall.cs renamed to ‎src/runtime/Native/NativeCall.cs

File renamed without changes.

‎src/runtime/native/NativeFunc.cs renamed to ‎src/runtime/Native/NativeFunc.cs

File renamed without changes.

‎src/runtime/native/NativeTypeSpec.cs renamed to ‎src/runtime/Native/NativeTypeSpec.cs

File renamed without changes.

‎src/runtime/NewReference.cs renamed to ‎src/runtime/Native/NewReference.cs

File renamed without changes.

‎src/runtime/bufferinterface.cs renamed to ‎src/runtime/Native/PyBufferInterface.cs

File renamed without changes.

‎src/runtime/native/PyCompilerFlags.cs renamed to ‎src/runtime/Native/PyCompilerFlags.cs

File renamed without changes.

‎src/runtime/native/PyGILState.cs renamed to ‎src/runtime/Native/PyGILState.cs

File renamed without changes.

‎src/runtime/intern_.cs renamed to ‎src/runtime/Native/PyIdentifier_.cs

File renamed without changes.

‎src/runtime/intern_.tt renamed to ‎src/runtime/Native/PyIdentifier_.tt

File renamed without changes.

‎src/runtime/native/PyInterpreterState.cs renamed to ‎src/runtime/Native/PyInterpreterState.cs

File renamed without changes.

‎src/runtime/native/PyMemberFlags.cs renamed to ‎src/runtime/Native/PyMemberFlags.cs

File renamed without changes.

‎src/runtime/native/PyMemberType.cs renamed to ‎src/runtime/Native/PyMemberType.cs

File renamed without changes.

‎src/runtime/native/PyMethodFlags.cs renamed to ‎src/runtime/Native/PyMethodFlags.cs

File renamed without changes.

‎src/runtime/native/PyThreadState.cs renamed to ‎src/runtime/Native/PyThreadState.cs

File renamed without changes.

‎src/runtime/ReferenceExtensions.cs renamed to ‎src/runtime/Native/ReferenceExtensions.cs

File renamed without changes.

‎src/runtime/StolenReference.cs renamed to ‎src/runtime/Native/StolenReference.cs

File renamed without changes.

‎src/runtime/native/StrPtr.cs renamed to ‎src/runtime/Native/StrPtr.cs

File renamed without changes.

‎src/runtime/native/TypeOffset.cs renamed to ‎src/runtime/Native/TypeOffset.cs

File renamed without changes.

‎src/runtime/interop310.cs renamed to ‎src/runtime/Native/TypeOffset310.cs

File renamed without changes.

‎src/runtime/interop36.cs renamed to ‎src/runtime/Native/TypeOffset36.cs

File renamed without changes.

‎src/runtime/interop37.cs renamed to ‎src/runtime/Native/TypeOffset37.cs

File renamed without changes.

‎src/runtime/interop38.cs renamed to ‎src/runtime/Native/TypeOffset38.cs

File renamed without changes.

‎src/runtime/interop39.cs renamed to ‎src/runtime/Native/TypeOffset39.cs

File renamed without changes.

‎src/runtime/Python.Runtime.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
</ItemGroup>
5151

5252
<ItemGroup>
53-
<EmbeddedResource Include="resources\clr.py">
53+
<EmbeddedResource Include="Resources\clr.py">
5454
<LogicalName>clr.py</LogicalName>
5555
</EmbeddedResource>
56-
<EmbeddedResource Include="resources\interop.py">
56+
<EmbeddedResource Include="Resources\interop.py">
5757
<LogicalName>interop.py</LogicalName>
5858
</EmbeddedResource>
5959
<EmbeddedResource Include="Mixins\*.py" />

‎src/runtime/pythonengine.cs renamed to ‎src/runtime/PythonEngine.cs

File renamed without changes.

‎src/runtime/pythonexception.cs renamed to ‎src/runtime/PythonException.cs

File renamed without changes.

‎src/runtime/pybuffer.cs renamed to ‎src/runtime/PythonTypes/PyBuffer.cs

File renamed without changes.

‎src/runtime/pydict.cs renamed to ‎src/runtime/PythonTypes/PyDict.cs

File renamed without changes.

‎src/runtime/pyfloat.cs renamed to ‎src/runtime/PythonTypes/PyFloat.cs

File renamed without changes.

‎src/runtime/pyint.cs renamed to ‎src/runtime/PythonTypes/PyInt.cs

File renamed without changes.

‎src/runtime/pyiter.cs renamed to ‎src/runtime/PythonTypes/PyIter.cs

File renamed without changes.

‎src/runtime/pyiterable.cs renamed to ‎src/runtime/PythonTypes/PyIterable.cs

File renamed without changes.

‎src/runtime/pylist.cs renamed to ‎src/runtime/PythonTypes/PyList.cs

File renamed without changes.

‎src/runtime/module.cs renamed to ‎src/runtime/PythonTypes/PyModule.cs

File renamed without changes.

‎src/runtime/pynumber.cs renamed to ‎src/runtime/PythonTypes/PyNumber.cs

File renamed without changes.

‎src/runtime/pyobject.cs renamed to ‎src/runtime/PythonTypes/PyObject.cs

File renamed without changes.

‎src/runtime/pysequence.cs renamed to ‎src/runtime/PythonTypes/PySequence.cs

File renamed without changes.

‎src/runtime/pystring.cs renamed to ‎src/runtime/PythonTypes/PyString.cs

File renamed without changes.

‎src/runtime/pytuple.cs renamed to ‎src/runtime/PythonTypes/PyTuple.cs

File renamed without changes.

‎src/runtime/pytype.cs renamed to ‎src/runtime/PythonTypes/PyType.cs

File renamed without changes.

‎src/runtime/TypeSpec.cs renamed to ‎src/runtime/PythonTypes/TypeSpec.cs

File renamed without changes.

‎src/runtime/resources/clr.py renamed to ‎src/runtime/Resources/clr.py

File renamed without changes.

‎src/runtime/resources/interop.py renamed to ‎src/runtime/Resources/interop.py

File renamed without changes.

0 commit comments

Comments
 (0)