comparison src/data.c @ 5448:89331fa1c819

Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Thu, 06 Jan 2011 00:35:22 +0100
parents 8d29f1c4bb98 47298dcf2e8f
children ac37a5f7e5be
comparison
equal deleted inserted replaced
5447:4b08f375e2fb 5448:89331fa1c819
2608 return Qnil; /* nichts ist gemarkt */ 2608 return Qnil; /* nichts ist gemarkt */
2609 } 2609 }
2610 2610
2611 static void 2611 static void
2612 print_weak_list (Lisp_Object obj, Lisp_Object printcharfun, 2612 print_weak_list (Lisp_Object obj, Lisp_Object printcharfun,
2613 int UNUSED (escapeflag)) 2613 int escapeflag)
2614 { 2614 {
2615 if (print_readably) 2615 if (print_readably)
2616 printing_unreadable_lisp_object (obj, 0); 2616 {
2617 2617 printing_unreadable_lisp_object (obj, 0);
2618 write_fmt_string_lisp (printcharfun, "#<weak-list %s %S>", 2, 2618 }
2619 encode_weak_list_type (XWEAK_LIST (obj)->type), 2619
2620 XWEAK_LIST (obj)->list); 2620 write_ascstring (printcharfun, "#<weak-list :type ");
2621 print_internal (encode_weak_list_type (XWEAK_LIST (obj)->type),
2622 printcharfun, escapeflag);
2623 write_ascstring (printcharfun, " :list ");
2624 print_internal (XWEAK_LIST (obj)->list, printcharfun, escapeflag);
2625 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj));
2621 } 2626 }
2622 2627
2623 static int 2628 static int
2624 weak_list_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) 2629 weak_list_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase)
2625 { 2630 {
3083 { 3088 {
3084 return Qnil; 3089 return Qnil;
3085 } 3090 }
3086 3091
3087 static void 3092 static void
3088 print_weak_box (Lisp_Object obj, Lisp_Object printcharfun, 3093 print_weak_box (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
3089 int UNUSED (escapeflag))
3090 { 3094 {
3091 if (print_readably) 3095 if (print_readably)
3092 printing_unreadable_lisp_object (obj, 0); 3096 {
3093 write_fmt_string (printcharfun, "#<weak-box>"); /* #### fix */ 3097 printing_unreadable_lisp_object (obj, 0);
3098 }
3099
3100 write_ascstring (printcharfun, "#<weak-box ");
3101 print_internal (XWEAK_BOX (obj)->value, printcharfun, escapeflag);
3102 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj));
3094 } 3103 }
3095 3104
3096 static int 3105 static int
3097 weak_box_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) 3106 weak_box_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase)
3098 { 3107 {
3305 { 3314 {
3306 return Qnil; 3315 return Qnil;
3307 } 3316 }
3308 3317
3309 static void 3318 static void
3310 print_ephemeron (Lisp_Object obj, Lisp_Object printcharfun, 3319 print_ephemeron (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
3311 int UNUSED (escapeflag))
3312 { 3320 {
3313 if (print_readably) 3321 if (print_readably)
3314 printing_unreadable_lisp_object (obj, 0); 3322 {
3315 write_fmt_string (printcharfun, "#<ephemeron>"); /* #### fix */ 3323 printing_unreadable_lisp_object (obj, 0);
3324 }
3325
3326 write_ascstring (printcharfun, "#<ephemeron :key ");
3327 print_internal (XEPHEMERON (obj)->key, printcharfun, escapeflag);
3328 write_ascstring (printcharfun, " :value ");
3329 print_internal (XEPHEMERON (obj)->value, printcharfun, escapeflag);
3330 write_ascstring (printcharfun, " :finalizer ");
3331 print_internal (XEPHEMERON_FINALIZER (obj), printcharfun, escapeflag);
3332 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj));
3316 } 3333 }
3317 3334
3318 static int 3335 static int
3319 ephemeron_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) 3336 ephemeron_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase)
3320 { 3337 {