Mercurial > hg > xemacs-beta
view tests/glyph-test.el @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +0000 |
parents | 8a653fbe5c27 |
children | 308d34e9f07d |
line wrap: on
line source
;;; Copyright (C) 1998 Andy Piper ;;; This file is part of XEmacs. ;;; XEmacs is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 2, or (at your ;;; option) any later version. ;;; XEmacs is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;; General Public License for more details. ;;; You should have received a copy of the GNU General Public License ;;; along with XEmacs; see the file COPYING. If not, write to the Free ;;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;;; Boston, MA 02110-1301, USA. (set-extent-begin-glyph (make-extent (point) (point)) (setq im (make-glyph [xbm :file "xemacsicon.xbm"]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [string :data "xemacs"])) (defun foo () (interactive) (setq ok-select (not ok-select))) (defun fee () (interactive) (message "hello")) ;; button in a group (setq ok-select nil) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button1 [button :face widget :descriptor ["ok1" (setq ok-select t) :style radio :selected ok-select]]))) ;; button in a group (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button2 [button :descriptor ["ok2" (setq ok-select nil) :style radio :selected (not ok-select)]]))) ;; toggle button (set-extent-begin-glyph (make-extent (point) (point)) (setq tbutton (make-glyph [button :descriptor ["ok3" (setq ok-select nil) :style toggle :selected (not ok-select)]]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq toggle-button [button :descriptor ["ok4" :style toggle :callback (setq ok-select (not ok-select)) :selected ok-select]]))) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq push-button (make-glyph [button :width 10 :height 2 :face modeline-mousable :descriptor "ok" :callback foo :selected t]))) ;; tree view (set-extent-begin-glyph (make-extent (point) (point)) (setq tree (make-glyph [tree-view :width 10 :descriptor "My Tree" :items (["One" foo] (["Two" foo] ["Four" foo] "Six") "Three")]))) ;; tab control (set-extent-begin-glyph (make-extent (point) (point)) (setq tab (make-glyph [tab-control :descriptor "My Tab" :face highlight :orientation right :items (["One" foo :selected t] ["Two" fee :selected nil] ["Three" foo :selected nil])]))) ;; progress gauge (set-extent-begin-glyph (make-extent (point) (point)) (setq pgauge (make-glyph [progress-gauge :width 10 :height 2 :value 0 :descriptor "ok"]))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pgauge `[progress-gauge :width 10 :height 2 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (sit-for 0.1))) ;; progress gauge in the modeline (setq global-mode-string (cons (make-extent nil nil) (setq pg (make-glyph [progress-gauge :width 5 :pixel-height 16 :descriptor "ok"])))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pg `[progress-gauge :width 5 :pixel-height 16 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (redisplay-frame) (sit-for 0.1))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [button :face modeline-mousable :descriptor "ok" :callback foo :image [xpm :file "../etc/xemacs-icon.xpm"]])) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq pbutton (make-glyph [button :descriptor ["A Big Button" foo ]]))) ;; edit box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq edit-field [edit-field :pixel-width 50 :pixel-height 30 :face bold-italic :descriptor ["Hello"]]))) ;; combo box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq combo-box [combo-box :width 10 :descriptor ["Hello"] :items ("One" "Two" "Three")]))) ;; label (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq label [label :pixel-width 150 :descriptor "Hello"]))) ;; string (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq str [string :data "Hello There"]))) ;; scrollbar ;(set-extent-begin-glyph ; (make-extent (point) (point)) ; (make-glyph [scrollbar :width 50 :height 20 :descriptor ["Hello"]])) ;; generic subwindow (setq sw (make-glyph [subwindow :pixel-width 50 :pixel-height 70])) (set-extent-begin-glyph (make-extent (point) (point)) sw) ;; layout (setq layout (make-glyph `[layout :descriptor "The Layout" :orientation vertical :justify left :border [string :data "Hello There Mrs"] :items ([layout :orientation horizontal :items (,radio-button1 ,radio-button2)] ,edit-field ,toggle-button ,label ,str)])) ;(set-glyph-face layout 'gui-element) (set-extent-begin-glyph (make-extent (point) (point)) layout) ;; another test layout (set-extent-begin-glyph (make-extent (point) (point)) (setq layout-2 (make-glyph `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 0 :width 10 :height 2 :descriptor "ok"])]))) (set-glyph-image layout-2 `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 4 :width 10 :height 2 :descriptor "ok"])]) (setq test-toggle-widget nil) (defun test-toggle (widget) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (vector 'button :descriptor "ok" :style 'toggle :selected `(funcall test-toggle-value ,widget) :callback `(funcall test-toggle-action ,widget))))) (defun test-toggle-action (widget &optional event) (if widget (message "Widget is t") (message "Widget is nil"))) (defun test-toggle-value (widget) (setq widget (not widget)) (not widget))