r9979 - trunk/libraries/koala/sources/examples/buddha

Author: hannes
Date: Sun Sep 25 00:18:50 2005
New Revision: 9979

Modified:
   trunk/libraries/koala/sources/examples/buddha/web-macro.dylan
Log:
Bug: 7257
fix define class expansion. thanks, peter :)


Modified: trunk/libraries/koala/sources/examples/buddha/web-macro.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/web-macro.dylan       
(original)
+++ trunk/libraries/koala/sources/examples/buddha/web-macro.dylan       Sun Sep 
25 00:18:50 2005
@@ -1,22 +1,5 @@
 module: buddha
 
-define macro web-slots
-  { web-slots(?slots) }
-    => { ?slots }
-
-    slots:
-    { } => { }
-    { data ?slot-name:name :: ?slot-type:expression; ... }
-    => { slot ?slot-name :: ?slot-type, init-keyword: ?slot-name ## ":";
-         ... }
-    { has-many ?slot-name:name; ... }
-    => { slot ?slot-name ## "s" :: <list> = #(); ... }
-    { has-a ?slot-name:name; ... }
-    => { slot ?slot-name :: "<" ## ?slot-name ## ">",
-              init-keyword: ?slot-name ## ":";
-         ... }
-end;
-
 define macro web-lists
   { web-lists(?slots) } => { list(?slots) }
 
@@ -51,18 +34,28 @@
 end;
 
 define macro define-class
- { define-class(?:name, ?superclass:*, ?slots:macro) }
+ { define-class(?:name; ?superclass:*; (?slots:*)) }
     => { define class ?name (?superclass) ?slots end }
+
+    slots:
+    { } => { }
+    { ?slot:*; ... } => { ?slot ; ... }
+    
+    slot:
+    { data ?slot-name:name \:: ?slot-type:* }
+    => { slot ?slot-name :: ?slot-type, init-keyword: ?#"slot-name" }
+    { has-many ?slot-name:name }
+    => { slot ?slot-name ## "s" :: <list> = #() }
+    { has-a ?slot-name:name }
+    => { slot ?slot-name :: "<" ## ?slot-name ## ">",
+              init-keyword: ?#"slot-name" }
 end;
 
 define macro web-class-definer
   { define web-class ?:name (?superclass:*)
       ?class-slots:*
     end }
-    => { //define-class(?name, ?superclass, web-slots(?class-slots));
-         define class ?name (?superclass)
-           web-slots(?class-slots)
-         end;
+    => { define-class(?name; ?superclass; (?class-slots));
          define inline method list-reference-slots (object :: ?name)
           => (res :: <list>)
            web-lists(?class-slots)
@@ -78,17 +71,24 @@
 end;
 
 define web-class <foo> (<object>)
-  data foo :: <string>;
+  data namen :: <string>;
   has-many vlan;
   has-many network;
   has-many zone;
-  has-a fnord;
+  data foo :: <string>;
+  has-a config;
+  has-a host;
+  has-many subnet;
 end;
 
 let class = make(<foo>);
 format-out("list: %=\n", list-reference-slots(class));
 format-out("reference: %=\n", reference-slots(class));
 format-out("data: %=\n", data-slots(class));
+for (slot in class.object-class.slot-descriptors)
+  format-out("slot: %s\n", slot.slot-getter.debug-name)
+end;
+format-out("class %=\n", class);
 
 /*
 define web-class <config> (<object>)
-- 
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
https://gauss.gwydiondylan.org/mailman/listinfo/gd-chatter