lib/sod.h, test/chimaera.sod: Promote `SOD_DECL' to the library header.

It seems generally useful.

diff --git a/lib/sod.h b/lib/sod.h
index 594e3433851f096a49f2929221481cc9480d0a36..919b92743874fc016b925014e15aa069a19076d3 100644 (file)
--- a/lib/sod.h
+++ b/lib/sod.h
@@ -168,6 +168,19 @@ struct sod_chain {
 
 #define SOD_CONVERT(cls, obj) ((cls *)sod_convert(cls##__class, (obj)))
 
 
 #define SOD_CONVERT(cls, obj) ((cls *)sod_convert(cls##__class, (obj)))
 

+/* --- @SOD_DECL@ --- *
+ *
+ * Arguments:  @cls_@ = a class type name
+ *             @var_@ = a variable name
+ *
+ * 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)
+

 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @sod_subclassp@ --- *
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @sod_subclassp@ --- *

diff --git a/test/chimaera.sod b/test/chimaera.sod
index d748bb518e1cd63a96aeb200b3379944071e1ff3..cc72a47aa23d613d9dd8fd7908f040ac15ee8fdc 100644 (file)
--- a/test/chimaera.sod
+++ b/test/chimaera.sod
@@ -77,10 +77,6 @@ static void provoke_serpent(Serpent *s)
   s->_vt->serpent.bite(s);
 }
 
   s->_vt->serpent.bite(s);
 }
 

-#define SOD_DECL(cls_, var_)                                           \
-  struct cls_##__ilayout var_##__layout;                               \
-  cls_ *var_ = cls_##__class->cls.init(&var_##__layout)
-

 int main(void)
 {
   {
 int main(void)
 {
   {