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

diff --git a/test/chimaera.sod b/test/chimaera.sod
index 63602d8..b30248c 100644
--- a/test/chimaera.sod
+++ b/test/chimaera.sod
@@ -3,49 +3,52 @@
  * A simple SOD module for testing.
  */
 
-code c : includes {
+code c: includes {
 #include <stdio.h>
 #include "chimaera.h"
 }
 
-code h : includes {
+code h: includes {
 #include "sod.h"
 }
 
 [nick = nml, link = SodObject]
-class Animal : SodObject {
+class Animal: SodObject {
   int tickles = 0;
 
-  void tickle(void) { }
-
-  [role = before]
-  void nml.tickle(void) { me->nml.tickles++; }
+  [combination = progn] void tickle();
+  [role = before] void nml.tickle() { me->nml.tickles++; }
 }
 
-class Lion : Animal {
-  void bite(void) { puts("Munch!"); }
-  void nml.tickle(void) { me->_vt->lion.bite(me); }
+class Lion: Animal {
+  void bite() { puts("Munch!"); }
+  void nml.tickle() { Lion_bite(me); }
 }
 
-class Goat : Animal {
-  void butt(void) { puts("Bonk!"); }
-  void nml.tickle(void) { me->_vt->goat.butt(me); }
+class Goat: Animal {
+  void butt() { puts("Bonk!"); }
+  void nml.tickle() { Goat_butt(me); }
 }
 
-class Serpent : Animal {
-  void hiss(void) { puts("Sssss!"); }
-  void bite(void) { puts("Nom!"); }
-  void nml.tickle(void) {
-    if (SERPENT__CONV_NML(me)->nml.tickles > 2) me->_vt->serpent.bite(me);
-    else me->_vt->serpent.hiss(me);
+class Serpent: Animal {
+  int limit = 2;
+
+  void hiss() { puts("Sssss!"); }
+  void bite() { puts("Nom!"); }
+  void nml.tickle() {
+    if (SERPENT__CONV_NML(me)->nml.tickles <= me->serpent.limit)
+      Serpent_hiss(me);
+    else
+      Serpent_bite(me);
   }
 }
 
 [nick = sir, link = Animal]
-class Chimaera : Lion, Goat, Serpent {
+class Chimaera: Lion, Goat, Serpent {
+  serpent.limit = 1;
 }
 
-code c : user [classes end, user, epilogue] {
+code c: user {
 /*----- Main driver code --------------------------------------------------*/
 
 static void tickle_animal(Animal *a)
@@ -54,54 +57,50 @@ static void tickle_animal(Animal *a)
 
   for (i = 0; i < 3; i++) {
     printf("tickle %s #%d...\n", a->_vt->_class->cls.name, i);
-    a->_vt->nml.tickle(a);
+    Animal_tickle(a);
   }
 }
 
 static void provoke_lion(Lion *l)
 {
   printf("provoking %s as a lion\n", l->_vt->_class->cls.name);
-  l->_vt->lion.bite(l);
+  Lion_bite(l);
 }
 
 static void provoke_goat(Goat *g)
 {
   printf("provoking %s as a goat\n", g->_vt->_class->cls.name);
-  g->_vt->goat.butt(g);
+  Goat_butt(g);
 }
 
 static void provoke_serpent(Serpent *s)
 {
   printf("provoking %s as a serpent\n", s->_vt->_class->cls.name);
-  s->_vt->serpent.bite(s);
+  Serpent_bite(s);
 }
 
 int main(void)
 {
   {
-    struct Lion__ilayout ll;
-    Lion *l = Lion__class->cls.init(&ll);
+    SOD_DECL(Lion, l, NO_KWARGS);
     provoke_lion(l);
     tickle_animal(LION__CONV_NML(l));
   }
 
   {
-    struct Goat__ilayout gg;
-    Goat *g = Goat__class->cls.init(&gg);
+    SOD_DECL(Goat, g, NO_KWARGS);
     provoke_goat(g);
     tickle_animal(GOAT__CONV_NML(g));
   }
 
   {
-    struct Serpent__ilayout ss;
-    Serpent *s = Serpent__class->cls.init(&ss);
+    SOD_DECL(Serpent, s, NO_KWARGS);
     provoke_serpent(s);
     tickle_animal(SERPENT__CONV_NML(s));
   }
 
   {
-    struct Chimaera__ilayout cc;
-    Chimaera *c = Chimaera__class->cls.init(&cc);
+    SOD_DECL(Chimaera, c, NO_KWARGS);
     provoke_lion(CHIMAERA__CONV_LION(c));
     provoke_goat(CHIMAERA__CONV_GOAT(c));
     provoke_serpent(CHIMAERA__CONV_SERPENT(c));