Skip to content

Commit 323ca21

Browse files
committed
Extract common C ext conversion operations.
1 parent 2ab52b6 commit 323ca21

File tree

10 files changed

+586
-204
lines changed

10 files changed

+586
-204
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
8080
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
8181
import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
82+
import com.oracle.graal.python.builtins.objects.cext.CAPIConversionNodeSupplier;
8283
import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CByteArrayWrapper;
8384
import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CStringWrapper;
8485
import com.oracle.graal.python.builtins.objects.cext.CExtModsupportNodes;
@@ -3015,7 +3016,7 @@ static int doConvert(Object cextModule, Object argv, Object nativeKwds, Object n
30153016
// sort out if kwdnames is native NULL
30163017
Object kwdnames = kwdnamesProfile.profile(kwdnamesRefLib.isSame(nativeKwdnames, nativeNull)) ? null : nativeKwdnames;
30173018

3018-
return parseTupleAndKeywordsNode.execute(functionName, argv, kwdsProfile.profile(kwds), format, kwdnames, nativeVarargs);
3019+
return parseTupleAndKeywordsNode.execute(functionName, argv, kwdsProfile.profile(kwds), format, kwdnames, nativeVarargs, CAPIConversionNodeSupplier.INSTANCE);
30193020
}
30203021

30213022
static Object getKwds(Object[] arguments) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
/*
2+
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.graal.python.builtins.objects.cext;
42+
43+
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToSulongNode;
44+
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.AsPythonObjectNodeGen;
45+
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToJavaNodeGen;
46+
import com.oracle.graal.python.builtins.objects.cext.common.CExtAsPythonObjectNode;
47+
import com.oracle.graal.python.builtins.objects.cext.common.CExtToJavaNode;
48+
import com.oracle.graal.python.builtins.objects.cext.common.CExtToNativeNode;
49+
import com.oracle.graal.python.builtins.objects.cext.common.ConversionNodeSupplier;
50+
51+
public class CAPIConversionNodeSupplier extends ConversionNodeSupplier {
52+
53+
public static final CAPIConversionNodeSupplier INSTANCE = new CAPIConversionNodeSupplier();
54+
55+
private CAPIConversionNodeSupplier() {
56+
}
57+
58+
@Override
59+
public CExtToNativeNode createToNativeNode() {
60+
return ToSulongNode.create();
61+
}
62+
63+
@Override
64+
public CExtToNativeNode getUncachedToNativeNode() {
65+
return ToSulongNode.getUncached();
66+
}
67+
68+
@Override
69+
public CExtAsPythonObjectNode createAsPythonObjectNode() {
70+
return AsPythonObjectNodeGen.create();
71+
}
72+
73+
@Override
74+
public CExtAsPythonObjectNode getUncachedAsPythonObjectNode() {
75+
return AsPythonObjectNodeGen.getUncached();
76+
}
77+
78+
@Override
79+
public CExtToJavaNode createToJavaNode() {
80+
return ToJavaNodeGen.create();
81+
}
82+
83+
@Override
84+
public CExtToJavaNode getUncachedToJavaNode() {
85+
return ToJavaNodeGen.getUncached();
86+
}
87+
}

0 commit comments

Comments
 (0)