X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/c90f712e989f2ee557842c18fdb9a4df469c1859..91e56f0647ff205643debd5cdb93797ea0e8da24:/pyke/pyke.h

diff --git a/pyke/pyke.h b/pyke/pyke.h
index e200c09..e7a1ece 100644
--- a/pyke/pyke.h
+++ b/pyke/pyke.h
@@ -229,12 +229,17 @@ extern PyTypeObject *inittype(PyTypeObject */*skel*/,
 /* Macros for filling in `PyMethodDef' tables, ensuring that functions have
  * the expected signatures.
  */
-#define STD_METHOD(decor, func, doc)					\
-  { #func, decor(func), METH_VARARGS, doc },
-#define KEYWORD_METHOD(decor, func, doc)				\
+#define STD_METHOD(decor, func, flags, doc)				\
+  { #func, decor(func), METH_VARARGS | flags, doc },
+#define KEYWORD_METHOD(decor, func, flags, doc)				\
   { #func,								\
     CONVERT_CAREFULLY(PyCFunction, PyCFunctionWithKeywords, decor(func)), \
-    METH_VARARGS | METH_KEYWORDS,					\
+    METH_VARARGS | METH_KEYWORDS | flags,				\
+    doc },
+#define NOARG_METHOD(decor, func, flags, doc)				\
+  { #func,								\
+    CONVERT_CAREFULLY(PyCFunction, PyNoArgsFunction, decor(func)),	\
+    METH_NOARGS | flags,						\
     doc },
 
 /* Convenience wrappers for filling in `PyMethodDef' tables, following
@@ -244,8 +249,15 @@ extern PyTypeObject *inittype(PyTypeObject */*skel*/,
  *
  * around the method table.
  */
-#define METH(func, doc) STD_METHOD(METHNAME, func, doc)
-#define KWMETH(func, doc) KEYWORD_METHOD(METHNAME, func, doc)
+#define METH(func, doc) STD_METHOD(METHNAME, func, 0, doc)
+#define KWMETH(func, doc) KEYWORD_METHOD(METHNAME, func, 0, doc)
+#define NAMETH(func, doc) NOARG_METHOD(METHNAME, func, 0, doc)
+#define CMTH(func, doc) STD_METHOD(METHNAME, func, METH_CLASS, doc)
+#define KWCMTH(func, doc) KEYWORD_METHOD(METHNAME, func, METH_CLASS, doc)
+#define NACMTH(func, doc) NOARG_METHOD(METHNAME, func, METH_CLASS, doc)
+#define SMTH(func, doc) STD_METHOD(METHNAME, func, METH_STATIC, doc)
+#define KWSMTH(func, doc) KEYWORD_METHOD(METHNAME, func, METH_STATIC, doc)
+#define NASMTH(func, doc) NOARG_METHOD(METHNAME, func, METH_STATIC, doc)
 
 /* Convenience wrappers for filling in `PyGetSetDef' tables, following Pyke
  * naming convention.  Define `GETSETNAME' locally as
@@ -359,34 +371,37 @@ extern PyMethodDef *donemethods(void);
 
 /* Mapping methods. */
 #define GMAP_METMNAME(func) gmapmeth_##func
-#define GMAP_METH(func, doc) STD_METHOD(GMAP_METMNAME, func, doc)
-#define GMAP_KWMETH(func, doc) KEYWORD_METHOD(GMAP_METMNAME, func, doc)
+#define GMAP_METH(func, doc) STD_METHOD(GMAP_METMNAME, func, 0, doc)
+#define GMAP_KWMETH(func, doc) KEYWORD_METHOD(GMAP_METMNAME, func, 0, doc)
+#define GMAP_NAMETH(func, doc) NOARG_METHOD(GMAP_METMNAME, func, 0, doc)
 #define GMAP_METHDECL(func, doc)					\
   extern PyObject *gmapmeth_##func(PyObject *, PyObject *);
 #define GMAP_KWMETHDECL(func, doc)					\
   extern PyObject *gmapmeth_##func(PyObject *, PyObject *, PyObject *);
+#define GMAP_NAMETHDECL(func, doc)					\
+  extern PyObject *gmapmeth_##func(PyObject *);
 
-#define GMAP_DOROMETHODS(METH, KWMETH)					\
+#define GMAP_DOROMETHODS(METH, KWMETH, NAMETH)				\
   METH	(has_key,	"D.has_key(KEY) -> BOOL")			\
-  METH	(keys,		"D.keys() -> LIST")				\
-  METH	(values,	"D.values() -> LIST")				\
-  METH	(items,		"D.items() -> LIST")				\
-  METH	(iterkeys,	"D.iterkeys() -> ITER")				\
-  METH	(itervalues,	"D.itervalues() -> ITER")			\
-  METH	(iteritems,	"D.iteritems() -> ITER")			\
+  NAMETH(keys,		"D.keys() -> LIST")				\
+  NAMETH(values,	"D.values() -> LIST")				\
+  NAMETH(items,		"D.items() -> LIST")				\
+  NAMETH(iterkeys,	"D.iterkeys() -> ITER")				\
+  NAMETH(itervalues,	"D.itervalues() -> ITER")			\
+  NAMETH(iteritems,	"D.iteritems() -> ITER")			\
   KWMETH(get,		"D.get(KEY, [default = None]) -> VALUE")
 
-#define GMAP_DOMETHODS(METH, KWMETH)					\
-  GMAP_DOROMETHODS(METH, KWMETH)					\
-  METH	(clear,		"D.clear()")					\
+#define GMAP_DOMETHODS(METH, KWMETH, NAMETH)				\
+  GMAP_DOROMETHODS(METH, KWMETH, NAMETH)				\
+  NAMETH(clear,		"D.clear()")					\
   KWMETH(setdefault,	"D.setdefault(K, [default = None]) -> VALUE")	\
   KWMETH(pop,		"D.pop(KEY, [default = <error>]) -> VALUE")	\
-  METH	(popitem,	"D.popitem() -> (KEY, VALUE)")			\
+  NAMETH(popitem,	"D.popitem() -> (KEY, VALUE)")			\
   METH	(update,	"D.update(MAP)")
 
-GMAP_DOMETHODS(GMAP_METHDECL, GMAP_KWMETHDECL)
-#define GMAP_ROMETHODS GMAP_DOROMETHODS(GMAP_METH, GMAP_KWMETH)
-#define GMAP_METHODS GMAP_DOMETHODS(GMAP_METH, GMAP_KWMETH)
+GMAP_DOMETHODS(GMAP_METHDECL, GMAP_KWMETHDECL, GMAP_NAMETHDECL)
+#define GMAP_ROMETHODS GMAP_DOROMETHODS(GMAP_METH, GMAP_KWMETH, GMAP_NAMETH)
+#define GMAP_METHODS GMAP_DOMETHODS(GMAP_METH, GMAP_KWMETH, GMAP_NAMETH)
 
 /* Mapping protocol implementation. */
 extern Py_ssize_t gmap_pysize(PyObject *); /* for `mp_length' */