Merge remote-tracking branch 'origin/master' into topic/GR-13042

Author: timfel

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -149,35 +149,6 @@
  *     } while (0)
  */
 
-
-#undef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_None;
-
-extern int _PyArg_ParseTupleAndKeywords_SizeT(PyObject *argv, PyObject *kwds, const char *format, char** kwdnames, ...);
-
-// we use defines for these so we don't need to call with va_list
-#define _PyArg_Parse_SizeT(ARGV, FORMAT, ...) PyArg_ParseTupleAndKeywords(ARGV, PyDict_New(), FORMAT, NULL, ##__VA_ARGS__)
-#define _PyArg_ParseTuple_SizeT(ARGV, FORMAT, ...) PyArg_ParseTupleAndKeywords(ARGV, PyDict_New(), FORMAT, NULL, ##__VA_ARGS__)
-#define _PyArg_ParseTupleAndKeywordsFast_SizeT(ARGS, KWARGS, PARSER, ...) PyArg_ParseTupleAndKeywords(ARGS, KWARGS, (PARSER)->format, (PARSER)->keywords, ##__VA_ARGS__)
-extern PyObject* PyTruffle_Stack2Tuple(PyObject** args, Py_ssize_t nargs);
-#define _PyArg_ParseStack_SizeT(ARGS, NARGS, KWNAMES, PARSER, ...) PyArg_ParseTupleAndKeywords(PyTruffle_Stack2Tuple(ARGS, NARGS), KWNAMES, (PARSER)->format, (PARSER)->keywords, ##__VA_ARGS__)
-
-#ifndef PyArg_Parse
-#define PyArg_Parse _PyArg_Parse_SizeT
-#endif
-
-#ifndef PyArg_ParseTuple
-#define PyArg_ParseTuple _PyArg_ParseTuple_SizeT
-#endif
-
-#ifndef PyArg_ParseTupleAndKeywords
-#define PyArg_ParseTupleAndKeywords _PyArg_ParseTupleAndKeywords_SizeT
-#endif
-
-#ifndef _PyArg_ParseStack
-#define _PyArg_ParseStack _PyArg_ParseStack_SizeT
-#endif
-
 extern PyObject * PyTruffle_Unicode_FromFormat(const char *fmt, int s, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v9, void* v10, void* v11, void* v12, void* v13, void* v14, void* v15, void* v16, void* v17, void* v18, void* v19);
 #define PyTruffle_Unicode_FromFormat_0(F1) PyTruffle_Unicode_FromFormat(F1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
 #define PyTruffle_Unicode_FromFormat_1(F1, V1) PyTruffle_Unicode_FromFormat(F1, 1, (void*)(V1), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)

graalpython/com.oracle.graal.python.cext/include/ucnhash.h

@@ -0,0 +1,42 @@
+/* Copyright (c) 2018, Oracle and/or its affiliates.
+ * Copyright (C) 1996-2017 Python Software Foundation
+ *
+ * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ */
+
+/* Unicode name database interface */
+#ifndef Py_LIMITED_API
+#ifndef Py_UCNHASH_H
+#define Py_UCNHASH_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* revised ucnhash CAPI interface (exported through a "wrapper") */
+
+#define PyUnicodeData_CAPSULE_NAME "unicodedata.ucnhash_CAPI"
+
+typedef struct {
+
+    /* Size of this struct */
+    int size;
+
+    /* Get name for a given character code.  Returns non-zero if
+       success, zero if not.  Does not set Python exceptions.
+       If self is NULL, data come from the default version of the database.
+       If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */
+    int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen,
+                   int with_alias_and_seq);
+
+    /* Get character code for a given name.  Same error handling
+       as for getname. */
+    int (*getcode)(PyObject *self, const char* name, int namelen, Py_UCS4* code,
+                   int with_named_seq);
+
+} _PyUnicode_Name_CAPI;
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_UCNHASH_H */
+#endif /* !Py_LIMITED_API */