Mercurial > hg > xemacs-beta
annotate src/compiler.h @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
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.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | d4f666cda5e6 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 1743 | 1 /* Compiler-specific definitions for XEmacs. |
| 2 Copyright (C) 1998-1999, 2003 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1994 Richard Mlynarik. | |
| 5046 | 4 Copyright (C) 1995, 1996, 2000-2004, 2010 Ben Wing. |
| 1743 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: not in FSF. */ | |
| 24 | |
| 25 /* Authorship: | |
| 26 | |
| 27 NOT_REACHED, DOESNT_RETURN, PRINTF_ARGS by Richard Mlynarik, c. 1994. | |
| 28 RETURN_SANS_WARNING by Martin buchholz, 1998 or 1999. | |
| 29 Many changes and improvements by Jerry James, 2003. | |
| 30 Split out of lisp.h, reorganized, and modernized. | |
| 31 {BEGIN,END}_C_DECLS, NEED_GCC, GCC_VERSION | |
| 2286 | 32 ATTRIBUTE_MALLOC, ATTRIBUTE_CONST, ATTRIBUTE_PURE, UNUSED |
| 1743 | 33 */ |
| 34 | |
| 35 #ifndef INCLUDED_compiler_h | |
| 36 #define INCLUDED_compiler_h | |
| 37 | |
| 38 /* Define min() and max(). (Some compilers put them in strange places that | |
| 3025 | 39 won't be referenced by include files used by XEmacs, such as `macros.h' |
| 1743 | 40 under Solaris.) */ |
| 41 | |
| 42 #ifndef min | |
| 1748 | 43 # define min(a,b) (((a) <= (b)) ? (a) : (b)) |
| 1743 | 44 #endif |
| 45 #ifndef max | |
| 1748 | 46 # define max(a,b) (((a) > (b)) ? (a) : (b)) |
| 1743 | 47 #endif |
| 48 | |
| 49 /* Regular C complains about possible clobbering of local vars NOT declared | |
| 50 as volatile if there's a longjmp() in a function. C++ complains if such | |
| 51 vars ARE volatile; or more correctly, sans volatile no problem even when | |
| 52 you longjmp, avec volatile you get unfixable compile errors like | |
| 53 | |
| 54 /src/xemacs/lilfix/src/process-unix.c: In function `void | |
| 55 unix_send_process(Lisp_Object, lstream*)': | |
| 56 /src/xemacs/lilfix/src/process-unix.c:1577: no matching function for call to ` | |
| 57 Lisp_Object::Lisp_Object(volatile Lisp_Object&)' | |
| 58 /src/xemacs/lilfix/src/lisp-union.h:32: candidates are: | |
| 59 Lisp_Object::Lisp_Object(const Lisp_Object&) | |
| 60 */ | |
| 61 | |
| 62 #ifdef __cplusplus | |
| 1748 | 63 # define VOLATILE_IF_NOT_CPP |
| 1743 | 64 #else |
| 1748 | 65 # define VOLATILE_IF_NOT_CPP volatile |
| 1743 | 66 #endif |
| 67 | |
| 68 /* Avoid indentation problems when XEmacs sees the curly braces */ | |
| 69 #ifndef BEGIN_C_DECLS | |
| 70 # ifdef __cplusplus | |
| 71 # define BEGIN_C_DECLS extern "C" { | |
| 72 # define END_C_DECLS } | |
| 73 # else | |
| 74 # define BEGIN_C_DECLS | |
| 75 # define END_C_DECLS | |
| 76 # endif | |
| 77 #endif | |
| 78 | |
| 1748 | 79 /* Guard against older gccs that did not define all of these symbols */ |
| 80 #ifdef __GNUC__ | |
| 81 # ifndef __GNUC_MINOR__ | |
| 82 # define __GNUC_MINOR__ 0 | |
| 83 # endif | |
| 84 # ifndef __GNUC_PATCHLEVEL__ | |
| 85 # define __GNUC_PATCHLEVEL__ 0 | |
| 86 # endif | |
| 87 #endif /* __GNUC__ */ | |
| 1743 | 88 |
| 1748 | 89 /* Simplify testing for specific GCC versions. For non-GNU compilers, |
| 90 GCC_VERSION evaluates to zero. */ | |
| 1743 | 91 #ifndef NEED_GCC |
| 1748 | 92 # define NEED_GCC(major,minor,patch) (major * 1000000 + minor * 1000 + patch) |
| 1743 | 93 #endif /* NEED_GCC */ |
| 94 #ifndef GCC_VERSION | |
| 1748 | 95 # ifdef __GNUC__ |
| 96 # define GCC_VERSION NEED_GCC (__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) | |
| 97 # else | |
| 98 # define GCC_VERSION 0 | |
| 99 # endif /* __GNUC__ */ | |
| 1743 | 100 #endif /* GCC_VERSION */ |
| 101 | |
| 2500 | 102 #ifdef _MSC_VER |
| 103 #define MSC_VERSION _MSC_VER | |
| 104 #else | |
| 105 #define MSC_VERSION 0 | |
| 106 #endif | |
| 107 | |
| 1743 | 108 /* GCC < 2.6.0 could only declare one attribute per function. In that case, |
| 109 we define DOESNT_RETURN in preference to PRINTF_ARGS, which is only used | |
| 110 for checking args against the string spec. */ | |
| 111 #ifndef PRINTF_ARGS | |
| 112 # if (GCC_VERSION >= NEED_GCC (2, 6, 0)) | |
| 113 # define PRINTF_ARGS(string_index,first_to_check) \ | |
| 114 __attribute__ ((format (printf, string_index, first_to_check))) | |
| 115 # else | |
| 116 # define PRINTF_ARGS(string_index,first_to_check) | |
| 117 # endif /* GNUC */ | |
| 118 #endif | |
| 119 | |
| 2268 | 120 #ifndef DOESNT_RETURN_TYPE |
| 1743 | 121 # if (GCC_VERSION > NEED_GCC (0, 0, 0)) |
| 122 # if (GCC_VERSION >= NEED_GCC (2, 5, 0)) | |
| 2270 | 123 # ifndef __INTEL_COMPILER |
| 124 # define RETURN_NOT_REACHED(value) DO_NOTHING | |
| 125 # endif | |
| 2268 | 126 # define DOESNT_RETURN_TYPE(rettype) rettype |
| 127 # define DECLARE_DOESNT_RETURN_TYPE(rettype,decl) rettype decl \ | |
| 128 __attribute__ ((noreturn)) | |
| 1743 | 129 # else /* GCC_VERSION < NEED_GCC (2, 5, 0) */ |
| 2268 | 130 # define DOESNT_RETURN_TYPE(rettype) rettype volatile |
| 131 # define DECLARE_DOESNT_RETURN_TYPE(rettype,decl) rettype volatile decl | |
| 1743 | 132 # endif /* GCC_VERSION >= NEED_GCC (2, 5, 0) */ |
| 2500 | 133 # elif (MSC_VERSION >= 1200) |
| 134 /* MSVC 6.0 has a mechanism to declare functions which never return */ | |
| 135 # define DOESNT_RETURN_TYPE(rettype) __declspec(noreturn) rettype | |
| 136 # define DECLARE_DOESNT_RETURN_TYPE(rettype,decl) \ | |
| 137 __declspec(noreturn) rettype XCDECL decl | |
| 138 # if (MSC_VERSION >= 1300) | |
| 139 /* VC++ 7 issues warnings about return statements in __declspec(noreturn) | |
| 140 functions; this problem didn't exist under VC++ 6 */ | |
| 141 # define RETURN_NOT_REACHED(value) DO_NOTHING | |
| 142 # endif | |
| 143 # else /* not gcc, VC++ */ | |
| 2268 | 144 # define DOESNT_RETURN_TYPE(rettype) rettype |
| 145 # define DECLARE_DOESNT_RETURN_TYPE(rettype,decl) rettype decl | |
| 1743 | 146 # endif /* GCC_VERSION > NEED_GCC (0, 0, 0) */ |
| 2268 | 147 #endif /* DOESNT_RETURN_TYPE */ |
| 148 #ifndef DOESNT_RETURN | |
| 149 # define DOESNT_RETURN DOESNT_RETURN_TYPE (void) | |
| 150 # define DECLARE_DOESNT_RETURN(decl) DECLARE_DOESNT_RETURN_TYPE (void, decl) | |
| 1743 | 151 #endif /* DOESNT_RETURN */ |
| 152 | |
| 153 /* Another try to fix SunPro C compiler warnings */ | |
| 154 /* "end-of-loop code not reached" */ | |
| 155 /* "statement not reached */ | |
| 156 #if defined __SUNPRO_C || defined __USLC__ | |
| 1748 | 157 # define RETURN_SANS_WARNINGS if (1) return |
| 158 # define RETURN_NOT_REACHED(value) DO_NOTHING | |
| 1743 | 159 #endif |
| 160 | |
| 161 /* More ways to shut up compiler. This works in Fcommand_loop_1(), | |
| 162 where there's an infinite loop in a function returning a Lisp object. | |
| 163 */ | |
| 2500 | 164 #if (defined (_MSC_VER) && MSC_VERSION < 1300) || defined (__SUNPRO_C) || \ |
|
4759
aa5ed11f473b
Remove support for obsolete systems. See xemacs-patches message with ID
Jerry James <james@xemacs.org>
parents:
4028
diff
changeset
|
165 defined (__SUNPRO_CC) |
| 1748 | 166 # define DO_NOTHING_DISABLING_NO_RETURN_WARNINGS if (0) return Qnil |
| 1743 | 167 #else |
| 1748 | 168 # define DO_NOTHING_DISABLING_NO_RETURN_WARNINGS DO_NOTHING |
| 1743 | 169 #endif |
| 170 | |
| 171 #ifndef RETURN_NOT_REACHED | |
| 1748 | 172 # define RETURN_NOT_REACHED(value) return (value) |
| 1743 | 173 #endif |
| 174 | |
| 175 #ifndef RETURN_SANS_WARNINGS | |
| 1748 | 176 # define RETURN_SANS_WARNINGS return |
| 1743 | 177 #endif |
| 178 | |
| 179 #ifndef DO_NOTHING | |
| 1748 | 180 # define DO_NOTHING do {} while (0) |
| 1743 | 181 #endif |
| 182 | |
| 183 #ifndef DECLARE_NOTHING | |
| 1748 | 184 # define DECLARE_NOTHING struct nosuchstruct |
| 1743 | 185 #endif |
| 186 | |
| 187 #ifndef ATTRIBUTE_MALLOC | |
| 188 # if (GCC_VERSION >= NEED_GCC (2, 96, 0)) | |
| 189 # define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) | |
| 190 # else | |
| 191 # define ATTRIBUTE_MALLOC | |
| 192 # endif /* GCC_VERSION >= NEED_GCC (2, 96, 0) */ | |
| 193 #endif /* ATTRIBUTE_MALLOC */ | |
| 194 | |
| 195 #ifndef ATTRIBUTE_PURE | |
| 196 # if (GCC_VERSION >= NEED_GCC (2, 96, 0)) | |
| 197 # define ATTRIBUTE_PURE __attribute__ ((pure)) | |
| 198 # else | |
| 199 # define ATTRIBUTE_PURE | |
| 200 # endif /* GCC_VERSION >= NEED_GCC (2, 96, 0) */ | |
| 201 #endif /* ATTRIBUTE_PURE */ | |
| 202 | |
| 203 #ifndef ATTRIBUTE_CONST | |
| 204 # if (GCC_VERSION >= NEED_GCC (2, 5, 0)) | |
| 205 # define ATTRIBUTE_CONST __attribute__ ((const)) | |
| 206 # define CONST_FUNC | |
| 207 # else | |
| 208 # define ATTRIBUTE_CONST | |
| 209 # define CONST_FUNC const | |
| 210 # endif /* GCC_VERSION >= NEED_GCC (2, 5, 0) */ | |
| 211 #endif /* ATTRIBUTE_CONST */ | |
| 212 | |
| 3094 | 213 /* |
| 214 NOTE: These macros MUST be named UNUSED (exactly) or something | |
| 215 prefixed with USED_IF_, or DEFUN docstrings will be parsed incorrectly. | |
| 216 See comments in make_docfile.c (write_c_args). You'd think that this | |
| 217 wouldn't happen, but unfortunately we do indeed have some arguments | |
| 218 of DEFUNs unused for GNU compatibility or because features are missing. | |
| 4028 | 219 |
| 220 #### At one time, __attribute__ ((unused)) confused G++. We don't know | |
| 221 which versions. Please report problems and fix conditionals. | |
| 222 #### A similar issue arose with the Intel CC. We know that v7 didn't | |
| 223 work and v9 does. Let us know if v8 works or not, please. | |
| 224 See <m34plsmh88.fsf@jerrypc.cs.usu.edu>. | |
| 3094 | 225 */ |
| 1743 | 226 #ifndef UNUSED_ARG |
| 2286 | 227 # define UNUSED_ARG(decl) unused_##decl |
| 228 #endif | |
| 229 #ifndef UNUSED | |
| 4028 | 230 # if defined(__GNUC__) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 800) |
| 2286 | 231 # define ATTRIBUTE_UNUSED __attribute__ ((unused)) |
| 1743 | 232 # else |
| 2286 | 233 # define ATTRIBUTE_UNUSED |
| 1743 | 234 # endif |
| 2286 | 235 # define UNUSED(decl) UNUSED_ARG (decl) ATTRIBUTE_UNUSED |
| 236 #endif /* UNUSED */ | |
| 1743 | 237 |
| 5046 | 238 /* Various macros for params/variables used or unused depending on |
| 239 config flags. */ | |
| 240 | |
| 241 #ifdef MULE | |
| 242 # define USED_IF_MULE(decl) decl | |
| 243 #else | |
| 244 # define USED_IF_MULE(decl) UNUSED (decl) | |
| 245 #endif | |
| 246 #ifdef HAVE_XFT | |
| 247 # define USED_IF_XFT(decl) decl | |
| 248 #else | |
| 249 # define USED_IF_XFT(decl) UNUSED (decl) | |
| 250 #endif | |
| 251 #ifdef HAVE_SCROLLBARS | |
| 252 # define USED_IF_SCROLLBARS(decl) decl | |
| 253 #else | |
| 254 # define USED_IF_SCROLLBARS(decl) UNUSED (decl) | |
| 255 #endif | |
| 256 #ifdef NEW_GC | |
| 257 # define USED_IF_NEW_GC(decl) decl | |
| 258 # define UNUSED_IF_NEW_GC(decl) UNUSED (decl) | |
| 259 #else | |
| 260 # define USED_IF_NEW_GC(decl) UNUSED (decl) | |
| 261 # define UNUSED_IF_NEW_GC(decl) decl | |
| 262 #endif | |
| 263 #ifdef HAVE_TTY | |
| 264 #define USED_IF_TTY(decl) decl | |
| 265 #else | |
| 266 #define USED_IF_TTY(decl) UNUSED (decl) | |
| 267 #endif | |
| 268 #ifdef HAVE_TOOLBARS | |
| 269 #define USED_IF_TOOLBARS(decl) decl | |
| 270 #else | |
| 271 #define USED_IF_TOOLBARS(decl) UNUSED (decl) | |
| 272 #endif | |
| 273 | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4860
diff
changeset
|
274 /* Declaration that variable or expression X is "used" to defeat |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4860
diff
changeset
|
275 "unused variable" warnings. DON'T DO THIS FOR PARAMETERS IF IT ALL |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4860
diff
changeset
|
276 POSSIBLE. Use an UNUSED() or USED_IF_*() declaration on the parameter |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4860
diff
changeset
|
277 instead. Don't do this for unused local variables that should really |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4860
diff
changeset
|
278 just be deleted. */ |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4860
diff
changeset
|
279 #define USED(x) ((void) (x)) |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4860
diff
changeset
|
280 |
| 1743 | 281 #ifdef DEBUG_XEMACS |
| 1748 | 282 # define REGISTER |
| 283 # define register | |
| 1743 | 284 #else |
| 1748 | 285 # define REGISTER register |
| 1743 | 286 #endif |
| 287 | |
| 288 #if defined(HAVE_MS_WINDOWS) && defined(HAVE_SHLIB) | |
| 289 # ifdef EMACS_MODULE | |
| 290 # define MODULE_API __declspec(dllimport) | |
| 291 # else | |
| 292 # define MODULE_API __declspec(dllexport) | |
| 293 # endif | |
| 294 #else | |
| 295 # define MODULE_API | |
| 296 #endif | |
| 297 | |
| 2367 | 298 /* Under "strict-aliasing" assumptions, you're not necessarily allowed to |
| 299 access the same memory address as two different types. The proper way | |
| 300 around that is with a union. The macros below help out, e.g. the | |
| 301 definition of XE_MAKEPOINTS(val) is | |
| 302 | |
| 303 ANSI_ALIASING_TYPEDEF (POINTS, POINTS); | |
| 304 #define XE_MAKEPOINTS(l) ANSI_ALIASING_CAST (POINTS, l) | |
| 305 | |
| 306 replacing | |
| 307 | |
| 308 BAD!!! #define XE_MAKEPOINTS(l) (* (POINTS *) &(l)) | |
| 309 | |
| 310 On the other hand, if you are just casting from one pointer to the other | |
| 311 in order to pass a pointer to another function, it's probably OK to just | |
| 312 trick GCC by inserting an intermediate cast to (void *), to avoid | |
| 313 warnings about "dereferencing type-punned pointer". #### I don't know | |
| 314 how kosher this is, but do strict-aliasing rules really apply across | |
| 315 functions? | |
| 316 | |
| 317 Note that the input to e.g. VOIDP_CAST must be an lvalue (i.e. not | |
| 318 &(something)), but the value of the macro is also an lvalue, so in place | |
| 319 of `(void **) &foo' you could write `& VOIDP_CAST (foo)' if you are | |
| 320 subsequently dereferencing the value or don't feel comfortable doing a | |
| 321 trick like `(void **) (void *) &foo'. | |
| 322 | |
| 323 Unfortunately, it does not work to just define the union type on the fly in | |
| 324 the cast -- otherwise, we could avoid the need for a typedef. Or rather, | |
| 325 it does work under gcc but not under Visual C++. | |
| 326 | |
| 327 --ben | |
| 328 */ | |
| 329 | |
| 330 #define ANSI_ALIASING_TYPEDEF(name, type) typedef union { char c; type p; } *ANSI_ALIASING_##name | |
| 331 #define ANSI_ALIASING_CAST(name, val) (((ANSI_ALIASING_##name) &(val))->p) | |
| 332 ANSI_ALIASING_TYPEDEF (voidp, void *); | |
| 333 /* VOIDP_CAST: Cast an lvalue to (void *) in a way that is ANSI-aliasing | |
| 334 safe and will not result in GCC warnings. The result is still an | |
| 335 lvalue, so you can assign to it or take its address. */ | |
| 336 #define VOIDP_CAST(l) ANSI_ALIASING_CAST (voidp, l) | |
| 337 | |
| 1743 | 338 #endif /* INCLUDED_compiler_h */ |