comparison src/mule-ccl.c @ 563:183866b06e0b

[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 0784d089fdc9
children e9162e1ea200
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
1991 { 1991 {
1992 struct ccl_program ccl; 1992 struct ccl_program ccl;
1993 int i; 1993 int i;
1994 1994
1995 if (setup_ccl_program (&ccl, ccl_prog) < 0) 1995 if (setup_ccl_program (&ccl, ccl_prog) < 0)
1996 error ("Invalid CCL program"); 1996 syntax_error ("Invalid CCL program", Qunbound);
1997 1997
1998 CHECK_VECTOR (reg); 1998 CHECK_VECTOR (reg);
1999 if (XVECTOR_LENGTH (reg) != 8) 1999 if (XVECTOR_LENGTH (reg) != 8)
2000 error ("Length of vector REGISTERS is not 8"); 2000 syntax_error ("Length of vector REGISTERS is not 8", Qunbound);
2001 2001
2002 for (i = 0; i < 8; i++) 2002 for (i = 0; i < 8; i++)
2003 ccl.reg[i] = (INTP (XVECTOR_DATA (reg)[i]) 2003 ccl.reg[i] = (INTP (XVECTOR_DATA (reg)[i])
2004 ? XINT (XVECTOR_DATA (reg)[i]) 2004 ? XINT (XVECTOR_DATA (reg)[i])
2005 : 0); 2005 : 0);
2007 ccl_driver (&ccl, (const unsigned char *)0, 2007 ccl_driver (&ccl, (const unsigned char *)0,
2008 (unsigned_char_dynarr *)0, 0, (int *)0, 2008 (unsigned_char_dynarr *)0, 0, (int *)0,
2009 CCL_MODE_ENCODING); 2009 CCL_MODE_ENCODING);
2010 QUIT; 2010 QUIT;
2011 if (ccl.status != CCL_STAT_SUCCESS) 2011 if (ccl.status != CCL_STAT_SUCCESS)
2012 error ("Error in CCL program at %dth code", ccl.ic); 2012 signal_error (Qccl_error, "Error in CCL program at code numbered ...", make_int (ccl.ic));
2013 2013
2014 for (i = 0; i < 8; i++) 2014 for (i = 0; i < 8; i++)
2015 XSETINT (XVECTOR (reg)->contents[i], ccl.reg[i]); 2015 XSETINT (XVECTOR (reg)->contents[i], ccl.reg[i]);
2016 return Qnil; 2016 return Qnil;
2017 } 2017 }
2048 int i, produced; 2048 int i, produced;
2049 unsigned_char_dynarr *outbuf; 2049 unsigned_char_dynarr *outbuf;
2050 struct gcpro gcpro1, gcpro2; 2050 struct gcpro gcpro1, gcpro2;
2051 2051
2052 if (setup_ccl_program (&ccl, ccl_prog) < 0) 2052 if (setup_ccl_program (&ccl, ccl_prog) < 0)
2053 error ("Invalid CCL program"); 2053 syntax_error ("Invalid CCL program", Qunbound);
2054 2054
2055 CHECK_VECTOR (status); 2055 CHECK_VECTOR (status);
2056 if (XVECTOR (status)->size != 9) 2056 if (XVECTOR (status)->size != 9)
2057 error ("Length of vector STATUS is not 9"); 2057 syntax_error ("Length of vector STATUS is not 9", Qunbound);
2058 CHECK_STRING (string); 2058 CHECK_STRING (string);
2059 2059
2060 GCPRO2 (status, string); 2060 GCPRO2 (status, string);
2061 2061
2062 for (i = 0; i < 8; i++) 2062 for (i = 0; i < 8; i++)
2085 2085
2086 val = make_string (Dynarr_atp (outbuf, 0), produced); 2086 val = make_string (Dynarr_atp (outbuf, 0), produced);
2087 Dynarr_free (outbuf); 2087 Dynarr_free (outbuf);
2088 QUIT; 2088 QUIT;
2089 if (ccl.status == CCL_STAT_SUSPEND_BY_DST) 2089 if (ccl.status == CCL_STAT_SUSPEND_BY_DST)
2090 error ("Output buffer for the CCL programs overflow"); 2090 signal_error (Qccl_error, "Output buffer for the CCL programs overflow", Qunbound);
2091 if (ccl.status != CCL_STAT_SUCCESS 2091 if (ccl.status != CCL_STAT_SUCCESS
2092 && ccl.status != CCL_STAT_SUSPEND_BY_SRC) 2092 && ccl.status != CCL_STAT_SUSPEND_BY_SRC)
2093 error ("Error in CCL program at %dth code", ccl.ic); 2093 signal_error (Qccl_error, "Error in CCL program at code numbered...", make_int (ccl.ic));
2094 2094
2095 return val; 2095 return val;
2096 } 2096 }
2097 2097
2098 DEFUN ("register-ccl-program", Fregister_ccl_program, 2098 DEFUN ("register-ccl-program", Fregister_ccl_program,
2239 vars_of_mule_ccl (void) 2239 vars_of_mule_ccl (void)
2240 { 2240 {
2241 staticpro (&Vccl_program_table); 2241 staticpro (&Vccl_program_table);
2242 Vccl_program_table = Fmake_vector (make_int (32), Qnil); 2242 Vccl_program_table = Fmake_vector (make_int (32), Qnil);
2243 2243
2244 defsymbol (&Qccl_program, "ccl-program"); 2244 DEFSYMBOL (Qccl_program);
2245 defsymbol (&Qccl_program_idx, "ccl-program-idx"); 2245 DEFSYMBOL (Qccl_program_idx);
2246 defsymbol (&Qcode_conversion_map, "code-conversion-map"); 2246 DEFSYMBOL (Qcode_conversion_map);
2247 defsymbol (&Qcode_conversion_map_id, "code-conversion-map-id"); 2247 DEFSYMBOL (Qcode_conversion_map_id);
2248 2248
2249 DEFVAR_LISP ("code-conversion-map-vector", &Vcode_conversion_map_vector /* 2249 DEFVAR_LISP ("code-conversion-map-vector", &Vcode_conversion_map_vector /*
2250 Vector of code conversion maps. 2250 Vector of code conversion maps.
2251 */ ); 2251 */ );
2252 Vcode_conversion_map_vector = Fmake_vector (make_int (16), Qnil); 2252 Vcode_conversion_map_vector = Fmake_vector (make_int (16), Qnil);