Mercurial > hg > xemacs-beta

comparison src/mule-charset.c @ 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 3ba90c659d01
children 980575c76541 fd36a980d701 c12b646d84ee e0db3c197671
comparison
equal deleted inserted replaced
4744:17f7e9191c0b 4745:0c54de4c4b9d
585 if (final < '0' || final > '~') 585 if (final < '0' || final > '~')
586 invalid_constant ("Invalid value for `final'", value); 586 invalid_constant ("Invalid value for `final'", value);
587 } 587 }
588 else if (EQ (keyword, Qccl_program)) 588 else if (EQ (keyword, Qccl_program))
589 { 589 {
590 struct ccl_program test_ccl; 590 /* This errors if VALUE is not a valid CCL program. */
591 591 ccl_program = get_ccl_program (value);
592 if (setup_ccl_program (&test_ccl, value) < 0)
593 invalid_argument ("Invalid value for `ccl-program'", value);
594 ccl_program = value;
595 } 592 }
596 else 593 else
597 invalid_constant ("Unrecognized property", keyword); 594 invalid_constant ("Unrecognized property", keyword);
598 } 595 }
599 } 596 }
872 (charset, ccl_program)) 869 (charset, ccl_program))
873 { 870 {
874 struct ccl_program test_ccl; 871 struct ccl_program test_ccl;
875 872
876 charset = Fget_charset (charset); 873 charset = Fget_charset (charset);
877 if (setup_ccl_program (&test_ccl, ccl_program) < 0) 874 XCHARSET_CCL_PROGRAM (charset) = get_ccl_program (ccl_program);
878 invalid_argument ("Invalid ccl-program", ccl_program); 875
879 XCHARSET_CCL_PROGRAM (charset) = ccl_program;
880 face_property_was_changed (Vdefault_face, Qfont, Qglobal); 876 face_property_was_changed (Vdefault_face, Qfont, Qglobal);
881 return Qnil; 877 return Qnil;
882 } 878 }
883 879
884 void 880 void