extern "C" {
#endif
+/*----- Preliminary utilities ---------------------------------------------*/
+
+/* --- @SOD__HAVE_VARARGS_MACROS@ --- *
+ *
+ * Use: Defined if the compiler supports C99-style variadic macros.
+ *
+ * This is more complicated than just checking the value of
+ * @__STDC_VERSION__@ because GCC has traditionally claimed C89
+ * by default, but provides the functionality anyway unless it's
+ * been explicitly turned off.
+ */
+
+#if __STDC_VERSION__ >= 199901
+ /* The feature exists. All is well with the world. */
+
+# define SOD__HAVE_VARARGS_MACROS
+
+#elif __GNUC__ >= 3
+ /* We're using GCC, which is trying to deny it but we don't believe it.
+ * Unfortunately there's a fly in the ointment: if `-pedantic' -- or,
+ * worse, `-pedantic-errors' -- is set, then GCC will warn about these
+ * macros being defined, and there isn't a way to detect pedantry from the
+ * preprocessor.
+ *
+ * We must deploy bodges. There doesn't seem to be a good way to suppress
+ * particular warnings from the preprocessor: in particular, messing about
+ * with `pragma GCC diagnostic' doesn't help. So we're left with this
+ * hack: just declare all Sod-generated header files which try to do
+ * varargs macro things to be `system headers', which means that GCC's
+ * preprocessor will let them get away with all manner of nefarious stuff.
+ */
+
+# define SOD__HAVE_VARARGS_MACROS
+# define SOD__VARARGS_MACROS_PREAMBLE _Pragma("GCC system_header")
+
+#endif
+
+/* Make sure this gratuitous hack is understood, at least vacuously. */
+#ifndef SOD__VARARGS_MACROS_PREAMBLE
+# define SOD__VARARGS_MACROS_PREAMBLE
+#endif
+
+/* We're going to want to make use of this ourselves. */
+SOD__VARARGS_MACROS_PREAMBLE
+
+/* --- @SOD__CAR@ --- *
+ *
+ * Arguments: @...@ = a nonempty list of arguments
+ *
+ * Returns: The first argument only.
+ */
+
+#ifdef SOD__HAVE_VARARGS_MACROS
+# define SOD__CAR(...) SOD__CARx(__VA_LIST__, _)
+# define SOD__CARx(a, ...) a
+#endif
+
/*----- Header files ------------------------------------------------------*/
#include <stdarg.h>
#include <stddef.h>
+#include "keyword.h"
#include "sod-base.h"
/*----- Data structures ---------------------------------------------------*/
((struct cls##__ilayout *) \
((char *)(obj) - offsetof(struct cls##__ilayout, chead)))
-/* --- @SOD_CAR@ --- *
- *
- * Arguments: @...@ = a nonempty list of arguments
- *
- * Returns: The first argument only.
- */
-
-#if __STDC_VERSION__ >= 199901
-# define SOD_CAR(...) SOD__CARx(__VA_LIST__, _)
-# define SOD__CARx(a, ...) a
-#endif
-
/*----- Utility macros ----------------------------------------------------*/
/* --- @SOD_CLASSOF@ --- *
#define SOD_CONVERT(cls, obj) ((cls *)sod_convert(cls##__class, (obj)))
+/* --- @SOD_INIT@ --- *
+ *
+ * Arguments: @cls@ = a class type name
+ * @p@ = pointer to storage to initialize
+ * @keys@ = a @KWARGS(...)@ keyword argument sequence
+ *
+ * Use: Initializes raw storage as an instance of @cls@.
+ */
+
+#define SOD_INIT(cls, p, keys) ((cls *)sod_init(cls##__class, (p), keys))
+
/* --- @SOD_DECL@ --- *
*
- * Arguments: @cls_@ = a class type name
- * @var_@ = a variable name
+ * Arguments: @cls@ = a class type name
+ * @var@ = a variable name
+ * @keys@ = a @KWARGS(...)@ keyword argument sequence
*
- * Use: Declare @var_@ as a pointer to an initialized instance of
- * @cls_@ with automatic lifetime.
+ * Use: Declare @var@ as a pointer to an initialized instance of
+ * @cls@ with automatic lifetime.
*/
-#define SOD_DECL(cls_, var_) \
- struct cls_##__ilayout var_##__layout; \
- cls_ *var_ = cls_##__class->cls.init(&var_##__layout)
+#define SOD_DECL(cls, var, keys) \
+ struct cls##__ilayout var##__layout; \
+ cls *var = (cls *)sod_init(cls##__class, &var##__layout, keys)
/*----- Functions provided ------------------------------------------------*/
extern void *sod_convert(const SodClass */*cls*/, const void */*obj*/);
+/* --- @sod_init@, @sod_initv@ --- *
+ *
+ * Arguments: @const SodClass *cls@ = class object for new instance
+ * @void *p@ = pointer to storage for new instance
+ * @va_list ap, ...@ = initialization keyword arguments
+ *
+ * Returns: Pointer to the initialized instance.
+ *
+ * Use: Initializes an instance in pre-allocated storage, and returns
+ * a pointer to it.
+ *
+ * This function will imprint the storage, and then send an
+ * `initialize' message to the fresh instance containing the
+ * provided keyword arguments.
+ *
+ * It's usually convenient to use the macro @SOD_INIT@ rather
+ * than calling @sod_init@ directly.
+ */
+
+extern KWCALL void *sod_init(const SodClass */*cls*/, void */*p*/, ...);
+extern void *sod_initv(const SodClass */*cls*/, void */*p*/, va_list /*ap*/);
+
/*----- That's all, folks -------------------------------------------------*/
#ifdef __cplusplus