Mercurial > hg > xemacs-beta
annotate src/widget.c @ 5327:d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
src/ChangeLog addition:
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
Move the heavy lifting from cl-seq.el to C, finally making those
functions first-class XEmacs citizens, with circularity checking,
built-in support for tests other than #'eql, and as much
compatibility with current Common Lisp as Paul Dietz' tests require.
* fns.c (check_eq_nokey, check_eq_key, check_eql_nokey)
(check_eql_key, check_equal_nokey, check_equal_key)
(check_equalp_nokey, check_equalp_key, check_string_match_nokey)
(check_string_match_key, check_other_nokey, check_other_key)
(check_if_nokey, check_if_key, check_match_eq_key)
(check_match_eql_key, check_match_equal_key)
(check_match_equalp_key, check_match_other_key): New. These are
basically to provide function pointers to be used by Lisp
functions that take TEST, TEST-NOT and KEY arguments.
(get_check_match_function_1, get_check_test_function)
(get_check_match_function): These functions work out which of the
previous list of functions to use, given the keywords supplied by
the user.
(count_with_tail): New. This is the bones of #'count.
(list_count_from_end, string_count_from_end): Utility functions
for #'count.
(Fcount): New, moved from cl-seq.el.
(list_position_cons_before): New. The implementation of #'member*,
and important in implementing various other functions.
(FmemberX, Fadjoin, FassocX, FrassocX, Fposition, Ffind)
(FdeleteX, FremoveX, Fdelete_duplicates, Fremove_duplicates)
(Fnsubstitute, Fsubstitute, Fsublis, Fnsublis, Fsubst, Fnsubst)
(Ftree_equal, Fmismatch, Fsearch, Fintersection, Fnintersection)
(Fsubsetp, Fset_difference, Fnset_difference, Fnunion, Funion)
(Fset_exclusive_or, Fnset_exclusive_or): New, moved here from
cl-seq.el.
(position): New. The implementation of #'find and #'position.
(list_delete_duplicates_from_end, subst, sublis, nsublis)
(tree_equal, mismatch_from_end, mismatch_list_list)
(mismatch_list_string, mismatch_list_array)
(mismatch_string_array, mismatch_string_string)
(mismatch_array_array, get_mismatch_func): Helper C functions for
the Lisp-visible functions.
(venn, nvenn): New. The implementation of the main Lisp functions that
treat lists as sets.
lisp/ChangeLog addition:
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 30 Dec 2010 01:59:52 +0000 |
| parents | 80cd90837ac5 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Primitives for work of the "widget" library. |
| 2 Copyright (C) 1997 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* In an ideal world, this file would not have been necessary. | |
| 24 However, elisp function calls being as slow as they are, it turns | |
| 25 out that some functions in the widget library (wid-edit.el) are the | |
| 26 bottleneck of Widget operation. Here is their translation to C, | |
| 27 for the sole reason of efficiency. */ | |
| 28 | |
| 29 #include <config.h> | |
| 30 #include "lisp.h" | |
| 31 #include "buffer.h" | |
| 32 | |
| 33 | |
| 34 Lisp_Object Qwidget_type; | |
| 35 | |
| 36 | |
| 37 DEFUN ("widget-plist-member", Fwidget_plist_member, 2, 2, 0, /* | |
| 38 Like `plist-get', but returns the tail of PLIST whose car is PROP. | |
| 39 */ | |
| 40 (plist, prop)) | |
| 41 { | |
| 42 while (!NILP (plist) && !EQ (Fcar (plist), prop)) | |
| 43 { | |
| 44 /* Check for QUIT, so a circular plist doesn't lock up the | |
| 45 editor. */ | |
| 46 QUIT; | |
| 47 plist = Fcdr (Fcdr (plist)); | |
| 48 } | |
| 49 return plist; | |
| 50 } | |
| 51 | |
| 52 DEFUN ("widget-put", Fwidget_put, 3, 3, 0, /* | |
| 53 In WIDGET set PROPERTY to VALUE. | |
| 54 The value can later be retrieved with `widget-get'. | |
| 55 */ | |
| 56 (widget, property, value)) | |
| 57 { | |
| 58 CHECK_CONS (widget); | |
| 59 XCDR (widget) = Fplist_put (XCDR (widget), property, value); | |
| 60 return widget; | |
| 61 } | |
| 62 | |
| 63 DEFUN ("widget-get", Fwidget_get, 2, 2, 0, /* | |
| 64 In WIDGET, get the value of PROPERTY. | |
| 65 The value could either be specified when the widget was created, or | |
| 66 later with `widget-put'. | |
| 67 */ | |
| 68 (widget, property)) | |
| 69 { | |
| 70 Lisp_Object value = Qnil; | |
| 71 | |
| 72 while (1) | |
| 73 { | |
| 74 Lisp_Object tmp = Fwidget_plist_member (Fcdr (widget), property); | |
| 75 if (!NILP (tmp)) | |
| 76 { | |
| 77 value = Fcar (Fcdr (tmp)); | |
| 78 break; | |
| 79 } | |
| 80 tmp = Fcar (widget); | |
| 81 if (!NILP (tmp)) | |
| 82 { | |
| 83 widget = Fget (tmp, Qwidget_type, Qnil); | |
| 84 continue; | |
| 85 } | |
| 86 break; | |
| 87 } | |
| 88 return value; | |
| 89 } | |
| 90 | |
| 91 DEFUN ("widget-apply", Fwidget_apply, 2, MANY, 0, /* | |
| 92 Apply the value of WIDGET's PROPERTY to the widget itself. | |
| 93 ARGS are passed as extra arguments to the function. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
94 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
95 arguments: (WIDGET PROPERTY &rest ARGS) |
| 428 | 96 */ |
| 97 (int nargs, Lisp_Object *args)) | |
| 98 { | |
| 99 /* This function can GC */ | |
| 100 Lisp_Object newargs[3]; | |
| 101 struct gcpro gcpro1; | |
| 102 | |
| 103 newargs[0] = Fwidget_get (args[0], args[1]); | |
| 104 newargs[1] = args[0]; | |
| 105 newargs[2] = Flist (nargs - 2, args + 2); | |
| 434 | 106 GCPRO1 (newargs[2]); |
| 428 | 107 RETURN_UNGCPRO (Fapply (3, newargs)); |
| 108 } | |
| 109 | |
| 110 void | |
| 111 syms_of_widget (void) | |
| 112 { | |
| 563 | 113 DEFSYMBOL (Qwidget_type); |
| 428 | 114 |
| 115 DEFSUBR (Fwidget_plist_member); | |
| 116 DEFSUBR (Fwidget_put); | |
| 117 DEFSUBR (Fwidget_get); | |
| 118 DEFSUBR (Fwidget_apply); | |
| 119 } |