comparison lisp/cl-macs.el @ 872:79c6ff3eef26

[xemacs-hg @ 2002-06-20 21:18:01 by ben] font changes etc.; some 21.4 changes mule/mule-msw-init-late.el: Specify charset->windows-registry conversion. mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c. cl-macs.el: Document better. font-lock.el: Move Lisp function regexp to lisp-mode.el. lisp-mode.el: Various indentation fixes: Handle flet functions better. Handle argument lists in defuns and flets. Handle quoted lists, e.g. property lists -- don't indent like function calls. Distinguish between lambdas and other lists. lisp-mode.el: Handle this form. faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code: -- Fix lots of bogus code in msw-faces.el, msw-font-menu.el, font-menu.el that was "truenaming" font specs -- i.e. in the process of frobbing a particular field in a general user-specified font spec with wildcarded fields, sticking in particular values for all the remaining wildcarded fields. This bug was rampant everywhere except in x-faces.el (the oldest and only correctly written code). This also means that we need to work with font names at all times and not font instances, because a font instance is essentially a truenamed font. -- Total rewrite of extremely junky code in msw-faces.el. Work with names as well as font instances, and return names; stop truenaming when canonicalizing and frobbing; fix handling of the combined style field, i.e. weight/slant (also fixed in font.el). -- Totally rewrite the frobbing functions in faces.el. This time, we frob all the instantiators rather than just computing a single instance value and working backwards. That way, e.g., `bold' will work for all charsets that have bold available, rather than only for whatever charset was part of the computed font instance (another example of the truename virus). Also fix up code to look at the fallbacks (all of them) when no global value present, so we don't need to put something in the global value. Intelligently handle a request to frob a buffer locale, rather than signalling an error. When frobbing instantiators, try hard to figure out what device type is associated with them, and frob each according to its own proper device type. Correctly handle inheritance vectors given as instantiators. Preserve existing tags when putting back frobbed instantiators. Extract out general specifier-frobbing code into specifier.el. Document everything cleanly. Do lots of other things better, etc. -- Don't duplicatively set a global specification for the default font -- it's already in the fallback and we no longer need a default global specification present. Delete various code in x-faces.el and msw-faces.el that duplicated the lists of fonts in faces.c. -- init-global-faces was not being called at all under MS Windows! Major bogosity. That caused device-specific values to get stuck into all the fonts, making it very hard to change them -- setting global specs caused nothing to happen. -- Correct weight names in font.el. -- Lots more font fixups in objects*.c. Printer.el: Warning fix. specifier.el: Add more args to map-specifier. Add various "heuristic" specifier functions to aid in creation of specifier-munging code such as in faces.el. subr.el: New functions. lwlib.c: Fix warning. config.inc.samp: Clean up, add args to control fastcall (not yet supported! the changes needed are in another ws of mine), profile support, vc6 support, union-type. xemacs.dsp, xemacs.mak: Semi-major overhaul. Fix bug where dump-id was always getting recomputed, forcing a redump even when nothing changed. Add support for fastcall. Support edit-and-continue (on by default) with vc6. Use incremental linking when doing a debug compilation. Add support for profiling. Consolidate the various debug flags. Partial support for "batch-compiling" -- compiling many files on a single invocation of the compiler. Doesn't seem to help that much for me, so it's not finished or enabled by default. Remove HAVE_MSW_C_DIRED, we always do. Correct some sloppy use of directories. s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine HAVE_MMAP). s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32 variants (Cygwin, native, MinGW). Both of these are properly used in another ws. alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made: (1) Separation of various header files into an external and an internal version, similar to the existing separation of process.h and procimpl.h. Eventually this should be done for all Lisp objects. The external version has the same name as currently; the internal adds -impl. The external file has XFOO() macros for objects, but the structure is opaque and defined only in the internal file. It's now reasonable to move all prototypes in lisp.h into the appropriate external file, and this should be done. Currently, separation has been done on extents.h, objects*.h, console.h, device.h, frame.h, and window.h. For c/d/f/w, the most basic properties are available in the external header file, with the macros resolving to functions. In the internal header file, the macros are redefined to directly access the structure. Also, the global MARK_FOO_CHANGED macros have been made into functions so that they can be accessed without needing to include lots of -impl headers -- they are used in almost exclusively in non-time-critical functions, and take up enough time that the function overhead will be negligible. Similarly, the function overhead from making the basic properties mentioned above into functions is negligible, and code that does heavy accessing of c/d/f/w structures inevitably ends up needing the internal header files, anyway. (2) More face changes. -- Major rewrite of objects-msw.c. Now handles wildcard specs properly, rather than "truenaming" (or even worse, signalling an error, which previously happened with some of the fallbacks if you tried to use them in make-font-instance!). -- Split charset matching of fonts into two stages -- one to find a font specifically designed for a particular charset (by examining its registry), the second to find a Unicode font that can support the charset. This needs to proceed as two complete, separate instantiations in order to work properly (otherwise many of the fonts in the HELLO page look wrong). This should also make it easy to support iso10646 (Unicode) fonts under X. -- All default values for fonts are now completely specified in the fallbacks. Stuff from mule-x-init.el has all been moved here, merged with the existing specs, and totally rethought so you get sensible results. (HELLO now looks much better!). -- Generalize the "default X/GTK device" stuff into a per-device-type "default device". -- Add mswindows-{set-}charset-registry. In time, charset<->code-page conversion functions will be removed. -- Wrap protective code around calls to compute device specifier tags, and do this computation before calling the face initialization code because the latter may need these tags to be correctly updated. (3) Other changes. EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes. config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of #ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside! eval.c: Let detailed backtraces be detailed. specifier.c: Don't override user's print-string-length/print-length settings. glyphs.c: New function image-instance-instantiator. config.h.in, sysdep.c: Changes for fastcall. sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP NEEDS TO GO IN, TOO. search.c: Fix *evil* crash due to incorrect synching of syntax-cache code with 21.1. THIS SHOULD GO INTO 21.4.
author ben
date Thu, 20 Jun 2002 21:19:10 +0000
parents a5954632b187
children 37bdd24225ef
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
111 111
112 ;;;###autoload 112 ;;;###autoload
113 (defmacro defun* (name args &rest body) 113 (defmacro defun* (name args &rest body)
114 "(defun* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a function. 114 "(defun* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a function.
115 Like normal `defun', except ARGLIST allows full Common Lisp conventions, 115 Like normal `defun', except ARGLIST allows full Common Lisp conventions,
116 and BODY is implicitly surrounded by (block NAME ...)." 116 and BODY is implicitly surrounded by (block NAME ...).
117
118 \"Full Common Lisp conventions\" means that:
119
120 -- In addition to &optional and &rest, the lambda-list keywords &key,
121 &allow-other-keys, and &aux are allowed.
122
123 -- The format of the arguments to &optional is expanded: As well as simple
124 variables, they can be lists of the form (VAR [INITFORM [SVAR]]); when
125 no argument is available for VAR, INITFORM is evaluated (or nil, if
126 INITFORM is omitted) and stored as VAR's value, and SVAR is bound to t.
127 If an arguent is available for VAR, and INITFORM is unused, SVAR is
128 bound to nil.
129
130 -- &key specifies keyword arguments. The format of each argument is
131 VAR || ( { VAR || (KEYWORD VAR) } [INITFORM [SVAR]]) -- #### document me.
132
133 -- &allow-other-keys means that if other keyword arguments are given that are
134 not specifically list in the arg list, they are allowed, rather than an
135 error being signalled. They can be retrieved with an &rest form.
136
137 -- &aux specifies extra bindings, exactly like a `let*' enclosing the body.
138 The format of each binding is VAR || (VAR [INITFORM]) -- exactly like the
139 format of `let'/`let*' bindings.
140 "
117 (let* ((res (cl-transform-lambda (cons args body) name)) 141 (let* ((res (cl-transform-lambda (cons args body) name))
118 (form (list* 'defun name (cdr res)))) 142 (form (list* 'defun name (cdr res))))
119 (if (car res) (list 'progn (car res) form) form))) 143 (if (car res) (list 'progn (car res) form) form)))
120 144
121 ;;;###autoload 145 ;;;###autoload
122 (defmacro defmacro* (name args &rest body) 146 (defmacro defmacro* (name args &rest body)
123 "(defmacro* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a macro. 147 "(defmacro* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a macro.
124 Like normal `defmacro', except ARGLIST allows full Common Lisp conventions, 148 Like normal `defmacro', except ARGLIST allows full Common Lisp conventions,
125 and BODY is implicitly surrounded by (block NAME ...)." 149 and BODY is implicitly surrounded by (block NAME ...).
150
151 \"Full Common Lisp conventions\" means that:
152
153 -- The lambda-list keywords &optional, &rest, &key, &allow-other-keys, and
154 &aux are allowed, as in `defun*'.
155
156 -- Three additional lambda-list keywords are allowed: &body, &whole, and
157 &environment. #### Document me.
158
159 -- The macro arg list syntax allows for \"destructuring\" -- see also
160 `destructuring-bind', which destructures exactly like `defmacro*', and
161 `loop', which does a rather different way of destructuring. Anywhere
162 that a simple argument may appear, and (if following a lambda-list
163 keyword) a list may not normally appear, an embedded lambda list can be
164 substituted. (The format of the embedded lambda list is exactly the
165 same as for a top-level list except that &environment is not allowed.)
166 When matching this lambda list against a caller-specified argument, that
167 argument is treated as a list and normal lambda-list processing occurs,
168 just as if the entire operation were happening at top level.
169 Furthermore, any lambda list, embedded or top-level, can be dotted at its
170 end, and this will cause matching with an appropriate dotted list given
171 as an argument.
172
173 See `loop' for practical examples of destructuring, but
174 keep in mind that `loop' destructuring is somewhat different from macro
175 destructuring in that
176
177 (a) Macro destructuring has extra features in the various lambda-list
178 keywords, allowing for special processing of a list other than just
179 simple matching.
180 (b) Macro destructuring is strict, in that an error is signalled if the
181 actual structure does not match the expected structure. On the
182 other hand, loop destructuring is lax -- extra arguments in a list
183 are ignored, not enough arguments cause the remaining parameters to
184 receive a value of nil, etc.
185 "
126 (let* ((res (cl-transform-lambda (cons args body) name)) 186 (let* ((res (cl-transform-lambda (cons args body) name))
127 (form (list* 'defmacro name (cdr res)))) 187 (form (list* 'defmacro name (cdr res))))
128 (if (car res) (list 'progn (car res) form) form))) 188 (if (car res) (list 'progn (car res) form) form)))
129 189
130 ;;;###autoload 190 ;;;###autoload
368 (setq res (nconc res (cl-arglist-args arg)))))) 428 (setq res (nconc res (cl-arglist-args arg))))))
369 (nconc res (and args (list args)))))) 429 (nconc res (and args (list args))))))
370 430
371 ;;;###autoload 431 ;;;###autoload
372 (defmacro destructuring-bind (args expr &rest body) 432 (defmacro destructuring-bind (args expr &rest body)
433 "Bind the arguments in ARGS to EXPR then eval BODY.
434 This is similar to `let' but it does \"destructuring\", in that it matches
435 the structure of ARGS to the structure of EXPR and binds corresponding
436 arguments in ARGS to their values in EXPR. The format of ARGS, and the
437 way the destructuring works, is exactly like the destructuring that occurs
438 in `defmacro*'; see that for more information.
439
440 An alternative means of destructuring is using the `loop' macro. `loop'
441 gives practical examples of destructuring. `defmacro*' describes the
442 differences between loop and macro-style destructuring.
443
444 You can rewrite a call to (destructuring-bind ARGS EXPR &rest BODY) using
445 `loop', approximately like this:
446
447 (loop for ARGS = EXPR
448 return (progn BODY))
449
450 I say \"approximately\" because the destructuring works in a somewhat
451 different fashion, although for most reasonably simple constructs the
452 results will be the same."
373 (let* ((bind-lets nil) (bind-forms nil) (bind-inits nil) 453 (let* ((bind-lets nil) (bind-forms nil) (bind-inits nil)
374 (bind-defs nil) (bind-block 'cl-none)) 454 (bind-defs nil) (bind-block 'cl-none))
375 (cl-do-arglist (or args '(&aux)) expr) 455 (cl-do-arglist (or args '(&aux)) expr)
376 (append '(progn) bind-inits 456 (append '(progn) bind-inits
377 (list (nconc (list 'let* (nreverse bind-lets)) 457 (list (nconc (list 'let* (nreverse bind-lets))