comparison src/tooltalk.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5
author cvs
date Mon, 13 Aug 2007 11:07:10 +0200
parents cc15677e0335
children 74fd4e045ea6
comparison
equal deleted inserted replaced
379:76b7d63099ad 380:8626e4521993
151 }; 151 };
152 152
153 static Lisp_Object 153 static Lisp_Object
154 mark_tooltalk_message (Lisp_Object obj, void (*markobj) (Lisp_Object)) 154 mark_tooltalk_message (Lisp_Object obj, void (*markobj) (Lisp_Object))
155 { 155 {
156 (markobj) (XTOOLTALK_MESSAGE (obj)->callback); 156 markobj (XTOOLTALK_MESSAGE (obj)->callback);
157 return XTOOLTALK_MESSAGE (obj)->plist_sym; 157 return XTOOLTALK_MESSAGE (obj)->plist_sym;
158 } 158 }
159 159
160 static void 160 static void
161 print_tooltalk_message (Lisp_Object obj, Lisp_Object printcharfun, 161 print_tooltalk_message (Lisp_Object obj, Lisp_Object printcharfun,
167 167
168 if (print_readably) 168 if (print_readably)
169 error ("printing unreadable object #<tooltalk_message 0x%x>", 169 error ("printing unreadable object #<tooltalk_message 0x%x>",
170 p->header.uid); 170 p->header.uid);
171 171
172 sprintf (buf, "#<tooltalk_message id:%p 0x%x>", p->m, p->header.uid); 172 sprintf (buf, "#<tooltalk_message id:0x%lx 0x%x>", (long) (p->m), p->header.uid);
173 write_c_string (buf, printcharfun); 173 write_c_string (buf, printcharfun);
174 } 174 }
175 175
176 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message, 176 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message,
177 mark_tooltalk_message, print_tooltalk_message, 177 mark_tooltalk_message, print_tooltalk_message,
225 }; 225 };
226 226
227 static Lisp_Object 227 static Lisp_Object
228 mark_tooltalk_pattern (Lisp_Object obj, void (*markobj) (Lisp_Object)) 228 mark_tooltalk_pattern (Lisp_Object obj, void (*markobj) (Lisp_Object))
229 { 229 {
230 (markobj) (XTOOLTALK_PATTERN (obj)->callback); 230 markobj (XTOOLTALK_PATTERN (obj)->callback);
231 return XTOOLTALK_PATTERN (obj)->plist_sym; 231 return XTOOLTALK_PATTERN (obj)->plist_sym;
232 } 232 }
233 233
234 static void 234 static void
235 print_tooltalk_pattern (Lisp_Object obj, Lisp_Object printcharfun, 235 print_tooltalk_pattern (Lisp_Object obj, Lisp_Object printcharfun,
241 241
242 if (print_readably) 242 if (print_readably)
243 error ("printing unreadable object #<tooltalk_pattern 0x%x>", 243 error ("printing unreadable object #<tooltalk_pattern 0x%x>",
244 p->header.uid); 244 p->header.uid);
245 245
246 sprintf (buf, "#<tooltalk_pattern id:%p 0x%x>", p->p, p->header.uid); 246 sprintf (buf, "#<tooltalk_pattern id:0x%lx 0x%x>", (long) (p->p), p->header.uid);
247 write_c_string (buf, printcharfun); 247 write_c_string (buf, printcharfun);
248 } 248 }
249 249
250 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern, 250 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern,
251 mark_tooltalk_pattern, print_tooltalk_pattern, 251 mark_tooltalk_pattern, print_tooltalk_pattern,
671 else if (EQ (attribute, Qtt_plist)) 671 else if (EQ (attribute, Qtt_plist))
672 return Fcopy_sequence (Fsymbol_plist 672 return Fcopy_sequence (Fsymbol_plist
673 (XTOOLTALK_MESSAGE (message_)->plist_sym)); 673 (XTOOLTALK_MESSAGE (message_)->plist_sym));
674 674
675 else 675 else
676 signal_simple_error ("invalid value for `get-tooltalk-message-attribute'", 676 signal_simple_error ("Invalid value for `get-tooltalk-message-attribute'",
677 attribute); 677 attribute);
678 678
679 return Qnil; 679 return Qnil;
680 } 680 }
681 681
832 else if (EQ (attribute, Qtt_prop)) 832 else if (EQ (attribute, Qtt_prop))
833 { 833 {
834 return Fput (XTOOLTALK_MESSAGE (message_)->plist_sym, argn, value); 834 return Fput (XTOOLTALK_MESSAGE (message_)->plist_sym, argn, value);
835 } 835 }
836 else 836 else
837 signal_simple_error ("invalid value for `set-tooltalk-message-attribute'", 837 signal_simple_error ("Invalid value for `set-tooltalk-message-attribute'",
838 attribute); 838 attribute);
839 return Qnil; 839 return Qnil;
840 } 840 }
841 841
842 DEFUN ("return-tooltalk-message", Freturn_tooltalk_message, 1, 2, 0, /* 842 DEFUN ("return-tooltalk-message", Freturn_tooltalk_message, 1, 2, 0, /*
1472 1472
1473 #undef MAKE_CONSTANT 1473 #undef MAKE_CONSTANT
1474 1474
1475 staticpro (&Vtooltalk_message_gcpro); 1475 staticpro (&Vtooltalk_message_gcpro);
1476 staticpro (&Vtooltalk_pattern_gcpro); 1476 staticpro (&Vtooltalk_pattern_gcpro);
1477 Vtooltalk_message_gcpro = make_lisp_hashtable (10, HASHTABLE_NONWEAK, 1477 Vtooltalk_message_gcpro =
1478 HASHTABLE_EQ); 1478 make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
1479 Vtooltalk_pattern_gcpro = make_lisp_hashtable (10, HASHTABLE_NONWEAK, 1479 Vtooltalk_pattern_gcpro =
1480 HASHTABLE_EQ); 1480 make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
1481 } 1481 }