commit: Be better about eliminating `block's that are not `return-from'd, bytecomp.el
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
changeset: 5356:5dd1ba5e0113
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Feb 12 14:07:38 2011 +0000
files: lisp/ChangeLog lisp/bytecomp.el lisp/cl-macs.el
description:
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
2011-02-12 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
* bytecomp.el (unwind-protect):
* bytecomp.el (byte-compile-active-blocks):
* bytecomp.el (byte-compile-catch):
* bytecomp.el ('return-from-1): Removed.
* bytecomp.el ('block-1): Removed.
* bytecomp.el (byte-compile-block-1): Removed.
* bytecomp.el (byte-compile-return-from-1): Removed.
* bytecomp.el (byte-compile-throw):
* cl-macs.el (block):
* cl-macs.el (return-from):
In my last change, the elimination of `block's that were never
`return-from'd didn't work if `cl-macroexpand-all' was called
explicitly, something much code in cl-macs.el does. Change the
implementation to something that doesn't require shadowing of the
macros in `byte-compile-initial-macro-environment', putting a
`cl-block-name' property on the gensym'd symbol argument to
`catch' instead.
diff -r 70b15ac66ee5 -r 5dd1ba5e0113 lisp/ChangeLog
--- a/lisp/ChangeLog Thu Feb 10 08:46:10 2011 +0000
+++ b/lisp/ChangeLog Sat Feb 12 14:07:38 2011 +0000
＠＠ -1,3 +1,25 ＠＠
+2011-02-12 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * bytecomp.el:
+ * bytecomp.el (byte-compile-initial-macro-environment):
+ * bytecomp.el (unwind-protect):
+ * bytecomp.el (byte-compile-active-blocks):
+ * bytecomp.el (byte-compile-catch):
+ * bytecomp.el ('return-from-1): Removed.
+ * bytecomp.el ('block-1): Removed.
+ * bytecomp.el (byte-compile-block-1): Removed.
+ * bytecomp.el (byte-compile-return-from-1): Removed.
+ * bytecomp.el (byte-compile-throw):
+ * cl-macs.el (block):
+ * cl-macs.el (return-from):
+ In my last change, the elimination of `block's that were never
+ `return-from'd didn't work if `cl-macroexpand-all' was called
+ explicitly, something much code in cl-macs.el does. Change the
+ implementation to something that doesn't require shadowing of the
+ macros in `byte-compile-initial-macro-environment', putting a
+ `cl-block-name' property on the gensym'd symbol argument to
+ `catch' instead.
+
2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* cl.el (acons): Removed, make the implementation in alloc.c
diff -r 70b15ac66ee5 -r 5dd1ba5e0113 lisp/bytecomp.el
--- a/lisp/bytecomp.el Thu Feb 10 08:46:10 2011 +0000
+++ b/lisp/bytecomp.el Sat Feb 12 14:07:38 2011 +0000
＠＠ -511,11 +511,7 ＠＠
"%s is not of type %s" form type)))
(if byte-compile-delete-errors
form
- (funcall (cdr (symbol-function 'the)) type form))))
- (return-from .
- ,#'(lambda (name &optional result) `(return-from-1 ',name ,result)))
- (block .
- ,#'(lambda (name &rest body) `(block-1 ',name ,＠body))))
+ (funcall (cdr (symbol-function 'the)) type form)))))
"The default macro-environment passed to macroexpand by the compiler.
Placing a macro here will cause a macro to have different semantics when
expanded by the compiler as when expanded by the interpreter.")
＠＠ -4186,8 +4182,6 ＠＠
;;; other tricky macro-like special-operators
(byte-defop-compiler-1 catch)
-(byte-defop-compiler-1 block-1)
-(byte-defop-compiler-1 return-from-1)
(byte-defop-compiler-1 unwind-protect)
(byte-defop-compiler-1 condition-case)
(byte-defop-compiler-1 save-excursion)
＠＠ -4196,44 +4190,33 ＠＠
(byte-defop-compiler-1 with-output-to-temp-buffer)
;; no track-mouse.
+(defvar byte-compile-active-blocks nil)
+
(defun byte-compile-catch (form)
- (byte-compile-form (car (cdr form)))
- (byte-compile-push-constant
- (byte-compile-top-level (cons 'progn (cdr (cdr form))) for-effect))
- (byte-compile-out 'byte-catch 0))
-
-;; `return-from' and `block' are different from `throw' and `catch' when it
-;; comes to scope and extent. These differences are implemented for
-;; interpreted code in cl-macs.el, in compiled code in bytecomp.el. There's
-;; a certain amount of bootstrapping needed for the latter, and until this
-;; is done return-from and block behave as throw and catch in their scope
-;; and extent. This is only relevant to people working on bytecomp.el.
-
-(defalias 'return-from-1 'throw)
-(defalias 'block-1 'catch)
-
-(defvar byte-compile-active-blocks nil)
-
-(defun byte-compile-block-1 (form)
- (let* ((name (nth 1 (nth 1 form)))
- (elt (list name (copy-symbol name) nil))
- (byte-compile-active-blocks (cons elt byte-compile-active-blocks))
- (body (byte-compile-top-level (cons 'progn (cddr form)))))
- (if (nth 2 elt)
- (byte-compile-catch `(catch ',(nth 1 elt) ,body))
- (byte-compile-form body))))
-
-(defun byte-compile-return-from-1 (form)
- (let* ((name (nth 1 (nth 1 form)))
- (assq (assq name byte-compile-active-blocks)))
- (if assq
- (setf (nth 2 assq) t)
- (byte-compile-warn
- "return-from: %S: no current lexical block with this name"
- name))
- (byte-compile-throw
- `(throw ',(or (nth 1 assq) (copy-symbol name))
- ,＠(nthcdr 2 form)))))
+ "Byte-compile and return a `catch' from.
+
+If FORM is the result of macroexpanding a `block' form (the TAG argument is
+a quoted symbol with a non-nil `cl-block-name' property) and there is no
+corresponding `return-from' within the block--or equivalently, it was
+optimized away--just byte compile and return the BODY."
+ (let* ((symbol (car-safe (cdr-safe (nth 1 form))))
+ (block (and symbol (symbolp symbol) (get symbol 'cl-block-name)))
+ (elt (and block (cons block nil)))
+ (byte-compile-active-blocks
+ (if block
+ (cons elt byte-compile-active-blocks)
+ byte-compile-active-blocks))
+ (body
+ (byte-compile-top-level (cons 'progn (cddr form))
+ (if block nil for-effect))))
+ (if (and block (not (cdr elt)))
+ ;; A lexical block without any contained return-from clauses:
+ (byte-compile-form body)
+ ;; A normal catch call, or a lexical block with a contained
+ ;; return-from clause.
+ (byte-compile-form (car (cdr form)))
+ (byte-compile-push-constant body)
+ (byte-compile-out 'byte-catch 0))))
(defun byte-compile-unwind-protect (form)
(byte-compile-push-constant
＠＠ -4383,6 +4366,12 ＠＠
(byte-compile-normal-call
`(signal 'wrong-number-of-arguments '(,(car form)
,(length (cdr form))))))
+ ;; If this form was macroexpanded from `return-from', mark the
+ ;; corresponding block as having been referenced.
+ (let* ((symbol (car-safe (cdr-safe (nth 1 form))))
+ (block (and symbol (symbolp symbol) (get symbol 'cl-block-name)))
+ (assq (and block (assq block byte-compile-active-blocks))))
+ (and assq (setcdr assq t)))
(byte-compile-form (nth 1 form)) ;; Push the arguments
(byte-compile-form (nth 2 form))
(byte-compile-out (get (car form) 'byte-opcode) 0)
diff -r 70b15ac66ee5 -r 5dd1ba5e0113 lisp/cl-macs.el
--- a/lisp/cl-macs.el Thu Feb 10 08:46:10 2011 +0000
+++ b/lisp/cl-macs.el Sat Feb 12 14:07:38 2011 +0000
＠＠ -747,6 +747,9 ＠＠
(let ((cl-active-block-names (acons name (copy-symbol name)
cl-active-block-names))
(body (cons 'progn body)))
+ ;; Tell the byte-compiler this is a block, not a normal catch call, and
+ ;; as such it can eliminate it if that's appropriate:
+ (put (cdar cl-active-block-names) 'cl-block-name name)
`(catch ',(cdar cl-active-block-names)
,(cl-macroexpand-all body cl-macro-environment))))
＠＠ -763,8 +766,13 ＠＠
returning RESULT from that form (or nil if RESULT is omitted).
This is compatible with Common Lisp, but note that `defun' and
`defmacro' do not create implicit blocks as they do in Common Lisp."
- `(throw ',(or (cdr (assq name cl-active-block-names)) (copy-symbol name))
- ,result))
+ `(throw ',(or (cdr (assq name cl-active-block-names))
+ (prog1 (copy-symbol name)
+ (and-fboundp 'byte-compile-warn (cl-compiling-file)
+ (byte-compile-warn
+ "return-from: no enclosing block named `%s'"
+ name))))
+ ,result))
;;; The "loop" macro.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Correct a bug with circularity checking in #'mapcar*, #'map, etc.
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1297327570 0
# Node ID 70b15ac66ee5f431c1e663ea985f825bfd09ea63
# Parent 22c4e67a2e69afcc7443c42632da14a466d208f8
Correct a bug with circularity checking in #'mapcar*, #'map, etc.
src/ChangeLog addition:
2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
* fns.c (shortest_length_among_sequences):
This was buggy, it always errored if the last argument was
circular, even if other arguments were non-circular. Correct that.
tests/ChangeLog addition:
2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (mapcar*):
If multiple SEQUENCE arguments are passed to #'mapcar*, and the
last one is circular while the others aren't, make sure that
#'mapcar* doesn't error.
diff -r 22c4e67a2e69 -r 70b15ac66ee5 src/ChangeLog
--- a/src/ChangeLog Wed Feb 09 20:15:50 2011 +0000
+++ b/src/ChangeLog Thu Feb 10 08:46:10 2011 +0000
＠＠ -1,3 +1,9 ＠＠
+2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * fns.c (shortest_length_among_sequences):
+ This was buggy, it always errored if the last argument was
+ circular, even if other arguments were non-circular. Correct that.
+
2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* alloc.c (Facons):
diff -r 22c4e67a2e69 -r 70b15ac66ee5 src/fns.c
--- a/src/fns.c Wed Feb 09 20:15:50 2011 +0000
+++ b/src/fns.c Thu Feb 10 08:46:10 2011 +0000
＠＠ -7145,7 +7145,7 ＠＠
static Elemcount
shortest_length_among_sequences (int nsequences, Lisp_Object *sequences)
{
- Elemcount len = EMACS_INT_MAX;
+ Elemcount len = 1 + EMACS_INT_MAX;
Lisp_Object length = Qnil;
int i;
＠＠ -7167,7 +7167,7 ＠＠
}
}
- if (NILP (length))
+ if (len == 1 + EMACS_INT_MAX)
{
signal_circular_list_error (sequences[0]);
}
diff -r 22c4e67a2e69 -r 70b15ac66ee5 tests/ChangeLog
--- a/tests/ChangeLog Wed Feb 09 20:15:50 2011 +0000
+++ b/tests/ChangeLog Thu Feb 10 08:46:10 2011 +0000
＠＠ -1,3 +1,11 ＠＠
+2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el:
+ * automated/lisp-tests.el (mapcar*):
+ If multiple SEQUENCE arguments are passed to #'mapcar*, and the
+ last one is circular while the others aren't, make sure that
+ #'mapcar* doesn't error.
+
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
diff -r 22c4e67a2e69 -r 70b15ac66ee5 tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Wed Feb 09 20:15:50 2011 +0000
+++ b/tests/automated/lisp-tests.el Thu Feb 10 08:46:10 2011 +0000
＠＠ -1046,6 +1046,12 ＠＠
(car y))
x)))
+(Assert
+ (equal
+ (let ((list (list pi))) (mapcar* #'cons [1 2 3 4] (nconc list list)))
+ `((1 . ,pi) (2 . ,pi) (3 . ,pi) (4 . ,pi)))
+ "checking mapcar* behaves correctly when only one arg is circular")
+
(Assert (eql
(length (multiple-value-list
(car (mapcar #'(lambda (argument) (floor argument)) (list pi e)))))
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Correct a bug with circularity checking in #'mapcar*, #'map, etc.
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
changeset: 5355:70b15ac66ee5
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Thu Feb 10 08:46:10 2011 +0000
files: src/ChangeLog src/fns.c tests/ChangeLog tests/automated/lisp-tests.el
description:
Correct a bug with circularity checking in #'mapcar*, #'map, etc.
src/ChangeLog addition:
2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
* fns.c (shortest_length_among_sequences):
This was buggy, it always errored if the last argument was
circular, even if other arguments were non-circular. Correct that.
tests/ChangeLog addition:
2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (mapcar*):
If multiple SEQUENCE arguments are passed to #'mapcar*, and the
last one is circular while the others aren't, make sure that
#'mapcar* doesn't error.
diff -r 22c4e67a2e69 -r 70b15ac66ee5 src/ChangeLog
--- a/src/ChangeLog Wed Feb 09 20:15:50 2011 +0000
+++ b/src/ChangeLog Thu Feb 10 08:46:10 2011 +0000
＠＠ -1,3 +1,9 ＠＠
+2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * fns.c (shortest_length_among_sequences):
+ This was buggy, it always errored if the last argument was
+ circular, even if other arguments were non-circular. Correct that.
+
2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* alloc.c (Facons):
diff -r 22c4e67a2e69 -r 70b15ac66ee5 src/fns.c
--- a/src/fns.c Wed Feb 09 20:15:50 2011 +0000
+++ b/src/fns.c Thu Feb 10 08:46:10 2011 +0000
＠＠ -7145,7 +7145,7 ＠＠
static Elemcount
shortest_length_among_sequences (int nsequences, Lisp_Object *sequences)
{
- Elemcount len = EMACS_INT_MAX;
+ Elemcount len = 1 + EMACS_INT_MAX;
Lisp_Object length = Qnil;
int i;
＠＠ -7167,7 +7167,7 ＠＠
}
}
- if (NILP (length))
+ if (len == 1 + EMACS_INT_MAX)
{
signal_circular_list_error (sequences[0]);
}
diff -r 22c4e67a2e69 -r 70b15ac66ee5 tests/ChangeLog
--- a/tests/ChangeLog Wed Feb 09 20:15:50 2011 +0000
+++ b/tests/ChangeLog Thu Feb 10 08:46:10 2011 +0000
＠＠ -1,3 +1,11 ＠＠
+2011-02-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el:
+ * automated/lisp-tests.el (mapcar*):
+ If multiple SEQUENCE arguments are passed to #'mapcar*, and the
+ last one is circular while the others aren't, make sure that
+ #'mapcar* doesn't error.
+
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
diff -r 22c4e67a2e69 -r 70b15ac66ee5 tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Wed Feb 09 20:15:50 2011 +0000
+++ b/tests/automated/lisp-tests.el Thu Feb 10 08:46:10 2011 +0000
＠＠ -1045,6 +1045,12 ＠＠
(setcdr (cdr x) 42)) ; drop a brick wall onto the freeway
(car y))
x)))
+
+(Assert
+ (equal
+ (let ((list (list pi))) (mapcar* #'cons [1 2 3 4] (nconc list list)))
+ `((1 . ,pi) (2 . ,pi) (3 . ,pi) (4 . ,pi)))
+ "checking mapcar* behaves correctly when only one arg is circular")
(Assert (eql
(length (multiple-value-list
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Make acons() in alloc.c visible to Lisp, drop same in cl.el
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMMIT
NOTE: This patch has been committed.
This increases the size of the binary by 100 bytes or so for me, oddly. But
it’s good software engineering to implement things in one place and *get
them right* there, and this is in that spirit.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1297282550 0
# Node ID 22c4e67a2e69afcc7443c42632da14a466d208f8
# Parent 38e24b8be4eaeafc13229ca02d7d8bbd2a6449c7
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
src/ChangeLog addition:
2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* alloc.c (Facons):
* alloc.c (Fobject_memory_usage):
* alloc.c (syms_of_alloc):
* faces.c (complex_vars_of_faces):
* lisp.h:
* mc-alloc.c (Fmc_alloc_memory_usage):
Rename acons() to Facons(), make it visible to Lisp. Change uses
of the function in C accordingly.
lisp/ChangeLog addition:
2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* cl.el (acons): Removed, make the implementation in alloc.c
visible to Lisp instead.
diff -r 38e24b8be4ea -r 22c4e67a2e69 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Feb 07 12:01:24 2011 +0000
+++ b/lisp/ChangeLog Wed Feb 09 20:15:50 2011 +0000
＠＠ -1,3 +1,8 ＠＠
+2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl.el (acons): Removed, make the implementation in alloc.c
+ visible to Lisp instead.
+
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecomp.el:
diff -r 38e24b8be4ea -r 22c4e67a2e69 lisp/cl.el
--- a/lisp/cl.el Mon Feb 07 12:01:24 2011 +0000
+++ b/lisp/cl.el Wed Feb 09 20:15:50 2011 +0000
＠＠ -544,9 +544,7 ＠＠
(defalias 'cl-round 'round*)
(defalias 'cl-mod 'mod*)
-(defun acons (key value alist)
- "Return a new alist created by adding (KEY . VALUE) to ALIST."
- (cons (cons key value) alist))
+;;; XEmacs; #'acons is in C.
(defun pairlis (keys values &optional alist)
"Make an alist from KEYS and VALUES.
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/ChangeLog
--- a/src/ChangeLog Mon Feb 07 12:01:24 2011 +0000
+++ b/src/ChangeLog Wed Feb 09 20:15:50 2011 +0000
＠＠ -1,3 +1,14 ＠＠
+2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * alloc.c (Facons):
+ * alloc.c (Fobject_memory_usage):
+ * alloc.c (syms_of_alloc):
+ * faces.c (complex_vars_of_faces):
+ * lisp.h:
+ * mc-alloc.c (Fmc_alloc_memory_usage):
+ Rename acons() to Facons(), make it visible to Lisp. Change uses
+ of the function in C accordingly.
+
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* keymap.c (describe_map_sort_predicate): Correct the order of
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/alloc.c
--- a/src/alloc.c Mon Feb 07 12:01:24 2011 +0000
+++ b/src/alloc.c Wed Feb 09 20:15:50 2011 +0000
＠＠ -1428,8 +1428,10 ＠＠
return Fcons (obj0, Fcons (obj1, obj2));
}
-Lisp_Object
-acons (Lisp_Object key, Lisp_Object value, Lisp_Object alist)
+DEFUN ("acons", Facons, 3, 3, 0, /*
+Return a new alist created by prepending (KEY . VALUE) to ALIST.
+*/
+ (key, value, alist))
{
return Fcons (Fcons (key, value), alist);
}
＠＠ -4197,10 +4199,10 ＠＠
xzero (object_stats);
lisp_object_storage_size (object, &object_stats);
- val = acons (Qobject_actually_requested,
- make_int (object_stats.was_requested), val);
- val = acons (Qobject_malloc_overhead,
- make_int (object_stats.malloc_overhead), val);
+ val = Facons (Qobject_actually_requested,
+ make_int (object_stats.was_requested), val);
+ val = Facons (Qobject_malloc_overhead,
+ make_int (object_stats.malloc_overhead), val);
assert (!object_stats.dynarr_overhead);
assert (!object_stats.gap_overhead);
＠＠ -4210,16 +4212,16 ＠＠
MAYBE_OBJECT_METH (object, memory_usage, (object, &gustats));
val = Fcons (Qt, val);
- val = acons (Qother_memory_actually_requested,
- make_int (gustats.u.was_requested), val);
- val = acons (Qother_memory_malloc_overhead,
- make_int (gustats.u.malloc_overhead), val);
+ val = Facons (Qother_memory_actually_requested,
+ make_int (gustats.u.was_requested), val);
+ val = Facons (Qother_memory_malloc_overhead,
+ make_int (gustats.u.malloc_overhead), val);
if (gustats.u.dynarr_overhead)
- val = acons (Qother_memory_dynarr_overhead,
- make_int (gustats.u.dynarr_overhead), val);
+ val = Facons (Qother_memory_dynarr_overhead,
+ make_int (gustats.u.dynarr_overhead), val);
if (gustats.u.gap_overhead)
- val = acons (Qother_memory_gap_overhead,
- make_int (gustats.u.gap_overhead), val);
+ val = Facons (Qother_memory_gap_overhead,
+ make_int (gustats.u.gap_overhead), val);
val = Fcons (Qnil, val);
i = 0;
＠＠ -4230,7 +4232,7 ＠＠
val = Fcons (item, val);
else
{
- val = acons (item, make_int (gustats.othervals[i]), val);
+ val = Facons (item, make_int (gustats.othervals[i]), val);
i++;
}
}
＠＠ -5701,6 +5703,7 ＠＠
DEFSUBR (Fcons);
DEFSUBR (Flist);
+ DEFSUBR (Facons);
DEFSUBR (Fvector);
DEFSUBR (Fbit_vector);
DEFSUBR (Fmake_byte_code);
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/faces.c
--- a/src/faces.c Mon Feb 07 12:01:24 2011 +0000
+++ b/src/faces.c Wed Feb 09 20:15:50 2011 +0000
＠＠ -2266,22 +2266,22 ＠＠
Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
#ifdef HAVE_GTK
- fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qgtk), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qgtk), build_ascstring ("white"), bg_fb);
#endif
#ifdef HAVE_X_WINDOWS
- fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qx), build_ascstring ("gray80"), bg_fb);
+ fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qx), build_ascstring ("gray80"), bg_fb);
#endif
#ifdef HAVE_TTY
- fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
- bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
+ fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
+ bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
#endif
#ifdef HAVE_MS_WINDOWS
- fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
- fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmswindows), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmswindows), build_ascstring ("white"), bg_fb);
#endif
set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb);
set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
＠＠ -2519,22 +2519,22 ＠＠
/* We need to put something in there, or error checking gets
#%!＠#ed up before the styles are set, which override the
fallbacks. */
- fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb);
+ fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb);
#endif
#ifdef HAVE_X_WINDOWS
- fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qx), build_ascstring ("Gray80"), bg_fb);
+ fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qx), build_ascstring ("Gray80"), bg_fb);
#endif
#ifdef HAVE_TTY
- fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
- bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
+ fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
+ bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
#endif
#ifdef HAVE_MS_WINDOWS
- fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
- fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb);
+ fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb);
#endif
set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb);
set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/lisp.h
--- a/src/lisp.h Mon Feb 07 12:01:24 2011 +0000
+++ b/src/lisp.h Wed Feb 09 20:15:50 2011 +0000
＠＠ -4275,6 +4275,7 ＠＠
/* Defined in alloc.c */
MODULE_API EXFUN (Fcons, 2);
MODULE_API EXFUN (Flist, MANY);
+MODULE_API EXFUN (Facons, 3);
EXFUN (Fbit_vector, MANY);
EXFUN (Fmake_byte_code, MANY);
MODULE_API EXFUN (Fmake_list, 2);
＠＠ -4299,7 +4300,6 ＠＠
#ifndef NEW_GC
void garbage_collect_1 (void);
#endif /* not NEW_GC */
-MODULE_API Lisp_Object acons (Lisp_Object, Lisp_Object, Lisp_Object);
MODULE_API Lisp_Object cons3 (Lisp_Object, Lisp_Object, Lisp_Object);
MODULE_API Lisp_Object list1 (Lisp_Object);
MODULE_API Lisp_Object list2 (Lisp_Object, Lisp_Object);
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/mc-alloc.c
--- a/src/mc-alloc.c Mon Feb 07 12:01:24 2011 +0000
+++ b/src/mc-alloc.c Wed Feb 09 20:15:50 2011 +0000
＠＠ -1987,29 +1987,29 ＠＠
for (i = 0; i < N_FREE_PAGE_LISTS; i++)
if (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)) > 0)
free_plhs =
- acons (make_int (PLH_SIZE (FREE_HEAP_PAGES(i))),
- list1 (make_int (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)))),
- free_plhs);
+ Facons (make_int (PLH_SIZE (FREE_HEAP_PAGES(i))),
+ list1 (make_int (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)))),
+ free_plhs);
for (i = 0; i < N_USED_PAGE_LISTS; i++)
if (PLH_PAGE_COUNT (USED_HEAP_PAGES(i)) > 0)
used_plhs =
- acons (make_int (PLH_SIZE (USED_HEAP_PAGES(i))),
- list5 (make_int (PLH_PAGE_COUNT (USED_HEAP_PAGES(i))),
- make_int (PLH_USED_CELLS (USED_HEAP_PAGES(i))),
- make_int (PLH_USED_SPACE (USED_HEAP_PAGES(i))),
- make_int (PLH_TOTAL_CELLS (USED_HEAP_PAGES(i))),
- make_int (PLH_TOTAL_SPACE (USED_HEAP_PAGES(i)))),
- used_plhs);
+ Facons (make_int (PLH_SIZE (USED_HEAP_PAGES(i))),
+ list5 (make_int (PLH_PAGE_COUNT (USED_HEAP_PAGES(i))),
+ make_int (PLH_USED_CELLS (USED_HEAP_PAGES(i))),
+ make_int (PLH_USED_SPACE (USED_HEAP_PAGES(i))),
+ make_int (PLH_TOTAL_CELLS (USED_HEAP_PAGES(i))),
+ make_int (PLH_TOTAL_SPACE (USED_HEAP_PAGES(i)))),
+ used_plhs);
used_plhs =
- acons (make_int (0),
- list5 (make_int (PLH_PAGE_COUNT(ARRAY_HEAP_PAGES)),
- make_int (PLH_USED_CELLS (ARRAY_HEAP_PAGES)),
- make_int (PLH_USED_SPACE (ARRAY_HEAP_PAGES)),
- make_int (PLH_TOTAL_CELLS (ARRAY_HEAP_PAGES)),
- make_int (PLH_TOTAL_SPACE (ARRAY_HEAP_PAGES))),
- used_plhs);
+ Facons (make_int (0),
+ list5 (make_int (PLH_PAGE_COUNT(ARRAY_HEAP_PAGES)),
+ make_int (PLH_USED_CELLS (ARRAY_HEAP_PAGES)),
+ make_int (PLH_USED_SPACE (ARRAY_HEAP_PAGES)),
+ make_int (PLH_TOTAL_CELLS (ARRAY_HEAP_PAGES)),
+ make_int (PLH_TOTAL_SPACE (ARRAY_HEAP_PAGES))),
+ used_plhs);
for (i = 0; i < N_HEAP_SECTIONS; i++) {
used_size += HEAP_SECTION(i).n_pages * PAGE_SIZE;
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
changeset: 5354:22c4e67a2e69
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Wed Feb 09 20:15:50 2011 +0000
files: lisp/ChangeLog lisp/cl.el src/ChangeLog src/alloc.c src/faces.c src/lisp.h src/mc-alloc.c
description:
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
src/ChangeLog addition:
2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* alloc.c (Facons):
* alloc.c (Fobject_memory_usage):
* alloc.c (syms_of_alloc):
* faces.c (complex_vars_of_faces):
* lisp.h:
* mc-alloc.c (Fmc_alloc_memory_usage):
Rename acons() to Facons(), make it visible to Lisp. Change uses
of the function in C accordingly.
lisp/ChangeLog addition:
2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* cl.el (acons): Removed, make the implementation in alloc.c
visible to Lisp instead.
diff -r 38e24b8be4ea -r 22c4e67a2e69 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Feb 07 12:01:24 2011 +0000
+++ b/lisp/ChangeLog Wed Feb 09 20:15:50 2011 +0000
＠＠ -1,3 +1,8 ＠＠
+2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl.el (acons): Removed, make the implementation in alloc.c
+ visible to Lisp instead.
+
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecomp.el:
diff -r 38e24b8be4ea -r 22c4e67a2e69 lisp/cl.el
--- a/lisp/cl.el Mon Feb 07 12:01:24 2011 +0000
+++ b/lisp/cl.el Wed Feb 09 20:15:50 2011 +0000
＠＠ -544,9 +544,7 ＠＠
(defalias 'cl-round 'round*)
(defalias 'cl-mod 'mod*)
-(defun acons (key value alist)
- "Return a new alist created by adding (KEY . VALUE) to ALIST."
- (cons (cons key value) alist))
+;;; XEmacs; #'acons is in C.
(defun pairlis (keys values &optional alist)
"Make an alist from KEYS and VALUES.
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/ChangeLog
--- a/src/ChangeLog Mon Feb 07 12:01:24 2011 +0000
+++ b/src/ChangeLog Wed Feb 09 20:15:50 2011 +0000
＠＠ -1,3 +1,14 ＠＠
+2011-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * alloc.c (Facons):
+ * alloc.c (Fobject_memory_usage):
+ * alloc.c (syms_of_alloc):
+ * faces.c (complex_vars_of_faces):
+ * lisp.h:
+ * mc-alloc.c (Fmc_alloc_memory_usage):
+ Rename acons() to Facons(), make it visible to Lisp. Change uses
+ of the function in C accordingly.
+
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* keymap.c (describe_map_sort_predicate): Correct the order of
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/alloc.c
--- a/src/alloc.c Mon Feb 07 12:01:24 2011 +0000
+++ b/src/alloc.c Wed Feb 09 20:15:50 2011 +0000
＠＠ -1428,8 +1428,10 ＠＠
return Fcons (obj0, Fcons (obj1, obj2));
}
-Lisp_Object
-acons (Lisp_Object key, Lisp_Object value, Lisp_Object alist)
+DEFUN ("acons", Facons, 3, 3, 0, /*
+Return a new alist created by prepending (KEY . VALUE) to ALIST.
+*/
+ (key, value, alist))
{
return Fcons (Fcons (key, value), alist);
}
＠＠ -4197,10 +4199,10 ＠＠
xzero (object_stats);
lisp_object_storage_size (object, &object_stats);
- val = acons (Qobject_actually_requested,
- make_int (object_stats.was_requested), val);
- val = acons (Qobject_malloc_overhead,
- make_int (object_stats.malloc_overhead), val);
+ val = Facons (Qobject_actually_requested,
+ make_int (object_stats.was_requested), val);
+ val = Facons (Qobject_malloc_overhead,
+ make_int (object_stats.malloc_overhead), val);
assert (!object_stats.dynarr_overhead);
assert (!object_stats.gap_overhead);
＠＠ -4210,16 +4212,16 ＠＠
MAYBE_OBJECT_METH (object, memory_usage, (object, &gustats));
val = Fcons (Qt, val);
- val = acons (Qother_memory_actually_requested,
- make_int (gustats.u.was_requested), val);
- val = acons (Qother_memory_malloc_overhead,
- make_int (gustats.u.malloc_overhead), val);
+ val = Facons (Qother_memory_actually_requested,
+ make_int (gustats.u.was_requested), val);
+ val = Facons (Qother_memory_malloc_overhead,
+ make_int (gustats.u.malloc_overhead), val);
if (gustats.u.dynarr_overhead)
- val = acons (Qother_memory_dynarr_overhead,
- make_int (gustats.u.dynarr_overhead), val);
+ val = Facons (Qother_memory_dynarr_overhead,
+ make_int (gustats.u.dynarr_overhead), val);
if (gustats.u.gap_overhead)
- val = acons (Qother_memory_gap_overhead,
- make_int (gustats.u.gap_overhead), val);
+ val = Facons (Qother_memory_gap_overhead,
+ make_int (gustats.u.gap_overhead), val);
val = Fcons (Qnil, val);
i = 0;
＠＠ -4230,7 +4232,7 ＠＠
val = Fcons (item, val);
else
{
- val = acons (item, make_int (gustats.othervals[i]), val);
+ val = Facons (item, make_int (gustats.othervals[i]), val);
i++;
}
}
＠＠ -5701,6 +5703,7 ＠＠
DEFSUBR (Fcons);
DEFSUBR (Flist);
+ DEFSUBR (Facons);
DEFSUBR (Fvector);
DEFSUBR (Fbit_vector);
DEFSUBR (Fmake_byte_code);
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/faces.c
--- a/src/faces.c Mon Feb 07 12:01:24 2011 +0000
+++ b/src/faces.c Wed Feb 09 20:15:50 2011 +0000
＠＠ -2266,22 +2266,22 ＠＠
Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
#ifdef HAVE_GTK
- fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qgtk), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qgtk), build_ascstring ("white"), bg_fb);
#endif
#ifdef HAVE_X_WINDOWS
- fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qx), build_ascstring ("gray80"), bg_fb);
+ fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qx), build_ascstring ("gray80"), bg_fb);
#endif
#ifdef HAVE_TTY
- fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
- bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
+ fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
+ bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
#endif
#ifdef HAVE_MS_WINDOWS
- fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
- fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmswindows), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmswindows), build_ascstring ("white"), bg_fb);
#endif
set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb);
set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
＠＠ -2519,22 +2519,22 ＠＠
/* We need to put something in there, or error checking gets
#%!＠#ed up before the styles are set, which override the
fallbacks. */
- fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb);
+ fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb);
#endif
#ifdef HAVE_X_WINDOWS
- fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qx), build_ascstring ("Gray80"), bg_fb);
+ fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qx), build_ascstring ("Gray80"), bg_fb);
#endif
#ifdef HAVE_TTY
- fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
- bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
+ fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
+ bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
#endif
#ifdef HAVE_MS_WINDOWS
- fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
- fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
- bg_fb = acons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb);
+ fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
+ fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
+ bg_fb = Facons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb);
#endif
set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb);
set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/lisp.h
--- a/src/lisp.h Mon Feb 07 12:01:24 2011 +0000
+++ b/src/lisp.h Wed Feb 09 20:15:50 2011 +0000
＠＠ -4275,6 +4275,7 ＠＠
/* Defined in alloc.c */
MODULE_API EXFUN (Fcons, 2);
MODULE_API EXFUN (Flist, MANY);
+MODULE_API EXFUN (Facons, 3);
EXFUN (Fbit_vector, MANY);
EXFUN (Fmake_byte_code, MANY);
MODULE_API EXFUN (Fmake_list, 2);
＠＠ -4299,7 +4300,6 ＠＠
#ifndef NEW_GC
void garbage_collect_1 (void);
#endif /* not NEW_GC */
-MODULE_API Lisp_Object acons (Lisp_Object, Lisp_Object, Lisp_Object);
MODULE_API Lisp_Object cons3 (Lisp_Object, Lisp_Object, Lisp_Object);
MODULE_API Lisp_Object list1 (Lisp_Object);
MODULE_API Lisp_Object list2 (Lisp_Object, Lisp_Object);
diff -r 38e24b8be4ea -r 22c4e67a2e69 src/mc-alloc.c
--- a/src/mc-alloc.c Mon Feb 07 12:01:24 2011 +0000
+++ b/src/mc-alloc.c Wed Feb 09 20:15:50 2011 +0000
＠＠ -1987,29 +1987,29 ＠＠
for (i = 0; i < N_FREE_PAGE_LISTS; i++)
if (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)) > 0)
free_plhs =
- acons (make_int (PLH_SIZE (FREE_HEAP_PAGES(i))),
- list1 (make_int (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)))),
- free_plhs);
+ Facons (make_int (PLH_SIZE (FREE_HEAP_PAGES(i))),
+ list1 (make_int (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)))),
+ free_plhs);
for (i = 0; i < N_USED_PAGE_LISTS; i++)
if (PLH_PAGE_COUNT (USED_HEAP_PAGES(i)) > 0)
used_plhs =
- acons (make_int (PLH_SIZE (USED_HEAP_PAGES(i))),
- list5 (make_int (PLH_PAGE_COUNT (USED_HEAP_PAGES(i))),
- make_int (PLH_USED_CELLS (USED_HEAP_PAGES(i))),
- make_int (PLH_USED_SPACE (USED_HEAP_PAGES(i))),
- make_int (PLH_TOTAL_CELLS (USED_HEAP_PAGES(i))),
- make_int (PLH_TOTAL_SPACE (USED_HEAP_PAGES(i)))),
- used_plhs);
+ Facons (make_int (PLH_SIZE (USED_HEAP_PAGES(i))),
+ list5 (make_int (PLH_PAGE_COUNT (USED_HEAP_PAGES(i))),
+ make_int (PLH_USED_CELLS (USED_HEAP_PAGES(i))),
+ make_int (PLH_USED_SPACE (USED_HEAP_PAGES(i))),
+ make_int (PLH_TOTAL_CELLS (USED_HEAP_PAGES(i))),
+ make_int (PLH_TOTAL_SPACE (USED_HEAP_PAGES(i)))),
+ used_plhs);
used_plhs =
- acons (make_int (0),
- list5 (make_int (PLH_PAGE_COUNT(ARRAY_HEAP_PAGES)),
- make_int (PLH_USED_CELLS (ARRAY_HEAP_PAGES)),
- make_int (PLH_USED_SPACE (ARRAY_HEAP_PAGES)),
- make_int (PLH_TOTAL_CELLS (ARRAY_HEAP_PAGES)),
- make_int (PLH_TOTAL_SPACE (ARRAY_HEAP_PAGES))),
- used_plhs);
+ Facons (make_int (0),
+ list5 (make_int (PLH_PAGE_COUNT(ARRAY_HEAP_PAGES)),
+ make_int (PLH_USED_CELLS (ARRAY_HEAP_PAGES)),
+ make_int (PLH_USED_SPACE (ARRAY_HEAP_PAGES)),
+ make_int (PLH_TOTAL_CELLS (ARRAY_HEAP_PAGES)),
+ make_int (PLH_TOTAL_SPACE (ARRAY_HEAP_PAGES))),
+ used_plhs);
for (i = 0; i < N_HEAP_SECTIONS; i++) {
used_size += HEAP_SECTION(i).n_pages * PAGE_SIZE;
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Improve the lexical scoping in #'block, #'return-from.
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1297080084 0
# Node ID 38e24b8be4eaeafc13229ca02d7d8bbd2a6449c7
# Parent cc7d0e19173c5384d783047ef1aeb95f5dc04e90
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf(a)mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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.
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/ChangeLog
--- a/lisp/ChangeLog Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/ChangeLog Mon Feb 07 12:01:24 2011 +0000
＠＠ -1,3 +1,34 ＠＠
+2011-02-07 Aidan Kehoe <kehoea(a)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(a)xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/bytecomp.el
--- a/lisp/bytecomp.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/bytecomp.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -511,7 +511,11 ＠＠
"%s is not of type %s" form type)))
(if byte-compile-delete-errors
form
- (funcall (cdr (symbol-function 'the)) type form)))))
+ (funcall (cdr (symbol-function 'the)) type form))))
+ (return-from .
+ ,#'(lambda (name &optional result) `(return-from-1 ',name ,result)))
+ (block .
+ ,#'(lambda (name &rest body) `(block-1 ',name ,＠body))))
"The default macro-environment passed to macroexpand by the compiler.
Placing a macro here will cause a macro to have different semantics when
expanded by the compiler as when expanded by the interpreter.")
＠＠ -4182,6 +4186,8 ＠＠
;;; other tricky macro-like special-operators
(byte-defop-compiler-1 catch)
+(byte-defop-compiler-1 block-1)
+(byte-defop-compiler-1 return-from-1)
(byte-defop-compiler-1 unwind-protect)
(byte-defop-compiler-1 condition-case)
(byte-defop-compiler-1 save-excursion)
＠＠ -4196,6 +4202,39 ＠＠
(byte-compile-top-level (cons 'progn (cdr (cdr form))) for-effect))
(byte-compile-out 'byte-catch 0))
+;; `return-from' and `block' are different from `throw' and `catch' when it
+;; comes to scope and extent. These differences are implemented for
+;; interpreted code in cl-macs.el, in compiled code in bytecomp.el. There's
+;; a certain amount of bootstrapping needed for the latter, and until this
+;; is done return-from and block behave as throw and catch in their scope
+;; and extent. This is only relevant to people working on bytecomp.el.
+
+(defalias 'return-from-1 'throw)
+(defalias 'block-1 'catch)
+
+(defvar byte-compile-active-blocks nil)
+
+(defun byte-compile-block-1 (form)
+ (let* ((name (nth 1 (nth 1 form)))
+ (elt (list name (copy-symbol name) nil))
+ (byte-compile-active-blocks (cons elt byte-compile-active-blocks))
+ (body (byte-compile-top-level (cons 'progn (cddr form)))))
+ (if (nth 2 elt)
+ (byte-compile-catch `(catch ',(nth 1 elt) ,body))
+ (byte-compile-form body))))
+
+(defun byte-compile-return-from-1 (form)
+ (let* ((name (nth 1 (nth 1 form)))
+ (assq (assq name byte-compile-active-blocks)))
+ (if assq
+ (setf (nth 2 assq) t)
+ (byte-compile-warn
+ "return-from: %S: no current lexical block with this name"
+ name))
+ (byte-compile-throw
+ `(throw ',(or (nth 1 assq) (copy-symbol name))
+ ,＠(nthcdr 2 form)))))
+
(defun byte-compile-unwind-protect (form)
(byte-compile-push-constant
(byte-compile-top-level-body (cdr (cdr form)) t))
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/cl-extra.el
--- a/lisp/cl-extra.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/cl-extra.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -658,8 +658,11 ＠＠
'((quote --cl-rest--)))))))
(list (car form) (list* 'lambda (cadadr form) body))))
(let ((found (assq (cadr form) env)))
- ;; XEmacs: cadr/caddr operate on nil without errors
- (if (eq (cadr (caddr found)) 'cl-labels-args)
+ ;; XEmacs: cadr/caddr operate on nil without errors. But the
+ ;; macro definition may be compiled, in which case there's
+ ;; nothing for us to do.
+ (if (and (listp (cdr found))
+ (eq (cadr (caddr found)) 'cl-labels-args))
(cl-macroexpand-all (cadr (caddr (cadddr found))) env)
form))))
((memq (car form) '(defun defmacro))
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/cl-macs.el
--- a/lisp/cl-macs.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/cl-macs.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -732,6 +732,7 ＠＠
;;; Blocks and exits.
+(defvar cl-active-block-names nil)
;;;###autoload
(defmacro block (name &rest body)
＠＠ -741,46 +742,19 ＠＠
in two respects: First, the NAME is an unevaluated symbol rather than a
quoted symbol or other form; and second, NAME is lexically rather than
dynamically scoped: Only references to it within BODY will work. These
-references may appear inside macro expansions, but not inside functions
-called from BODY."
- (if (cl-safe-expr-p (cons 'progn body)) (cons 'progn body)
- (list 'cl-block-wrapper
- (list* 'catch (list 'quote (intern (concat "--cl-block-"
- (symbol-name name) "--")))
- body))))
-
-(defvar cl-active-block-names nil)
-
-(put 'cl-block-wrapper 'byte-compile
- #'(lambda (cl-form)
- (if (/= (length cl-form) 2)
- (byte-compile-warn-wrong-args cl-form 1))
-
- (if (fboundp 'byte-compile-form-do-effect) ; Check for optimizing
- ; compiler
- (progn
- (let* ((cl-entry (cons (nth 1 (nth 1 (nth 1 cl-form))) nil))
- (cl-active-block-names (cons cl-entry
- cl-active-block-names))
- (cl-body (byte-compile-top-level
- (cons 'progn (cddr (nth 1 cl-form))))))
- (if (cdr cl-entry)
- (byte-compile-form (list 'catch (nth 1 (nth 1 cl-form))
- cl-body))
- (byte-compile-form cl-body))))
- (byte-compile-form (nth 1 cl-form)))))
-
-(put 'cl-block-throw 'byte-compile
- #'(lambda (cl-form)
- (let ((cl-found (assq (nth 1 (nth 1 cl-form)) cl-active-block-names)))
- (if cl-found (setcdr cl-found t)))
- (byte-compile-throw (cons 'throw (cdr cl-form)))))
+references may appear inside macro expansions and in lambda expressions, but
+not inside other functions called from BODY."
+ (let ((cl-active-block-names (acons name (copy-symbol name)
+ cl-active-block-names))
+ (body (cons 'progn body)))
+ `(catch ',(cdar cl-active-block-names)
+ ,(cl-macroexpand-all body cl-macro-environment))))
;;;###autoload
(defmacro return (&optional result)
"Return from the block named nil.
This is equivalent to `(return-from nil RESULT)'."
- (list 'return-from nil result))
+ `(return-from nil ,result))
;;;###autoload
(defmacro return-from (name &optional result)
＠＠ -789,9 +763,8 ＠＠
returning RESULT from that form (or nil if RESULT is omitted).
This is compatible with Common Lisp, but note that `defun' and
`defmacro' do not create implicit blocks as they do in Common Lisp."
- (let ((name2 (intern (concat "--cl-block-" (symbol-name name) "--"))))
- (list 'cl-block-throw (list 'quote name2) result)))
-
+ `(throw ',(or (cdr (assq name cl-active-block-names)) (copy-symbol name))
+ ,result))
;;; The "loop" macro.
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/cl.el
--- a/lisp/cl.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/cl.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -205,19 +205,6 ＠＠
(defalias 'cl-map-extents 'map-extents)
-;;; Blocks and exits.
-
-;; This used to be #'identity, but that didn't preserve multiple values in
-;; interpreted code. #'and isn't great either, there's no error on too many
-;; arguments passed to it when interpreted. Fortunately most of the places
-;; where cl-block-wrapper is called are generated from old, established
-;; macros, so too many arguments resulting from human error is unlikely; and
-;; the byte compile handler in cl-macs.el warns if more than one arg is
-;; passed to it.
-(defalias 'cl-block-wrapper 'and)
-
-(defalias 'cl-block-throw 'throw)
-
;;; XEmacs; multiple values are in eval.c and cl-macs.el.
;;; We no longer support `multiple-value-apply', which was ill-conceived to
diff -r cc7d0e19173c -r 38e24b8be4ea tests/ChangeLog
--- a/tests/ChangeLog Mon Feb 07 00:03:41 2011 +0000
+++ b/tests/ChangeLog Mon Feb 07 12:01:24 2011 +0000
＠＠ -1,3 +1,10 ＠＠
+2011-02-07 Aidan Kehoe <kehoea(a)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.
+
2011-01-23 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
diff -r cc7d0e19173c -r 38e24b8be4ea tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Mon Feb 07 00:03:41 2011 +0000
+++ b/tests/automated/lisp-tests.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -2871,4 +2871,33 ＠＠
(subseq bit-vector 0 4)
(append (subseq bit-vector 4) nil)))))
+;;-----------------------------------------------------
+;; Test `block', `return-from'
+;;-----------------------------------------------------
+(Assert (eql 1 (block outer
+ (flet ((outtahere (n) (return-from outer n)))
+ (block outer (outtahere 1)))
+ 2))
+ "checking `block' and `return-from' are lexically scoped correctly")
+
+;; Other tests are available in Paul Dietz' test suite, and pass. The above,
+;; which we used to fail, is based on a test in the Hyperspec. We still
+;; behave incorrectly when compiled for the contorted-example function of
+;; CLTL2, whence the following test:
+
+(flet ((needs-lexical-context (first second third)
+ (if (eql 0 first)
+ (funcall second)
+ (block awkward
+ (+ 5 (needs-lexical-context
+ (1- first)
+ third
+ #'(lambda () (return-from awkward 0)))
+ first)))))
+ (if (compiled-function-p (symbol-function 'needs-lexical-context))
+ (Known-Bug-Expect-Failure
+ (Assert (eql 0 (needs-lexical-context 2 nil nil))
+ "the function special operator doesn't create a lexical context."))
+ (Assert (eql 0 (needs-lexical-context 2 nil nil)))))
+
;;; end of lisp-tests.el
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Improve the lexical scoping in #'block, #'return-from.
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
changeset: 5353:38e24b8be4ea
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Mon Feb 07 12:01:24 2011 +0000
files: lisp/ChangeLog lisp/bytecomp.el lisp/cl-extra.el lisp/cl-macs.el lisp/cl.el tests/ChangeLog tests/automated/lisp-tests.el
description:
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf(a)mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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.
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/ChangeLog
--- a/lisp/ChangeLog Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/ChangeLog Mon Feb 07 12:01:24 2011 +0000
＠＠ -1,3 +1,34 ＠＠
+2011-02-07 Aidan Kehoe <kehoea(a)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(a)xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/bytecomp.el
--- a/lisp/bytecomp.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/bytecomp.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -511,7 +511,11 ＠＠
"%s is not of type %s" form type)))
(if byte-compile-delete-errors
form
- (funcall (cdr (symbol-function 'the)) type form)))))
+ (funcall (cdr (symbol-function 'the)) type form))))
+ (return-from .
+ ,#'(lambda (name &optional result) `(return-from-1 ',name ,result)))
+ (block .
+ ,#'(lambda (name &rest body) `(block-1 ',name ,＠body))))
"The default macro-environment passed to macroexpand by the compiler.
Placing a macro here will cause a macro to have different semantics when
expanded by the compiler as when expanded by the interpreter.")
＠＠ -4182,6 +4186,8 ＠＠
;;; other tricky macro-like special-operators
(byte-defop-compiler-1 catch)
+(byte-defop-compiler-1 block-1)
+(byte-defop-compiler-1 return-from-1)
(byte-defop-compiler-1 unwind-protect)
(byte-defop-compiler-1 condition-case)
(byte-defop-compiler-1 save-excursion)
＠＠ -4195,6 +4201,39 ＠＠
(byte-compile-push-constant
(byte-compile-top-level (cons 'progn (cdr (cdr form))) for-effect))
(byte-compile-out 'byte-catch 0))
+
+;; `return-from' and `block' are different from `throw' and `catch' when it
+;; comes to scope and extent. These differences are implemented for
+;; interpreted code in cl-macs.el, in compiled code in bytecomp.el. There's
+;; a certain amount of bootstrapping needed for the latter, and until this
+;; is done return-from and block behave as throw and catch in their scope
+;; and extent. This is only relevant to people working on bytecomp.el.
+
+(defalias 'return-from-1 'throw)
+(defalias 'block-1 'catch)
+
+(defvar byte-compile-active-blocks nil)
+
+(defun byte-compile-block-1 (form)
+ (let* ((name (nth 1 (nth 1 form)))
+ (elt (list name (copy-symbol name) nil))
+ (byte-compile-active-blocks (cons elt byte-compile-active-blocks))
+ (body (byte-compile-top-level (cons 'progn (cddr form)))))
+ (if (nth 2 elt)
+ (byte-compile-catch `(catch ',(nth 1 elt) ,body))
+ (byte-compile-form body))))
+
+(defun byte-compile-return-from-1 (form)
+ (let* ((name (nth 1 (nth 1 form)))
+ (assq (assq name byte-compile-active-blocks)))
+ (if assq
+ (setf (nth 2 assq) t)
+ (byte-compile-warn
+ "return-from: %S: no current lexical block with this name"
+ name))
+ (byte-compile-throw
+ `(throw ',(or (nth 1 assq) (copy-symbol name))
+ ,＠(nthcdr 2 form)))))
(defun byte-compile-unwind-protect (form)
(byte-compile-push-constant
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/cl-extra.el
--- a/lisp/cl-extra.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/cl-extra.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -658,8 +658,11 ＠＠
'((quote --cl-rest--)))))))
(list (car form) (list* 'lambda (cadadr form) body))))
(let ((found (assq (cadr form) env)))
- ;; XEmacs: cadr/caddr operate on nil without errors
- (if (eq (cadr (caddr found)) 'cl-labels-args)
+ ;; XEmacs: cadr/caddr operate on nil without errors. But the
+ ;; macro definition may be compiled, in which case there's
+ ;; nothing for us to do.
+ (if (and (listp (cdr found))
+ (eq (cadr (caddr found)) 'cl-labels-args))
(cl-macroexpand-all (cadr (caddr (cadddr found))) env)
form))))
((memq (car form) '(defun defmacro))
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/cl-macs.el
--- a/lisp/cl-macs.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/cl-macs.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -732,6 +732,7 ＠＠
;;; Blocks and exits.
+(defvar cl-active-block-names nil)
;;;###autoload
(defmacro block (name &rest body)
＠＠ -741,46 +742,19 ＠＠
in two respects: First, the NAME is an unevaluated symbol rather than a
quoted symbol or other form; and second, NAME is lexically rather than
dynamically scoped: Only references to it within BODY will work. These
-references may appear inside macro expansions, but not inside functions
-called from BODY."
- (if (cl-safe-expr-p (cons 'progn body)) (cons 'progn body)
- (list 'cl-block-wrapper
- (list* 'catch (list 'quote (intern (concat "--cl-block-"
- (symbol-name name) "--")))
- body))))
-
-(defvar cl-active-block-names nil)
-
-(put 'cl-block-wrapper 'byte-compile
- #'(lambda (cl-form)
- (if (/= (length cl-form) 2)
- (byte-compile-warn-wrong-args cl-form 1))
-
- (if (fboundp 'byte-compile-form-do-effect) ; Check for optimizing
- ; compiler
- (progn
- (let* ((cl-entry (cons (nth 1 (nth 1 (nth 1 cl-form))) nil))
- (cl-active-block-names (cons cl-entry
- cl-active-block-names))
- (cl-body (byte-compile-top-level
- (cons 'progn (cddr (nth 1 cl-form))))))
- (if (cdr cl-entry)
- (byte-compile-form (list 'catch (nth 1 (nth 1 cl-form))
- cl-body))
- (byte-compile-form cl-body))))
- (byte-compile-form (nth 1 cl-form)))))
-
-(put 'cl-block-throw 'byte-compile
- #'(lambda (cl-form)
- (let ((cl-found (assq (nth 1 (nth 1 cl-form)) cl-active-block-names)))
- (if cl-found (setcdr cl-found t)))
- (byte-compile-throw (cons 'throw (cdr cl-form)))))
+references may appear inside macro expansions and in lambda expressions, but
+not inside other functions called from BODY."
+ (let ((cl-active-block-names (acons name (copy-symbol name)
+ cl-active-block-names))
+ (body (cons 'progn body)))
+ `(catch ',(cdar cl-active-block-names)
+ ,(cl-macroexpand-all body cl-macro-environment))))
;;;###autoload
(defmacro return (&optional result)
"Return from the block named nil.
This is equivalent to `(return-from nil RESULT)'."
- (list 'return-from nil result))
+ `(return-from nil ,result))
;;;###autoload
(defmacro return-from (name &optional result)
＠＠ -789,9 +763,8 ＠＠
returning RESULT from that form (or nil if RESULT is omitted).
This is compatible with Common Lisp, but note that `defun' and
`defmacro' do not create implicit blocks as they do in Common Lisp."
- (let ((name2 (intern (concat "--cl-block-" (symbol-name name) "--"))))
- (list 'cl-block-throw (list 'quote name2) result)))
-
+ `(throw ',(or (cdr (assq name cl-active-block-names)) (copy-symbol name))
+ ,result))
;;; The "loop" macro.
diff -r cc7d0e19173c -r 38e24b8be4ea lisp/cl.el
--- a/lisp/cl.el Mon Feb 07 00:03:41 2011 +0000
+++ b/lisp/cl.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -204,19 +204,6 ＠＠
;; Note: FSF Emacs moved them to subr.el in FSF 20.
(defalias 'cl-map-extents 'map-extents)
-
-;;; Blocks and exits.
-
-;; This used to be #'identity, but that didn't preserve multiple values in
-;; interpreted code. #'and isn't great either, there's no error on too many
-;; arguments passed to it when interpreted. Fortunately most of the places
-;; where cl-block-wrapper is called are generated from old, established
-;; macros, so too many arguments resulting from human error is unlikely; and
-;; the byte compile handler in cl-macs.el warns if more than one arg is
-;; passed to it.
-(defalias 'cl-block-wrapper 'and)
-
-(defalias 'cl-block-throw 'throw)
;;; XEmacs; multiple values are in eval.c and cl-macs.el.
diff -r cc7d0e19173c -r 38e24b8be4ea tests/ChangeLog
--- a/tests/ChangeLog Mon Feb 07 00:03:41 2011 +0000
+++ b/tests/ChangeLog Mon Feb 07 12:01:24 2011 +0000
＠＠ -1,3 +1,10 ＠＠
+2011-02-07 Aidan Kehoe <kehoea(a)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.
+
2011-01-23 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
diff -r cc7d0e19173c -r 38e24b8be4ea tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Mon Feb 07 00:03:41 2011 +0000
+++ b/tests/automated/lisp-tests.el Mon Feb 07 12:01:24 2011 +0000
＠＠ -2871,4 +2871,33 ＠＠
(subseq bit-vector 0 4)
(append (subseq bit-vector 4) nil)))))
+;;-----------------------------------------------------
+;; Test `block', `return-from'
+;;-----------------------------------------------------
+(Assert (eql 1 (block outer
+ (flet ((outtahere (n) (return-from outer n)))
+ (block outer (outtahere 1)))
+ 2))
+ "checking `block' and `return-from' are lexically scoped correctly")
+
+;; Other tests are available in Paul Dietz' test suite, and pass. The above,
+;; which we used to fail, is based on a test in the Hyperspec. We still
+;; behave incorrectly when compiled for the contorted-example function of
+;; CLTL2, whence the following test:
+
+(flet ((needs-lexical-context (first second third)
+ (if (eql 0 first)
+ (funcall second)
+ (block awkward
+ (+ 5 (needs-lexical-context
+ (1- first)
+ third
+ #'(lambda () (return-from awkward 0)))
+ first)))))
+ (if (compiled-function-p (symbol-function 'needs-lexical-context))
+ (Known-Bug-Expect-Failure
+ (Assert (eql 0 (needs-lexical-context 2 nil nil))
+ "the function special operator doesn't create a lexical context."))
+ (Assert (eql 0 (needs-lexical-context 2 nil nil)))))
+
;;; end of lisp-tests.el
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Correct the order of arguments to map_keymap_sort_predicate(), keymap.c.
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1297037021 0
# Node ID cc7d0e19173c5384d783047ef1aeb95f5dc04e90
# Parent b5561bfd5061346a02ed65ef6407036e17540c0c
Correct the order of arguments to map_keymap_sort_predicate(), keymap.c.
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* keymap.c (describe_map_sort_predicate): Correct the order of
arguments to map_keymap_sort_predicate() here. Thanks again, Mats.
diff -r b5561bfd5061 -r cc7d0e19173c src/ChangeLog
--- a/src/ChangeLog Sun Feb 06 23:46:17 2011 +0000
+++ b/src/ChangeLog Mon Feb 07 00:03:41 2011 +0000
＠＠ -1,3 +1,8 ＠＠
+2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * keymap.c (describe_map_sort_predicate): Correct the order of
+ arguments to map_keymap_sort_predicate() here. Thanks again, Mats.
+
2011-02-06 Aidan Kehoe <kehoea(a)parhasard.net>
* symbols.c (Fapropos_internal):
diff -r b5561bfd5061 -r cc7d0e19173c src/keymap.c
--- a/src/keymap.c Sun Feb 06 23:46:17 2011 +0000
+++ b/src/keymap.c Mon Feb 07 00:03:41 2011 +0000
＠＠ -4102,7 +4102,7 ＠＠
if (bit1 != bit2)
return bit1 < bit2;
else
- return map_keymap_sort_predicate (obj1, obj2, pred, key_func);
+ return map_keymap_sort_predicate (pred, key_func, obj1, obj2);
}
/* Elide 2 or more consecutive numeric keysyms bound to the same thing,
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Correct the order of arguments to map_keymap_sort_predicate(), keymap.c.
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
changeset: 5352:cc7d0e19173c
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Mon Feb 07 00:03:41 2011 +0000
files: src/ChangeLog src/keymap.c
description:
Correct the order of arguments to map_keymap_sort_predicate(), keymap.c.
2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
* keymap.c (describe_map_sort_predicate): Correct the order of
arguments to map_keymap_sort_predicate() here. Thanks again, Mats.
diff -r b5561bfd5061 -r cc7d0e19173c src/ChangeLog
--- a/src/ChangeLog Sun Feb 06 23:46:17 2011 +0000
+++ b/src/ChangeLog Mon Feb 07 00:03:41 2011 +0000
＠＠ -1,3 +1,8 ＠＠
+2011-02-07 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * keymap.c (describe_map_sort_predicate): Correct the order of
+ arguments to map_keymap_sort_predicate() here. Thanks again, Mats.
+
2011-02-06 Aidan Kehoe <kehoea(a)parhasard.net>
* symbols.c (Fapropos_internal):
diff -r b5561bfd5061 -r cc7d0e19173c src/keymap.c
--- a/src/keymap.c Sun Feb 06 23:46:17 2011 +0000
+++ b/src/keymap.c Mon Feb 07 00:03:41 2011 +0000
＠＠ -4102,7 +4102,7 ＠＠
if (bit1 != bit2)
return bit1 < bit2;
else
- return map_keymap_sort_predicate (obj1, obj2, pred, key_func);
+ return map_keymap_sort_predicate (pred, key_func, obj1, obj2);
}
/* Elide 2 or more consecutive numeric keysyms bound to the same thing,
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Supply check_string_lessp_nokey explicitly to list_sort(), #'apropos-internal
13 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1297035977 0
# Node ID b5561bfd5061346a02ed65ef6407036e17540c0c
# Parent 94bbd4792049e3c45d11ba60e354718febd74a6e
Supply check_string_lessp_nokey explicitly to list_sort(), #'apropos-internal
2011-02-06 Aidan Kehoe <kehoea(a)parhasard.net>
* symbols.c (Fapropos_internal):
Supply check_string_lessp_nokey explicitly as the CHECK_MERGE
argument to list_sort(), NULL no longer works. Thank you Mats
Lidell in IRC!
diff -r 94bbd4792049 -r b5561bfd5061 src/ChangeLog
--- a/src/ChangeLog Sat Feb 05 12:04:34 2011 +0000
+++ b/src/ChangeLog Sun Feb 06 23:46:17 2011 +0000
＠＠ -1,3 +1,10 ＠＠
+2011-02-06 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * symbols.c (Fapropos_internal):
+ Supply check_string_lessp_nokey explicitly as the CHECK_MERGE
+ argument to list_sort(), NULL no longer works. Thank you Mats
+ Lidell in IRC!
+
2011-02-05 Aidan Kehoe <kehoea(a)parhasard.net>
* fns.c:
diff -r 94bbd4792049 -r b5561bfd5061 src/symbols.c
--- a/src/symbols.c Sat Feb 05 12:04:34 2011 +0000
+++ b/src/symbols.c Sun Feb 06 23:46:17 2011 +0000
＠＠ -508,8 +508,8 ＠＠
closure.accumulation = Qnil;
GCPRO1 (closure.accumulation);
map_obarray (Vobarray, apropos_mapper, &closure);
- closure.accumulation = list_sort (closure.accumulation, NULL, Qstring_lessp,
- Qidentity);
+ closure.accumulation = list_sort (closure.accumulation,
+ check_string_lessp_nokey, Qnil, Qnil);
UNGCPRO;
return closure.accumulation;
}
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments