Mercurial > hg > xemacs-beta
view tests/automated/byte-compiler-tests.el @ 5776:65d65b52d608
Pass character count from coding systems to buffer insertion code.
src/ChangeLog addition:
2014-01-16 Aidan Kehoe <kehoea@parhasard.net>
Pass character count information from the no-conversion and
unicode coding systems to the buffer insertion code, making
#'find-file on large buffers a little snappier (if
ERROR_CHECK_TEXT is not defined).
* file-coding.c:
* file-coding.c (coding_character_tell): New.
* file-coding.c (conversion_coding_stream_description): New.
* file-coding.c (no_conversion_convert):
Update characters_seen when decoding.
* file-coding.c (no_conversion_character_tell): New.
* file-coding.c (lstream_type_create_file_coding): Create the
no_conversion type with data.
* file-coding.c (coding_system_type_create):
Make the character_tell method available here.
* file-coding.h:
* file-coding.h (struct coding_system_methods):
Add a new character_tell() method, passing charcount information
from the coding systems to the buffer code, avoiding duplicate
bytecount-to-charcount work especially with large buffers.
* fileio.c (Finsert_file_contents_internal):
Update this to pass charcount information to
buffer_insert_string_1(), if that is available from the lstream code.
* insdel.c:
* insdel.c (buffer_insert_string_1):
Add a new CCLEN argument, giving the character count of the string
to insert. It can be -1 to indicate that te function should work
it out itself using bytecount_to_charcount(), as it used to.
* insdel.c (buffer_insert_raw_string_1):
* insdel.c (buffer_insert_lisp_string_1):
* insdel.c (buffer_insert_ascstring_1):
* insdel.c (buffer_insert_emacs_char_1):
* insdel.c (buffer_insert_from_buffer_1):
* insdel.c (buffer_replace_char):
Update these functions to use the new calling convention.
* insdel.h:
* insdel.h (buffer_insert_string):
Update this header to reflect the new buffer_insert_string_1()
argument.
* lstream.c (Lstream_character_tell): New.
Return the number of characters *read* and seen by the consumer so
far, taking into account the unget buffer, and buffered reading.
* lstream.c (Lstream_unread):
Update unget_character_count here as appropriate.
* lstream.c (Lstream_rewind):
Reset unget_character_count here too.
* lstream.h:
* lstream.h (struct lstream):
Provide the character_tell method, add a new field,
unget_character_count, giving the number of characters ever passed
to Lstream_unread().
Declare Lstream_character_tell().
Make Lstream_ungetc(), which happens to be unused, an inline
function rather than a macro, in the course of updating it to
modify unget_character_count.
* print.c (output_string):
Use the new argument to buffer_insert_string_1().
* tests.c:
* tests.c (Ftest_character_tell):
New test function.
* tests.c (syms_of_tests):
Make it available.
* unicode.c:
* unicode.c (struct unicode_coding_stream):
* unicode.c (unicode_character_tell):
New method.
* unicode.c (unicode_convert):
Update the character counter as appropriate.
* unicode.c (coding_system_type_create_unicode):
Make the character_tell method available.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 16 Jan 2014 16:27:52 +0000 |
parents | ac37a5f7e5be |
children |
line wrap: on
line source
;; Copyright (C) 1998 Free Software Foundation, Inc. ;; Author: Martin Buchholz <martin@xemacs.org> ;; Maintainer: Martin Buchholz <martin@xemacs.org> ;; Created: 1998 ;; Keywords: tests ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: Not in FSF. ;;; Commentary: ;;; Test byte-compiler functionality ;;; See test-harness.el (condition-case err (require 'test-harness) (file-error (when (and (boundp 'load-file-name) (stringp load-file-name)) (push (file-name-directory load-file-name) load-path) (require 'test-harness)))) (require 'bytecomp) ;; test constant symbol warnings (defmacro check-byte-compiler-message (message-regexp &rest body) `(Check-Message ,message-regexp (byte-compile '(lambda () ,@body)))) (check-byte-compiler-message "Attempt to set non-symbol" (setq 1 1)) (check-byte-compiler-message "Attempt to set constant symbol" (setq t 1)) (check-byte-compiler-message "Attempt to set constant symbol" (setq nil 1)) (check-byte-compiler-message "Attempt to set constant symbol" (defconst :foo 1)) (check-byte-compiler-message "Attempt to let-bind non-symbol" (let ((1 'x)) 1)) (check-byte-compiler-message "Attempt to let-bind constant symbol" (let ((t 'x)) (foo))) (check-byte-compiler-message "Attempt to let-bind constant symbol" (let ((nil 'x)) (foo))) (check-byte-compiler-message "Attempt to let-bind constant symbol" (let ((:foo 'x)) (foo))) (check-byte-compiler-message "bound but not referenced" (let ((foo 'x)) 1)) (Assert (not (boundp 'free-variable))) (Assert (boundp 'byte-compile-warnings)) (check-byte-compiler-message "assignment to free variable" (setq free-variable 1)) (check-byte-compiler-message "reference to free variable" (car free-variable)) (check-byte-compiler-message "called with 2 args, but requires 1" (car 'x 'y)) (let ((fun '(lambda () (setq :foo 1)))) (fset 'test-byte-compiler-fun fun)) (Check-Error setting-constant (test-byte-compiler-fun)) (Check-Message "Attempt to set constant symbol" (byte-compile 'test-byte-compiler-fun)) ;; Once NEED_TO_HANDLE_21_4_CODE is no longer defined in C, this will error ;; correctly. It's disabled because the packages are compiled by 21.4. (Known-Bug-Expect-Failure (Check-Error setting-constant (test-byte-compiler-fun))) (eval-when-compile (defvar setq-test-foo nil) (defvar setq-test-bar nil)) (progn (check-byte-compiler-message "set called with 1 arg, but requires 2" (setq setq-test-foo)) (check-byte-compiler-message "set called with 1 arg, but requires 2" (setq setq-test-foo 1 setq-test-bar)) (check-byte-compiler-message "set-default called with 1 arg, but requires 2" (setq-default setq-test-foo)) (check-byte-compiler-message "set-default called with 1 arg, but requires 2" (setq-default setq-test-foo 1 setq-test-bar)) ) ;;----------------------------------------------------- ;; let, let* ;;----------------------------------------------------- ;; Test interpreted and compiled lisp separately here (check-byte-compiler-message "malformed let binding" (let ((x 1 2)) 3)) (check-byte-compiler-message "malformed let binding" (let* ((x 1 2)) 3)) (Check-Error-Message error "`let' bindings can have only one value-form" (eval '(let ((x 1 2)) 3))) (Check-Error-Message error "`let' bindings can have only one value-form" (eval '(let* ((x 1 2)) 3))) (defmacro before-and-after-compile-equal (&rest form) `(Assert (equal (funcall (quote (lambda () ,@form))) (funcall (byte-compile (quote (lambda () ,@form))))))) (defvar simplyamarker (point-min-marker)) ;; The byte optimizer must be careful with +/- with a single argument. (before-and-after-compile-equal (+)) (before-and-after-compile-equal (+ 2 2)) (before-and-after-compile-equal (+ 2 1)) (before-and-after-compile-equal (+ 1 2)) ;; (+ 1) is OK. but (+1) signals an error. (before-and-after-compile-equal (+ 1)) (before-and-after-compile-equal (+ 3)) (before-and-after-compile-equal (+ simplyamarker 1)) ;; The optimization (+ m) --> m is invalid when m is a marker. ;; Currently the following test fails - controversial. ;; (before-and-after-compile-equal (+ simplyamarker)) ;; Same tests for minus. (before-and-after-compile-equal (- 2 2)) (before-and-after-compile-equal (- 2 1)) (before-and-after-compile-equal (- 1 2)) (before-and-after-compile-equal (- 1)) (before-and-after-compile-equal (- 3)) (before-and-after-compile-equal (- simplyamarker 1)) (before-and-after-compile-equal (- simplyamarker)) (before-and-after-compile-equal (let ((z 1)) (or (setq z 42)) z)) ;; byte-after-unbind-ops ;; byte-constant ;; byte-dup ;; byte-symbolp (before-and-after-compile-equal (let ((x 's)) (unwind-protect (symbolp x) (setq x 1)))) ;; byte-consp (before-and-after-compile-equal (let ((x '(a b))) (unwind-protect (consp x) (setq x 1)))) ;; byte-stringp (before-and-after-compile-equal (let ((x "a")) (unwind-protect (stringp x) (setq x 1)))) ;; byte-listp (before-and-after-compile-equal (let ((x '(a b c))) (unwind-protect (listp x) (setq x 1)))) ;; byte-numberp (before-and-after-compile-equal (let ((x 1)) (unwind-protect (numberp x) (setq x nil)))) ;; byte-integerp (before-and-after-compile-equal (let ((x 1)) (unwind-protect (integerp x) (setq x nil)))) ;; byte-equal (before-and-after-compile-equal (let ((x 'a) (y 'a)) (unwind-protect (eq x y) (setq x 'c)))) ;; byte-not (before-and-after-compile-equal (let (x) (unwind-protect (not x) (setq x t)))) ;; byte-cons (before-and-after-compile-equal (equal '(1 . 2) (let ((x 1) (y 2)) (unwind-protect (cons x y) (setq x t))))) ;; byte-list1 (before-and-after-compile-equal (equal '(1) (let ((x 1)) (unwind-protect (list x) (setq x t))))) ;; byte-list2 (before-and-after-compile-equal (equal '(1 . 2) (let ((x 1) (y 2)) (unwind-protect (list x y) (setq x t))))) ;; byte-interactive-p ;; byte-equal (before-and-after-compile-equal (let (x y) (setq x '(1 . 2)) (setq y '(1 . 2)) (unwind-protect (equal x y) (setq y '(1 . 3)))))