Mercurial > hg > xemacs-beta
view src/mule-ccl.h @ 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 | 308d34e9f07d |
children |
line wrap: on
line source
/* Header for CCL (Code Conversion Language) interpreter. Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. 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/>. */ #ifndef INCLUDED_mule_ccl_h_ #define INCLUDED_mule_ccl_h_ /* Macros for exit status of CCL program. */ #define CCL_STAT_SUCCESS 0 /* Terminated successfully. */ #define CCL_STAT_SUSPEND_BY_SRC 1 /* Terminated by empty input. */ #define CCL_STAT_SUSPEND_BY_DST 2 /* Terminated by output buffer full. */ #define CCL_STAT_INVALID_CMD 3 /* Terminated because of invalid command. */ #define CCL_STAT_QUIT 4 /* Terminated because of quit. */ /* Structure to hold information about running CCL code. Read comments in the file ccl.c for the detail of each field. */ struct ccl_program { int size; /* Size of the compiled code. */ Lisp_Object *prog; /* Pointer into the compiled code. */ int ic; /* Instruction Counter (index for PROG). */ int eof_ic; /* Instruction Counter for end-of-file processing code. */ int reg[8]; /* CCL registers, reg[7] is used for condition flag of relational operations. */ int private_state; /* CCL instruction may use this for private use, mainly for saving internal states on suspending. This variable is set to 0 when ccl is set up. */ int last_block; /* Set to 1 while processing the last block. */ int status; /* Exit status of the CCL program. */ int buf_magnification; /* Output buffer magnification. How many times bigger the output buffer should be than the input buffer. */ int stack_idx; /* How deep the call of CCL_Call is nested. */ int eol_type; /* When the CCL program is used for encoding by a coding system, set to the eol_type of the coding system. */ int multibyte; /* 1 if the source text is multibyte. */ }; #define CCL_MODE_ENCODING 0 #define CCL_MODE_DECODING 1 #define CCL_CODING_EOL_LF 0 /* Line-feed only, same as Emacs' internal format. */ #define CCL_CODING_EOL_CRLF 1 /* Sequence of carriage-return and line-feed. */ #define CCL_CODING_EOL_CR 2 /* Carriage-return only. */ /* If OBJECT is symbol designating a registered CCL program, return it. Else if OBJECT is a vector CCL program with no unresolved symbols, return it. Else, if OBJECT is a vector CCL program with unresolved symbols, return a newly-created vector reflecting the CCL program with all symbols resolved, if that is currently possible in this XEmacs. Otherwise, signal `invalid-argument'. */ extern Lisp_Object get_ccl_program (Lisp_Object object); /* Set up fields of the structure pointed by CCL appropriately for the execution of ccl program CCL_PROG (a symbol or a vector). If CCL_PROG is a vector and contains unresolved symbols, this function will throw an assertion failure. To avoid this, call get_ccl_program at the point that you receive the CCL program from Lisp, and use and store its (resolved) result instead. */ extern int setup_ccl_program (struct ccl_program *, Lisp_Object ccl_prog); extern int ccl_driver (struct ccl_program *, const unsigned char *, unsigned_char_dynarr *, int, int *, int); EXFUN (Fregister_ccl_program, 2); extern Lisp_Object Qccl_program; /* Vector of CCL program names vs corresponding program data. */ extern Lisp_Object Vccl_program_table; /* Symbols of ccl program have this property, a value of the property is an index for Vccl_program_table. */ extern Lisp_Object Qccl_program_idx; #endif /* INCLUDED_mule_ccl_h_ */