Mercurial > hg > xemacs-beta

diff tests/automated/lisp-tests.el @ 5574:d4f334808463

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support inlining labels, bytecomp.el. lisp/ChangeLog addition: 2011-10-02 Aidan Kehoe <kehoea@parhasard.net> * bytecomp.el (byte-compile-initial-macro-environment): Add #'declare to this, so it doesn't need to rely on #'cl-compiling file to determine when we're byte-compiling. Update #'labels to support declaring labels inline, as Common Lisp requires. * bytecomp.el (byte-compile-function-form): Don't error if FUNCTION is quoting a non-lambda, non-symbol, just return it. * cl-extra.el (cl-macroexpand-all): If a label name has been quoted, expand to the label placeholder quoted with 'function. This allows the byte compiler to distinguish between uses of the placeholder as data and uses in contexts where it should be inlined. * cl-macs.el: * cl-macs.el (cl-do-proclaim): When proclaming something as inline, if it is bound as a label, don't modify the symbol's plist; instead, treat the first element of its placeholder constant vector as a place to store compile information. * cl-macs.el (declare): Leave processing declarations while compiling to the implementation of #'declare in byte-compile-initial-macro-environment. tests/ChangeLog addition: 2011-10-02 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: * automated/lisp-tests.el (+): Test #'labels and inlining.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 02 Oct 2011 15:32:16 +0100
parents 58b38d5b32d0
children 071b810ceb18
line wrap: on
line diff
--- a/tests/automated/lisp-tests.el	Sun Sep 25 16:12:07 2011 +0100
+++ b/tests/automated/lisp-tests.el	Sun Oct 02 15:32:16 2011 +0100
@@ -2939,4 +2939,50 @@
   (Check-Error wrong-number-of-arguments (apply-partially))
   (Assert (equal (funcall construct-list) '(5 6 7))))
 
+;; Test labels and inlining.
+(labels
+    ((+ (&rest arguments)
+       ;; Shades of Java, hah.
+       (mapconcat #'prin1-to-string arguments ", "))
+     (print-with-commas (stream one two three four five)
+       (princ (+ one two three four five) stream))
+     (bookend (open close &rest arguments)
+       (refer-to-bookend (concat open (apply #'+ arguments) close)))
+     (refer-to-bookend (string)
+       (bookend "[" "]" string "hello" "there")))
+  (declare (inline + print-with-commas bookend refer-to-bookend))
+  (macrolet
+      ((with-first-arguments (&optional form)
+        (append form (list 1 [hi there] 40 "this is a string" pi)))
+       (with-second-arguments (&optional form)
+         (append form (list pi e ''hello ''there [40 50 60])))
+       (with-both-arguments (&optional form)
+         (append form
+                 (macroexpand '(with-first-arguments))
+                 (macroexpand '(with-second-arguments)))))
+
+    (with-temp-buffer
+      (Assert
+       (equal
+        (mapconcat #'prin1-to-string (with-first-arguments (list)) ", ")
+        (with-first-arguments (print-with-commas (current-buffer))))
+     "checking print-with-commas gives the expected result")
+      (Assert
+       (or
+        (not (compiled-function-p (indirect-function #'print-with-commas)))
+        (notany #'compiled-function-p
+                (compiled-function-constants
+                 (indirect-function #'print-with-commas))))
+       "checking the label + was inlined correctly")
+      (insert ", ")
+      ;; This call to + will be inline in compiled code, but there's
+      ;; no easy way for us to check that:
+      (Assert (null (insert (with-second-arguments (+)))))
+      (Assert (equal
+               (mapconcat #'prin1-to-string (with-both-arguments (list)) ", ")
+               (buffer-string))
+              "checking the buffer contents are as expected at the end.")
+      (Assert (not (funcall (intern "eq") #'bookend #'refer-to-bookend))
+	      "checking two mutually recursive functions compiled OK"))))
+
 ;;; end of lisp-tests.el