Merge branches 'mdw/kwargs-fixes' and 'mdw/c11-fixes'

[sod] / test / chimaera.sod

diff --git a/test/chimaera.sod b/test/chimaera.sod
index cc72a47aa23d613d9dd8fd7908f040ac15ee8fdc..0723ae1e508e49aa273c18772f1a0f229000ac5f 100644 (file)
--- a/test/chimaera.sod
+++ b/test/chimaera.sod
@@ -16,37 +16,39 @@ code h : includes {
 class Animal : SodObject {
   int tickles = 0;
 
-  [combination = progn]
-  void tickle();
-
-  [role = before]
-  void nml.tickle() { me->nml.tickles++; }
+  [combination = progn] void tickle();
+  [role = before] void nml.tickle() { me->nml.tickles++; }
 }
 
 class Lion : Animal {
   void bite() { puts("Munch!"); }
-  void nml.tickle() { me->_vt->lion.bite(me); }
+  void nml.tickle() { Lion_bite(me); }
 }
 
 class Goat : Animal {
   void butt() { puts("Bonk!"); }
-  void nml.tickle() { me->_vt->goat.butt(me); }
+  void nml.tickle() { Goat_butt(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 > 2) me->_vt->serpent.bite(me);
-    else me->_vt->serpent.hiss(me);
+    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 {
+  serpent.limit = 1;
 }
 
-code c : user [classes end, user, epilogue] {
+code c : user {
 /*----- Main driver code --------------------------------------------------*/
 
 static void tickle_animal(Animal *a)
@@ -55,26 +57,26 @@ 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)