src/class-*.lisp: Improve metaclass selection.

[sod] / test / chimaera.sod

diff --git a/test/chimaera.sod b/test/chimaera.sod
index 5b55e93e40592227b7b079958bee42d3c216bb2e..976c727e578e25c5e440bbbfd3e9f608f053ef64 100644 (file)
--- a/test/chimaera.sod
+++ b/test/chimaera.sod
@@ -16,11 +16,8 @@ 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 {
@@ -34,19 +31,24 @@ class Goat : Animal {
 }
 
 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) Serpent_bite(me);
-    else 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)
@@ -80,25 +82,25 @@ static void provoke_serpent(Serpent *s)
 int main(void)
 {
   {
-    SOD_DECL(Lion, l);
+    SOD_DECL(Lion, l, NO_KWARGS);
     provoke_lion(l);
     tickle_animal(LION__CONV_NML(l));
   }
 
   {
-    SOD_DECL(Goat, g);
+    SOD_DECL(Goat, g, NO_KWARGS);
     provoke_goat(g);
     tickle_animal(GOAT__CONV_NML(g));
   }
 
   {
-    SOD_DECL(Serpent, s);
+    SOD_DECL(Serpent, s, NO_KWARGS);
     provoke_serpent(s);
     tickle_animal(SERPENT__CONV_NML(s));
   }
 
   {
-    SOD_DECL(Chimaera, c);
+    SOD_DECL(Chimaera, c, NO_KWARGS);
     provoke_lion(CHIMAERA__CONV_LION(c));
     provoke_goat(CHIMAERA__CONV_GOAT(c));
     provoke_serpent(CHIMAERA__CONV_SERPENT(c));