Skip to content

Commit 8cc1247

Browse files
msimacekmsimacek
committed
Post-rebase fixes for capi move
1 parent 911b210 commit 8cc1247

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
*/
2626
package com.oracle.graal.python.builtins.modules;
2727

28-
import static com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols.FUN_ADD_NATIVE_SLOTS;
29-
import static com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols.FUN_PY_OBJECT_NEW;
28+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_ADD_NATIVE_SLOTS;
29+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PY_OBJECT_NEW;
3030
import static com.oracle.graal.python.builtins.objects.range.RangeUtils.canBeInt;
3131
import static com.oracle.graal.python.builtins.objects.range.RangeUtils.canBePint;
3232
import static com.oracle.graal.python.builtins.objects.type.TypeBuiltins.TYPE_ITEMSIZE;
@@ -76,6 +76,7 @@
7676
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__SLOTS__;
7777
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__WEAKREF__;
7878
import static com.oracle.graal.python.nodes.SpecialMethodNames.DECODE;
79+
import static com.oracle.graal.python.nodes.SpecialMethodNames.__BYTES__;
7980
import static com.oracle.graal.python.nodes.SpecialMethodNames.__COMPLEX__;
8081
import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
8182
import static com.oracle.graal.python.nodes.SpecialMethodNames.__FLOAT__;
@@ -114,13 +115,13 @@
114115
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
115116
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
116117
import com.oracle.graal.python.builtins.objects.cell.PCell;
117-
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
118-
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
119-
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory;
120-
import com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols;
121118
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
122119
import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
123120
import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
121+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
122+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
123+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory;
124+
import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols;
124125
import com.oracle.graal.python.builtins.objects.code.CodeNodes;
125126
import com.oracle.graal.python.builtins.objects.code.PCode;
126127
import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
@@ -188,7 +189,6 @@
188189
import com.oracle.graal.python.nodes.PGuards;
189190
import com.oracle.graal.python.nodes.SpecialAttributeNames;
190191
import com.oracle.graal.python.nodes.SpecialMethodNames;
191-
import static com.oracle.graal.python.nodes.SpecialMethodNames.__BYTES__;
192192
import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
193193
import com.oracle.graal.python.nodes.attributes.GetAttributeNode.GetAnyAttributeNode;
194194
import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
package com.oracle.graal.python.builtins.objects.cext.capi;
4242

43-
import static com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols.FUN_PTR_ADD;
43+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PTR_ADD;
4444
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PTR_COMPARE;
4545
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PY_FLOAT_AS_DOUBLE;
4646
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PY_TRUFFLE_BYTE_ARRAY_TO_NATIVE;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_DEREF_HANDLE;
4444
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.MD_DEF;
45+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.MEMORYVIEW_EXPORTS;
4546
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.OB_BASE;
4647
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.OB_REFCNT;
4748
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.OB_TYPE;
@@ -81,7 +82,6 @@
8182
import com.oracle.graal.python.builtins.objects.PythonAbstractObject.PInteropGetAttributeNode;
8283
import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
8384
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
84-
import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
8585
import com.oracle.graal.python.builtins.objects.cext.capi.CArrayWrappers.CStringWrapper;
8686
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AllToJavaNode;
8787
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsPythonObjectNode;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyMemoryViewBufferWrapper.java renamed to ‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyMemoryViewBufferWrapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.graal.python.builtins.objects.cext;
41+
package com.oracle.graal.python.builtins.objects.cext.capi;
4242

43-
import static com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols.FUN_GET_PY_BUFFER_TYPEID;
44-
import static com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols.FUN_PY_TRUFFLE_LONG_ARRAY_TO_NATIVE;
43+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_GET_PY_BUFFER_TYPEID;
44+
import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PY_TRUFFLE_LONG_ARRAY_TO_NATIVE;
4545

4646
import com.oracle.graal.python.PythonLanguage;
4747
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins.SepExpectByteNode;
7272
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
7373
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
74-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
75-
import com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols;
74+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
75+
import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols;
7676
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
7777
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
7878
import com.oracle.graal.python.builtins.objects.list.PList;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewNodes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
5454
import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
5555
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
56-
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
57-
import com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols;
56+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
57+
import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols;
5858
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
5959
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
6060
import com.oracle.graal.python.builtins.objects.ints.PInt;

0 commit comments

Comments
 (0)