Skip to content

Commit f63d4f6

Browse files
tomasstupkatomasstupka
committed
[GR-34916] Intrinsify python_cext - builtin refactoring.
PullRequest: graalpython/2141
2 parents 639fb46 + 0eb5d82 commit f63d4f6

17 files changed

+1250
-671
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,27 @@
123123
import com.oracle.graal.python.builtins.modules.cext.PythonCextImportBuiltins;
124124
import com.oracle.graal.python.builtins.modules.cext.PythonCextMemoryViewBuiltins;
125125
import com.oracle.graal.python.builtins.modules.cext.PythonCextAbstractBuiltins;
126+
import com.oracle.graal.python.builtins.modules.cext.PythonCextBoolBuiltins;
126127
import com.oracle.graal.python.builtins.modules.cext.PythonCextErrBuiltins;
127128
import com.oracle.graal.python.builtins.modules.cext.PythonCextDescrBuiltins;
128129
import com.oracle.graal.python.builtins.modules.cext.PythonCextFuncBuiltins;
130+
import com.oracle.graal.python.builtins.modules.cext.PythonCextHashBuiltins;
129131
import com.oracle.graal.python.builtins.modules.cext.PythonCextIterBuiltins;
132+
import com.oracle.graal.python.builtins.modules.cext.PythonCextMethodBuiltins;
130133
import com.oracle.graal.python.builtins.modules.cext.PythonCextModuleBuiltins;
131134
import com.oracle.graal.python.builtins.modules.cext.PythonCextNamespaceBuiltins;
132135
import com.oracle.graal.python.builtins.modules.cext.PythonCextObjectBuiltins;
136+
import com.oracle.graal.python.builtins.modules.cext.PythonCextPyLifecycleBuiltins;
137+
import com.oracle.graal.python.builtins.modules.cext.PythonCextPyStateBuiltins;
133138
import com.oracle.graal.python.builtins.modules.cext.PythonCextPythonRunBuiltins;
134139
import com.oracle.graal.python.builtins.modules.cext.PythonCextSetBuiltins;
135140
import com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltins;
136141
import com.oracle.graal.python.builtins.modules.cext.PythonCextSliceBuiltins;
142+
import com.oracle.graal.python.builtins.modules.cext.PythonCextStructSeqBuiltins;
137143
import com.oracle.graal.python.builtins.modules.cext.PythonCextSysBuiltins;
144+
import com.oracle.graal.python.builtins.modules.cext.PythonCextTracebackBuiltins;
138145
import com.oracle.graal.python.builtins.modules.cext.PythonCextTupleBuiltins;
146+
import com.oracle.graal.python.builtins.modules.cext.PythonCextTypeBuiltins;
139147
import com.oracle.graal.python.builtins.modules.cext.PythonCextWarnBuiltins;
140148
import com.oracle.graal.python.builtins.modules.csv.CSVDialectBuiltins;
141149
import com.oracle.graal.python.builtins.modules.csv.CSVModuleBuiltins;
@@ -493,6 +501,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
493501
new RandomBuiltins(),
494502
new PythonCextBuiltins(),
495503
new PythonCextAbstractBuiltins(),
504+
new PythonCextBoolBuiltins(),
496505
new PythonCextBytesBuiltins(),
497506
new PythonCextCEvalBuiltins(),
498507
new PythonCextCodeBuiltins(),
@@ -504,19 +513,26 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
504513
new PythonCextFileBuiltins(),
505514
new PythonCextFloatBuiltins(),
506515
new PythonCextFuncBuiltins(),
516+
new PythonCextHashBuiltins(),
507517
new PythonCextImportBuiltins(),
508518
new PythonCextIterBuiltins(),
509519
new PythonCextListBuiltins(),
510520
new PythonCextLongBuiltins(),
511521
new PythonCextMemoryViewBuiltins(),
522+
new PythonCextMethodBuiltins(),
512523
new PythonCextModuleBuiltins(),
513524
new PythonCextObjectBuiltins(),
525+
new PythonCextPyLifecycleBuiltins(),
526+
new PythonCextPyStateBuiltins(),
514527
new PythonCextPythonRunBuiltins(),
515528
new PythonCextNamespaceBuiltins(),
516529
new PythonCextSetBuiltins(),
517530
new PythonCextSliceBuiltins(),
531+
new PythonCextStructSeqBuiltins(),
518532
new PythonCextSysBuiltins(),
533+
new PythonCextTracebackBuiltins(),
519534
new PythonCextTupleBuiltins(),
535+
new PythonCextTypeBuiltins(),
520536
new PythonCextUnicodeBuiltins(),
521537
new PythonCextWarnBuiltins(),
522538
new WeakRefModuleBuiltins(),

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBoolBuiltins.java‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/*
2+
* Copyright (c) 2021, 2022, 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.modules.cext;
42+
43+
import com.oracle.graal.python.builtins.Builtin;
44+
import java.util.List;
45+
import com.oracle.graal.python.builtins.CoreFunctions;
46+
import com.oracle.graal.python.builtins.Python3Core;
47+
import com.oracle.graal.python.builtins.PythonBuiltins;
48+
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
49+
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
50+
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
51+
import com.oracle.truffle.api.dsl.NodeFactory;
52+
import com.oracle.truffle.api.dsl.Specialization;
53+
54+
@CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
55+
@GenerateNodeFactory
56+
public final class PythonCextBoolBuiltins extends PythonBuiltins {
57+
58+
@Override
59+
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
60+
return PythonCextBoolBuiltinsFactory.getFactories();
61+
}
62+
63+
@Override
64+
public void initialize(Python3Core core) {
65+
super.initialize(core);
66+
}
67+
68+
@Builtin(name = "Py_True")
69+
@GenerateNodeFactory
70+
public abstract static class PyTrueNode extends PythonBuiltinNode {
71+
@Specialization
72+
static Object run() {
73+
return true;
74+
}
75+
}
76+
77+
@Builtin(name = "Py_False")
78+
@GenerateNodeFactory
79+
public abstract static class PyFalseNode extends PythonBuiltinNode {
80+
@Specialization
81+
static Object run() {
82+
return false;
83+
}
84+
}
85+
}

0 commit comments

Comments
 (0)