Mercurial > hg > xemacs-beta

diff src/mule-ccl.h @ 4745:0c54de4c4b9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly src/ChangeLog addition: 2009-11-15 Aidan Kehoe <kehoea@parhasard.net> * mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always have a symbol in this macro. (setup_ccl_program): Ensure we're not allocating unreachable memory in this function; all symbols must have been resolved in a given CCL program before this function is called. (find_ccl_program): New function, return a CCL program with all its symbols resolved if it is valid (possibly allocating memory), Qnil otherwise. (get_ccl_program): New function, exported to other files; call find_ccl_program, and error if it gives nil. (Fccl_program_p): Call find_ccl_program from this function instead of implementing the bulk of it here. (Fccl_execute): Call get_ccl_program instead of implementing the bulk of it here. (Fccl_execute_on_string): Ditto. * mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration, it hasn't been used in years. (get_ccl_program): Declare this function. * mule-coding.c (ccl_putprop): Use get_ccl_program on any specified encode or decode CCL program property. (fixed_width_putprop): Ditto. * mule-charset.c (Fmake_charset): Use get_ccl_program on any specified ccl-program. (Fset_charset_ccl_program): Ditto.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 15 Nov 2009 16:53:14 +0000
parents 023b83f4e54b
children 308d34e9f07d
line wrap: on
line diff
--- a/src/mule-ccl.h	Sun Nov 15 14:59:53 2009 +0000
+++ b/src/mule-ccl.h	Sun Nov 15 16:53:14 2009 +0000
@@ -69,12 +69,24 @@
 					   line-feed.  */
 #define CCL_CODING_EOL_CR	2	/* Carriage-return only.  */
 
-/* Alist of fontname patterns vs corresponding CCL program.  */
-extern Lisp_Object Vfont_ccl_encoder_alist;
+/* 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.
 
-/* Setup fields of the structure pointed by CCL appropriately for the
-   execution of ccl program CCL_PROG (symbol or vector).  */
-extern int setup_ccl_program (struct ccl_program *, Lisp_Object);
+   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);