X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/9ccbddd60efeafa8d5e5c6b02eb08c5bb3813d8a..8d1d7d3eb07fe738fe5458acee84ef84919638ce:/test/chimaera.sod

diff --git a/test/chimaera.sod b/test/chimaera.sod
index 63602d8..ca775bc 100644
--- a/test/chimaera.sod
+++ b/test/chimaera.sod
@@ -76,32 +76,32 @@ static void provoke_serpent(Serpent *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)
 {
   {
-    struct Lion__ilayout ll;
-    Lion *l = Lion__class->cls.init(&ll);
+    SOD_DECL(Lion, l);
     provoke_lion(l);
     tickle_animal(LION__CONV_NML(l));
   }
 
   {
-    struct Goat__ilayout gg;
-    Goat *g = Goat__class->cls.init(&gg);
+    SOD_DECL(Goat, g);
     provoke_goat(g);
     tickle_animal(GOAT__CONV_NML(g));
   }
 
   {
-    struct Serpent__ilayout ss;
-    Serpent *s = Serpent__class->cls.init(&ss);
+    SOD_DECL(Serpent, s);
     provoke_serpent(s);
     tickle_animal(SERPENT__CONV_NML(s));
   }
 
   {
-    struct Chimaera__ilayout cc;
-    Chimaera *c = Chimaera__class->cls.init(&cc);
+    SOD_DECL(Chimaera, c);
     provoke_lion(CHIMAERA__CONV_LION(c));
     provoke_goat(CHIMAERA__CONV_GOAT(c));
     provoke_serpent(CHIMAERA__CONV_SERPENT(c));