Mercurial > hg > xemacs-beta
view tests/automated/files-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 | 182d01410b8d |
children |
line wrap: on
line source
;; Copyright (C) 2013 Free Software Foundation, Inc. ;; Author: Mats Lidell <matsl@xemacs.org> ;; Maintainer: ;; Created: 2013 ;; 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 tag support. ;; See test-harness.el for instructions on how to run these tests. (require 'test-harness) ;; Require a newline on save (let ((test-file-name (make-temp-file "files-tests")) (require-final-newline t)) (find-file test-file-name) (erase-buffer) (insert "no newline") (Silence-Message (save-buffer 0)) (Assert (equal (buffer-string) "no newline\n")) (kill-buffer nil) (delete-file test-file-name)) ;; Don't require a newline on save (let ((test-file-name (make-temp-file "files-tests")) (require-final-newline nil)) (find-file test-file-name) (erase-buffer) (insert "no newline") (Silence-Message (save-buffer 0)) (Assert (equal (buffer-string) "no newline")) (kill-buffer nil) (delete-file test-file-name)) ;; Require a newline on visit (not on save) ;; Answer query when saving with both no and yes. (let ((test-file-name (make-temp-file "files-tests")) (require-final-newline nil)) (find-file test-file-name) (erase-buffer) (insert "no newline") (Silence-Message (save-buffer 0)) (kill-buffer nil) (let ((require-final-newline 'visit)) (find-file test-file-name) (Assert (equal (buffer-string) "no newline\n")) ;; Answer no (erase-buffer) (insert "no newline") (flet ((y-or-n-p (prompt) nil)) (Silence-Message (save-buffer 0))) (Assert (equal (buffer-string) "no newline")) ;; Answer yes (erase-buffer) (insert "no newline") (flet ((y-or-n-p (prompt) t)) (Silence-Message (save-buffer 0))) (Assert (equal (buffer-string) "no newline\n"))) (kill-buffer nil) (delete-file test-file-name)) ;; Require a newline on visit and save (let ((test-file-name (make-temp-file "files-tests")) (require-final-newline nil)) (find-file test-file-name) (erase-buffer) (insert "no newline") (Silence-Message (save-buffer 0)) (kill-buffer nil) (let ((require-final-newline 'visit-save)) (find-file test-file-name) (Assert (equal (buffer-string) "no newline\n")) (erase-buffer) (insert "no newline") (Silence-Message (save-buffer 0)) (Assert (equal (buffer-string) "no newline\n"))) (kill-buffer nil) (delete-file test-file-name)) ;; mode-require-final-newline is respected by text-mode (let ((test-file-name (make-temp-file "files-tests")) (require-final-newline nil) (mode-require-final-newline t)) (Assert (equal require-final-newline nil)) (find-file test-file-name) (erase-buffer) (text-mode) (Assert (equal require-final-newline t)) (insert "no newline") (Silence-Message (save-buffer 0)) (Assert (equal (buffer-string) "no newline\n")) (kill-buffer nil) (delete-file test-file-name))