Mercurial > hg > xemacs-beta
view src/doprnt.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 4ec724310f33 |
children | 3d8143fc88e1 |
line wrap: on
line source
/* Output like sprintf to a buffer of specified size. Also takes args differently: pass one pointer to an array of strings in addition to the format string which is separate. Copyright (C) 1995 Free Software Foundation, Inc. Copyright (C) 2001, 2002 Ben Wing. Rewritten by mly to use varargs.h. Rewritten from scratch by Ben Wing (February 1995) for Mule; expanded to full printf spec. Support for bignums, ratios, and bigfloats added April 2004 by Jerry James. 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Rewritten by Ben Wing. Not in FSF. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "lstream.h" static const char * const valid_flags = "-+ #0"; static const char * const valid_converters = "dic" "ouxX" "feEgG" "sS" #if defined(HAVE_BIGNUM) || defined(HAVE_RATIO) "npyY" #endif #ifdef HAVE_BIGFLOAT "FhHkK" #endif ; static const char * const int_converters = "dic"; static const char * const unsigned_int_converters = "ouxX"; static const char * const double_converters = "feEgG"; static const char * const string_converters = "sS"; #if defined(HAVE_BIGNUM) || defined(HAVE_RATIO) static const char * const bignum_converters = "npyY"; #endif #ifdef HAVE_BIGFLOAT static const char * const bigfloat_converters = "FhHkK"; #endif typedef struct printf_spec printf_spec; struct printf_spec { int argnum; /* which argument does this spec want? This is one-based: The first argument given is numbered 1, the second is 2, etc. This is to handle %##$x-type specs. */ int minwidth; int precision; unsigned int minus_flag:1; unsigned int plus_flag:1; unsigned int space_flag:1; unsigned int number_flag:1; unsigned int zero_flag:1; unsigned int h_flag:1; unsigned int l_flag:1; unsigned int forwarding_precision:1; char converter; /* converter character or 0 for dummy marker indicating literal text at the end of the specification */ Bytecount text_before; /* position of the first character of the block of literal text before this spec */ Bytecount text_before_len; /* length of that text */ }; typedef union printf_arg printf_arg; union printf_arg { long l; unsigned long ul; double d; Ibyte *bp; Lisp_Object obj; }; /* We maintain a list of all the % specs in the specification, along with the offset and length of the block of literal text before each spec. In addition, we have a "dummy" spec that represents all the literal text at the end of the specification. Its converter is 0. */ typedef struct { Dynarr_declare (struct printf_spec); } printf_spec_dynarr; typedef struct { Dynarr_declare (union printf_arg); } printf_arg_dynarr; /* Append STRING (of length LEN bytes) to STREAM. MINLEN is the minimum field width. If MINUS_FLAG is set, left-justify the string in its field; otherwise, right-justify. If ZERO_FLAG is set, pad with 0's; otherwise pad with spaces. If MAXLEN is non-negative, the string is first truncated on the right to that many characters. Note that MINLEN and MAXLEN are Charcounts but LEN is a Bytecount. */ static void doprnt_2 (Lisp_Object stream, const Ibyte *string, Bytecount len, Charcount minlen, Charcount maxlen, int minus_flag, int zero_flag) { Lstream *lstr = XLSTREAM (stream); Charcount cclen = bytecount_to_charcount (string, len); int to_add = minlen - cclen; /* Padding at beginning to right-justify ... */ if (!minus_flag) while (to_add-- > 0) Lstream_putc (lstr, zero_flag ? '0' : ' '); if (0 <= maxlen && maxlen < cclen) len = charcount_to_bytecount (string, maxlen); Lstream_write (lstr, string, len); /* Padding at end to left-justify ... */ if (minus_flag) while (to_add-- > 0) Lstream_putc (lstr, zero_flag ? '0' : ' '); } static const Ibyte * parse_off_posnum (const Ibyte *start, const Ibyte *end, int *returned_num) { Ibyte arg_convert[100]; REGISTER Ibyte *arg_ptr = arg_convert; *returned_num = -1; while (start != end && isdigit (*start)) { if (arg_ptr - arg_convert >= (int) sizeof (arg_convert) - 1) syntax_error ("Format converter number too large", Qunbound); *arg_ptr++ = *start++; } *arg_ptr = '\0'; if (arg_convert != arg_ptr) *returned_num = atoi ((char *) arg_convert); return start; } #define NEXT_ASCII_BYTE(ch) \ do { \ if (fmt == fmt_end) \ syntax_error ("Premature end of format string", Qunbound); \ ch = *fmt; \ if (ch >= 0200) \ syntax_error ("Non-ASCII character in format converter spec", \ Qunbound); \ fmt++; \ } while (0) #define RESOLVE_FLAG_CONFLICTS(spec) \ do { \ if (spec.space_flag && spec.plus_flag) \ spec.space_flag = 0; \ if (spec.zero_flag && spec.space_flag) \ spec.zero_flag = 0; \ } while (0) static printf_spec_dynarr * parse_doprnt_spec (const Ibyte *format, Bytecount format_length) { const Ibyte *fmt = format; const Ibyte *fmt_end = format + format_length; printf_spec_dynarr *specs = Dynarr_new (printf_spec); int prev_argnum = 0; while (1) { struct printf_spec spec; const Ibyte *text_end; Ibyte ch; xzero (spec); if (fmt == fmt_end) return specs; text_end = (Ibyte *) memchr (fmt, '%', fmt_end - fmt); if (!text_end) text_end = fmt_end; spec.text_before = fmt - format; spec.text_before_len = text_end - fmt; fmt = text_end; if (fmt != fmt_end) { fmt++; /* skip over % */ /* A % is special -- no arg number. According to ANSI specs, field width does not apply to %% conversion. */ if (fmt != fmt_end && *fmt == '%') { spec.converter = '%'; Dynarr_add (specs, spec); fmt++; continue; } /* Is there a field number specifier? */ { const Ibyte *ptr; int fieldspec; ptr = parse_off_posnum (fmt, fmt_end, &fieldspec); if (fieldspec > 0 && ptr != fmt_end && *ptr == '$') { /* There is a format specifier */ prev_argnum = fieldspec; fmt = ptr + 1; } else prev_argnum++; spec.argnum = prev_argnum; } /* Parse off any flags */ NEXT_ASCII_BYTE (ch); while (strchr (valid_flags, ch)) { switch (ch) { case '-': spec.minus_flag = 1; break; case '+': spec.plus_flag = 1; break; case ' ': spec.space_flag = 1; break; case '#': spec.number_flag = 1; break; case '0': spec.zero_flag = 1; break; default: abort (); } NEXT_ASCII_BYTE (ch); } /* Parse off the minimum field width */ fmt--; /* back up */ /* * * means the field width was passed as an argument. * Mark the current spec as one that forwards its * field width and flags to the next spec in the array. * Then create a new spec and continue with the parsing. */ if (fmt != fmt_end && *fmt == '*') { spec.converter = '*'; RESOLVE_FLAG_CONFLICTS(spec); Dynarr_add (specs, spec); xzero (spec); spec.argnum = ++prev_argnum; fmt++; } else { fmt = parse_off_posnum (fmt, fmt_end, &spec.minwidth); if (spec.minwidth == -1) spec.minwidth = 0; } /* Parse off any precision specified */ NEXT_ASCII_BYTE (ch); if (ch == '.') { /* * * means the precision was passed as an argument. * Mark the current spec as one that forwards its * fieldwidth, flags and precision to the next spec in * the array. Then create a new spec and continue * with the parse. */ if (fmt != fmt_end && *fmt == '*') { spec.converter = '*'; spec.forwarding_precision = 1; RESOLVE_FLAG_CONFLICTS(spec); Dynarr_add (specs, spec); xzero (spec); spec.argnum = ++prev_argnum; fmt++; } else { fmt = parse_off_posnum (fmt, fmt_end, &spec.precision); if (spec.precision == -1) spec.precision = 0; } NEXT_ASCII_BYTE (ch); } else /* No precision specified */ spec.precision = -1; /* Parse off h or l flag */ if (ch == 'h' || ch == 'l') { if (ch == 'h') spec.h_flag = 1; else spec.l_flag = 1; NEXT_ASCII_BYTE (ch); } if (!strchr (valid_converters, ch)) syntax_error ("Invalid converter character", make_char (ch)); spec.converter = ch; } RESOLVE_FLAG_CONFLICTS(spec); Dynarr_add (specs, spec); } RETURN_NOT_REACHED(specs); /* suppress compiler warning */ } static int get_args_needed (printf_spec_dynarr *specs) { int args_needed = 0; REGISTER int i; /* Figure out how many args are needed. This may be less than the number of specs because a spec could be %% or could be missing (literal text at end of format string) or there could be specs where the field number is explicitly given. We just look for the maximum argument number that's referenced. */ for (i = 0; i < Dynarr_length (specs); i++) { char ch = Dynarr_at (specs, i).converter; if (ch && ch != '%') { int argnum = Dynarr_at (specs, i).argnum; if (argnum > args_needed) args_needed = argnum; } } return args_needed; } static printf_arg_dynarr * get_doprnt_args (printf_spec_dynarr *specs, va_list vargs) { printf_arg_dynarr *args = Dynarr_new (printf_arg); union printf_arg arg; REGISTER int i; int args_needed = get_args_needed (specs); xzero (arg); for (i = 1; i <= args_needed; i++) { int j; char ch; struct printf_spec *spec = 0; for (j = 0; j < Dynarr_length (specs); j++) { spec = Dynarr_atp (specs, j); if (spec->argnum == i) break; } if (j == Dynarr_length (specs)) syntax_error ("No conversion spec for argument", make_int (i)); ch = spec->converter; if (strchr (int_converters, ch)) { if (spec->l_flag) arg.l = va_arg (vargs, long); else /* int even if ch == 'c' or spec->h_flag: "the type used in va_arg is supposed to match the actual type **after default promotions**." Hence we read an int, not a short, if spec->h_flag. */ arg.l = va_arg (vargs, int); } else if (strchr (unsigned_int_converters, ch)) { if (spec->l_flag) arg.ul = va_arg (vargs, unsigned long); else /* unsigned int even if ch == 'c' or spec->h_flag */ arg.ul = (unsigned long) va_arg (vargs, unsigned int); } else if (strchr (double_converters, ch)) arg.d = va_arg (vargs, double); else if (strchr (string_converters, ch)) arg.bp = va_arg (vargs, Ibyte *); #if defined(HAVE_BIGNUM) || defined(HAVE_RATIO) else if (strchr (bignum_converters, ch)) arg.obj = va_arg (vargs, Lisp_Object); #endif #ifdef HAVE_BIGFLOAT else if (strchr (bigfloat_converters, ch)) arg.obj = va_arg (vargs, Lisp_Object); #endif else abort (); Dynarr_add (args, arg); } return args; } /* Most basic entry point into string formatting. Generate output from a format-spec (either a Lisp string FORMAT_RELOC, or a C string FORMAT_NONRELOC of length FORMAT_LENGTH -- which *MUST NOT* come from Lisp string data, unless GC is inhibited). Output goes to STREAM. Returns the number of bytes stored into STREAM. Arguments are either C-type arguments in va_list VARGS, or an array of Lisp objects in LARGS of size NARGS. (Behavior is different in the two cases -- you either get standard sprintf() behavior or `format' behavior.) */ static Bytecount emacs_doprnt_1 (Lisp_Object stream, const Ibyte *format_nonreloc, Bytecount format_length, Lisp_Object format_reloc, int nargs, const Lisp_Object *largs, va_list vargs) { printf_spec_dynarr *specs = 0; printf_arg_dynarr *args = 0; REGISTER int i; int init_byte_count = Lstream_byte_count (XLSTREAM (stream)); int count; if (!NILP (format_reloc)) { format_nonreloc = XSTRING_DATA (format_reloc); format_length = XSTRING_LENGTH (format_reloc); } if (format_length < 0) format_length = (Bytecount) strlen ((const char *) format_nonreloc); specs = parse_doprnt_spec (format_nonreloc, format_length); count = record_unwind_protect_freeing_dynarr (specs); if (largs) { /* allow too many args for string, but not too few */ if (nargs < get_args_needed (specs)) signal_error_1 (Qwrong_number_of_arguments, list3 (Qformat, make_int (nargs), !NILP (format_reloc) ? format_reloc : make_string (format_nonreloc, format_length))); } else { args = get_doprnt_args (specs, vargs); record_unwind_protect_freeing_dynarr (args); } for (i = 0; i < Dynarr_length (specs); i++) { struct printf_spec *spec = Dynarr_atp (specs, i); char ch; /* Copy the text before */ if (!NILP (format_reloc)) /* refetch in case of GC below */ format_nonreloc = XSTRING_DATA (format_reloc); doprnt_2 (stream, format_nonreloc + spec->text_before, spec->text_before_len, 0, -1, 0, 0); ch = spec->converter; if (!ch) continue; if (ch == '%') { doprnt_2 (stream, (Ibyte *) &ch, 1, 0, -1, 0, 0); continue; } /* The char '*' as converter means the field width, precision was specified as an argument. Extract the data and forward it to the next spec, to which it will apply. */ if (ch == '*') { struct printf_spec *nextspec = Dynarr_atp (specs, i + 1); Lisp_Object obj = largs[spec->argnum - 1]; if (INTP (obj)) { if (spec->forwarding_precision) { nextspec->precision = XINT (obj); nextspec->minwidth = spec->minwidth; } else { nextspec->minwidth = XINT (obj); if (XINT (obj) < 0) { spec->minus_flag = 1; nextspec->minwidth = - nextspec->minwidth; } } nextspec->minus_flag = spec->minus_flag; nextspec->plus_flag = spec->plus_flag; nextspec->space_flag = spec->space_flag; nextspec->number_flag = spec->number_flag; nextspec->zero_flag = spec->zero_flag; } continue; } if (largs && (spec->argnum < 1 || spec->argnum > nargs)) syntax_error ("Invalid repositioning argument", make_int (spec->argnum)); else if (ch == 'S' || ch == 's') { Ibyte *string; Bytecount string_len; if (!largs) { string = Dynarr_at (args, spec->argnum - 1).bp; #if 0 /* [[ error() can be called with null string arguments. E.g., in fileio.c, the return value of strerror() is never checked. We'll print (null), like some printf implementations do. Would it be better (and safe) to signal an error instead? Or should we just use the empty string? -dkindred@cs.cmu.edu 8/1997 ]] Do not hide bugs. --ben */ if (!string) string = (Ibyte *) "(null)"; #else assert (string); #endif string_len = strlen ((char *) string); } else { Lisp_Object obj = largs[spec->argnum - 1]; Lisp_Object ls; if (ch == 'S') { /* For `S', prin1 the argument and then treat like a string. */ ls = Fprin1_to_string (obj, Qnil); } else if (STRINGP (obj)) ls = obj; else if (SYMBOLP (obj)) ls = XSYMBOL (obj)->name; else { /* convert to string using princ. */ ls = Fprin1_to_string (obj, Qt); } string = XSTRING_DATA (ls); string_len = XSTRING_LENGTH (ls); } doprnt_2 (stream, string, string_len, spec->minwidth, spec->precision, spec->minus_flag, spec->zero_flag); } else { /* Must be a number. */ union printf_arg arg; if (!largs) { arg = Dynarr_at (args, spec->argnum - 1); } else { Lisp_Object obj = largs[spec->argnum - 1]; if (CHARP (obj)) obj = make_int (XCHAR (obj)); #ifdef WITH_NUMBER_TYPES if (!NUMBERP (obj)) #else if (!INT_OR_FLOATP (obj)) #endif { /* WARNING! This MUST be big enough for the sprintf below */ CIbyte msg[48]; sprintf (msg, "format specifier %%%c doesn't match argument type", ch); syntax_error (msg, Qnil); } else if (strchr (double_converters, ch)) { #ifdef WITH_NUMBER_TYPES if (INTP (obj) || FLOATP (obj)) arg.d = XFLOATINT (obj); #ifdef HAVE_BIGNUM else if (BIGNUMP (obj)) arg.d = bignum_to_double (XBIGNUM_DATA (obj)); #endif #ifdef HAVE_RATIO else if (RATIOP (obj)) arg.d = ratio_to_double (XRATIO_DATA (obj)); #endif #ifdef HAVE_BIGFLOAT else if (BIGFLOATP (obj)) { arg.obj = obj; switch (ch) { case 'f': ch = 'F'; break; case 'e': ch = 'h'; break; case 'E': ch = 'H'; break; case 'g': ch = 'k'; break; case 'G': ch = 'K'; break; } } #endif #else /* !WITH_NUMBER_TYPES */ arg.d = XFLOATINT (obj); #endif /* WITH_NUMBER_TYPES */ } else { if (FLOATP (obj)) obj = Ftruncate (obj); #ifdef HAVE_BIGFLOAT else if (BIGFLOATP (obj)) { #ifdef HAVE_BIGNUM bignum_set_bigfloat (scratch_bignum, XBIGFLOAT_DATA (obj)); if (strchr (unsigned_int_converters, ch) && bignum_sign (scratch_bignum) < 0) dead_wrong_type_argument (Qnonnegativep, obj); obj = Fcanonicalize_number (make_bignum_bg (scratch_bignum)); #else /* !HAVE_BIGNUM */ obj = make_int (bigfloat_to_long (XBIGFLOAT_DATA (obj))); #endif /* HAVE_BIGNUM */ } #endif /* HAVE_BIGFLOAT */ #ifdef HAVE_RATIO else if (RATIOP (obj)) { arg.obj = obj; switch (ch) { case 'i': case 'd': ch = 'n'; break; case 'o': ch = 'p'; break; case 'x': ch = 'y'; break; case 'X': ch = 'Y'; break; default: /* ch == 'u' */ if (strchr (unsigned_int_converters, ch) && ratio_sign (XRATIO_DATA (obj)) < 0) dead_wrong_type_argument (Qnonnegativep, obj); else ch = 'n'; } } #endif #ifdef HAVE_BIGNUM if (BIGNUMP (obj)) { arg.obj = obj; switch (ch) { case 'i': case 'd': ch = 'n'; break; case 'o': ch = 'p'; break; case 'x': ch = 'y'; break; case 'X': ch = 'Y'; break; default: /* ch == 'u' */ if (strchr (unsigned_int_converters, ch) && bignum_sign (XBIGNUM_DATA (obj)) < 0) dead_wrong_type_argument (Qnatnump, obj); else ch = 'n'; } } #endif if (INTP (obj)) { if (strchr (unsigned_int_converters, ch)) { #ifdef HAVE_BIGNUM if (XINT (obj) < 0) dead_wrong_type_argument (Qnatnump, obj); #endif arg.ul = (unsigned long) XUINT (obj); } else arg.l = XINT (obj); } } } if (ch == 'c') { Ichar a; Bytecount charlen; Ibyte charbuf[MAX_ICHAR_LEN]; a = (Ichar) arg.l; if (!valid_ichar_p (a)) { /* WARNING! This MUST be big enough for the sprintf below */ CIbyte msg[60]; sprintf (msg, "invalid character value %d to %%c spec", a); syntax_error (msg, Qnil); } charlen = set_itext_ichar (charbuf, a); doprnt_2 (stream, charbuf, charlen, spec->minwidth, -1, spec->minus_flag, spec->zero_flag); } #if defined(HAVE_BIGNUM) || defined(HAVE_RATIO) else if (strchr (bignum_converters, ch)) { #ifdef HAVE_BIGNUM if (BIGNUMP (arg.obj)) { Ibyte *text_to_print = (Ibyte *) bignum_to_string (XBIGNUM_DATA (arg.obj), ch == 'n' ? 10 : (ch == 'p' ? 8 : 16)); doprnt_2 (stream, text_to_print, strlen ((const char *) text_to_print), spec->minwidth, -1, spec->minus_flag, spec->zero_flag); xfree (text_to_print, Ibyte *); } #endif #ifdef HAVE_RATIO if (RATIOP (arg.obj)) { Ibyte *text_to_print = (Ibyte *) ratio_to_string (XRATIO_DATA (arg.obj), ch == 'n' ? 10 : (ch == 'p' ? 8 : 16)); doprnt_2 (stream, text_to_print, strlen ((const char *) text_to_print), spec->minwidth, -1, spec->minus_flag, spec->zero_flag); xfree (text_to_print, Ibyte *); } #endif } #endif /* HAVE_BIGNUM || HAVE_RATIO */ #ifdef HAVE_BIGFLOAT else if (strchr (bigfloat_converters, ch)) { Ibyte *text_to_print = (Ibyte *) bigfloat_to_string (XBIGFLOAT_DATA (arg.obj), 10); doprnt_2 (stream, text_to_print, strlen ((const char *) text_to_print), spec->minwidth, -1, spec->minus_flag, spec->zero_flag); xfree (text_to_print, Ibyte *); } #endif /* HAVE_BIGFLOAT */ else { /* ASCII Decimal representation uses 2.4 times as many bits as machine binary. */ char *text_to_print = alloca_array (char, 32 + max (spec->minwidth, (int) max (sizeof (double), sizeof (long)) * 3 + max (spec->precision, 0))); char constructed_spec[100]; char *p = constructed_spec; /* Mostly reconstruct the spec and use sprintf() to format the string. */ *p++ = '%'; if (spec->plus_flag) *p++ = '+'; if (spec->space_flag) *p++ = ' '; if (spec->number_flag) *p++ = '#'; if (spec->minus_flag) *p++ = '-'; if (spec->zero_flag) *p++ = '0'; if (spec->minwidth >= 0) { long_to_string (p, spec->minwidth); p += strlen (p); } if (spec->precision >= 0) { *p++ = '.'; long_to_string (p, spec->precision); p += strlen (p); } if (strchr (double_converters, ch)) { *p++ = ch; *p++ = '\0'; sprintf (text_to_print, constructed_spec, arg.d); } else { *p++ = 'l'; /* Always use longs with sprintf() */ *p++ = ch; *p++ = '\0'; if (strchr (unsigned_int_converters, ch)) sprintf (text_to_print, constructed_spec, arg.ul); else sprintf (text_to_print, constructed_spec, arg.l); } doprnt_2 (stream, (Ibyte *) text_to_print, strlen (text_to_print), 0, -1, 0, 0); } } } unbind_to (count); return Lstream_byte_count (XLSTREAM (stream)) - init_byte_count; } /* Basic external entry point into string formatting. See emacs_doprnt_1(). */ Bytecount emacs_doprnt_va (Lisp_Object stream, const Ibyte *format_nonreloc, Bytecount format_length, Lisp_Object format_reloc, va_list vargs) { return emacs_doprnt_1 (stream, format_nonreloc, format_length, format_reloc, 0, 0, vargs); } /* Basic external entry point into string formatting. See emacs_doprnt_1(). */ Bytecount emacs_doprnt (Lisp_Object stream, const Ibyte *format_nonreloc, Bytecount format_length, Lisp_Object format_reloc, int nargs, const Lisp_Object *largs, ...) { va_list vargs; Bytecount val; va_start (vargs, largs); val = emacs_doprnt_1 (stream, format_nonreloc, format_length, format_reloc, nargs, largs, vargs); va_end (vargs); return val; } /* Similar to `format' in that its arguments are Lisp objects rather than C objects. (For the versions that take C objects, see the emacs_[v]sprintf... functions below.) Accepts the format string as either a C string (FORMAT_NONRELOC, which *MUST NOT* come from Lisp string data, unless GC is inhibited) or a Lisp string (FORMAT_RELOC). Return resulting formatted string as a Lisp string. All arguments are GCPRO'd, including FORMAT_RELOC; this makes it OK to pass newly created objects into this function (as often happens). #### It shouldn't be necessary to specify the number of arguments. This would require some rewriting of the doprnt() functions, though. */ Lisp_Object emacs_vsprintf_string_lisp (const CIbyte *format_nonreloc, Lisp_Object format_reloc, int nargs, const Lisp_Object *largs) { Lisp_Object stream; Lisp_Object obj; struct gcpro gcpro1, gcpro2; GCPRO2 (largs[0], format_reloc); gcpro1.nvars = nargs; stream = make_resizing_buffer_output_stream (); emacs_doprnt (stream, (Ibyte *) format_nonreloc, format_nonreloc ? strlen (format_nonreloc) : 0, format_reloc, nargs, largs); Lstream_flush (XLSTREAM (stream)); obj = make_string (resizing_buffer_stream_ptr (XLSTREAM (stream)), Lstream_byte_count (XLSTREAM (stream))); Lstream_delete (XLSTREAM (stream)); UNGCPRO; return obj; } /* Like emacs_vsprintf_string_lisp() but accepts its extra args directly (using variable arguments), rather than as an array. */ Lisp_Object emacs_sprintf_string_lisp (const CIbyte *format_nonreloc, Lisp_Object format_reloc, int nargs, ...) { Lisp_Object *args = alloca_array (Lisp_Object, nargs); va_list va; int i; Lisp_Object obj; va_start (va, nargs); for (i = 0; i < nargs; i++) args[i] = va_arg (va, Lisp_Object); va_end (va); obj = emacs_vsprintf_string_lisp (format_nonreloc, format_reloc, nargs, args); return obj; } /* Like emacs_vsprintf_string_lisp() but returns a malloc()ed memory block. Return length out through LEN_OUT, if not null. */ Ibyte * emacs_vsprintf_malloc_lisp (const CIbyte *format_nonreloc, Lisp_Object format_reloc, int nargs, const Lisp_Object *largs, Bytecount *len_out) { Lisp_Object stream; Ibyte *retval; Bytecount len; struct gcpro gcpro1, gcpro2; GCPRO2 (largs[0], format_reloc); gcpro1.nvars = nargs; stream = make_resizing_buffer_output_stream (); emacs_doprnt (stream, (Ibyte *) format_nonreloc, format_nonreloc ? strlen (format_nonreloc) : 0, format_reloc, nargs, largs); Lstream_flush (XLSTREAM (stream)); len = Lstream_byte_count (XLSTREAM (stream)); retval = xnew_ibytes (len + 1); memcpy (retval, resizing_buffer_stream_ptr (XLSTREAM (stream)), len); retval[len] = '\0'; Lstream_delete (XLSTREAM (stream)); if (len_out) *len_out = len; UNGCPRO; return retval; } /* Like emacs_sprintf_string_lisp() but returns a malloc()ed memory block. Return length out through LEN_OUT, if not null. */ Ibyte * emacs_sprintf_malloc_lisp (Bytecount *len_out, const CIbyte *format_nonreloc, Lisp_Object format_reloc, int nargs, ...) { Lisp_Object *args = alloca_array (Lisp_Object, nargs); va_list va; int i; Ibyte *retval; va_start (va, nargs); for (i = 0; i < nargs; i++) args[i] = va_arg (va, Lisp_Object); va_end (va); retval = emacs_vsprintf_malloc_lisp (format_nonreloc, format_reloc, nargs, args, len_out); return retval; } /* vsprintf()-like replacement. Returns a Lisp string. Data from Lisp strings is OK because we explicitly inhibit GC. */ Lisp_Object emacs_vsprintf_string (const CIbyte *format, va_list vargs) { Lisp_Object stream = make_resizing_buffer_output_stream (); Lisp_Object obj; int count = begin_gc_forbidden (); emacs_doprnt_va (stream, (Ibyte *) format, strlen (format), Qnil, vargs); Lstream_flush (XLSTREAM (stream)); obj = make_string (resizing_buffer_stream_ptr (XLSTREAM (stream)), Lstream_byte_count (XLSTREAM (stream))); Lstream_delete (XLSTREAM (stream)); end_gc_forbidden (count); return obj; } /* sprintf()-like replacement. Returns a Lisp string. Data from Lisp strings is OK because we explicitly inhibit GC. */ Lisp_Object emacs_sprintf_string (const CIbyte *format, ...) { va_list vargs; Lisp_Object retval; va_start (vargs, format); retval = emacs_vsprintf_string (format, vargs); va_end (vargs); return retval; } /* vsprintf()-like replacement. Returns a malloc()ed memory block. Data from Lisp strings is OK because we explicitly inhibit GC. Return length out through LEN_OUT, if not null. */ Ibyte * emacs_vsprintf_malloc (const CIbyte *format, va_list vargs, Bytecount *len_out) { int count = begin_gc_forbidden (); Lisp_Object stream = make_resizing_buffer_output_stream (); Ibyte *retval; Bytecount len; emacs_doprnt_va (stream, (Ibyte *) format, strlen (format), Qnil, vargs); Lstream_flush (XLSTREAM (stream)); len = Lstream_byte_count (XLSTREAM (stream)); retval = xnew_ibytes (len + 1); memcpy (retval, resizing_buffer_stream_ptr (XLSTREAM (stream)), len); retval[len] = '\0'; end_gc_forbidden (count); Lstream_delete (XLSTREAM (stream)); if (len_out) *len_out = len; return retval; } /* sprintf()-like replacement. Returns a malloc()ed memory block. Data from Lisp strings is OK because we explicitly inhibit GC. Return length out through LEN_OUT, if not null. */ Ibyte * emacs_sprintf_malloc (Bytecount *len_out, const CIbyte *format, ...) { va_list vargs; Ibyte *retval; va_start (vargs, format); retval = emacs_vsprintf_malloc (format, vargs, len_out); va_end (vargs); return retval; } /* vsprintf() replacement. Writes output into OUTPUT, which better have enough space for the output. Data from Lisp strings is OK because we explicitly inhibit GC. */ Bytecount emacs_vsprintf (Ibyte *output, const CIbyte *format, va_list vargs) { Bytecount retval; int count = begin_gc_forbidden (); Lisp_Object stream = make_resizing_buffer_output_stream (); Bytecount len; retval = emacs_doprnt_va (stream, (Ibyte *) format, strlen (format), Qnil, vargs); Lstream_flush (XLSTREAM (stream)); len = Lstream_byte_count (XLSTREAM (stream)); memcpy (output, resizing_buffer_stream_ptr (XLSTREAM (stream)), len); output[len] = '\0'; end_gc_forbidden (count); Lstream_delete (XLSTREAM (stream)); return retval; } /* sprintf() replacement. Writes output into OUTPUT, which better have enough space for the output. Data from Lisp strings is OK because we explicitly inhibit GC. */ Bytecount emacs_sprintf (Ibyte *output, const CIbyte *format, ...) { va_list vargs; Bytecount retval; va_start (vargs, format); retval = emacs_vsprintf (output, format, vargs); va_end (vargs); return retval; }