Mercurial > hg > xemacs-beta
annotate src/tests.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 | 04bc9d2f42c7 |
children | 6fa9919a9a0b |
rev | line source |
---|---|
398 | 1 /* C support for testing XEmacs - see tests/automated/c-tests.el |
2 Copyright (C) 2000 Martin Buchholz | |
771 | 3 Copyright (C) 2001, 2002 Ben Wing. |
398 | 4 |
5 This file is part of XEmacs. | |
6 | |
7 XEmacs is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2, or (at your option) any | |
10 later version. | |
11 | |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with XEmacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 Boston, MA 02111-1307, USA. */ | |
21 | |
22 /* Author: Martin Buchholz | |
23 | |
24 This file provides support for running tests for XEmacs that cannot | |
25 be written entirely in Lisp. These tests are run automatically via | |
26 tests/automated/c-tests.el, or can be run by hand using M-x */ | |
27 | |
28 | |
29 #include <config.h> | |
30 #include "lisp.h" | |
31 #include "buffer.h" | |
32 #include "lstream.h" | |
489 | 33 #include "elhash.h" |
398 | 34 #include "opaque.h" |
35 | |
36 static Lisp_Object Vtest_function_list; | |
37 | |
38 | |
39 DEFUN ("test-data-format-conversion", Ftest_data_format_conversion, 0, 0, "", /* | |
40 Test TO_EXTERNAL_FORMAT() and TO_INTERNAL_FORMAT() | |
41 */ | |
42 ()) | |
43 { | |
665 | 44 void *ptr; Bytecount len; |
398 | 45 Lisp_Object string, opaque; |
46 | |
867 | 47 Ibyte int_foo[] = "\n\nfoo\nbar"; |
398 | 48 Extbyte ext_unix[]= "\n\nfoo\nbar"; |
49 | |
50 Extbyte ext_dos[] = "\r\n\r\nfoo\r\nbar"; | |
51 Extbyte ext_mac[] = "\r\rfoo\rbar"; | |
52 Lisp_Object opaque_dos = make_opaque (ext_dos, sizeof (ext_dos) - 1); | |
53 Lisp_Object string_foo = make_string (int_foo, sizeof (int_foo) - 1); | |
54 | |
55 Extbyte ext_latin[] = "f\372b\343\340"; | |
867 | 56 Ibyte int_latin1[] = "f\200\372b\200\343\200\340"; |
57 Ibyte int_latin2[] = "f\201\372b\201\343\201\340"; | |
398 | 58 #ifdef MULE |
59 Extbyte ext_latin12[]= "f\033-A\372b\343\340\033-B"; | |
60 Extbyte ext_tilde[] = "f~b~~"; | |
61 Lisp_Object string_latin2 = make_string (int_latin2, sizeof (int_latin2) - 1); | |
62 #endif | |
63 Lisp_Object opaque_latin = make_opaque (ext_latin, sizeof (ext_latin) - 1); | |
64 Lisp_Object opaque0_latin = make_opaque (ext_latin, sizeof (ext_latin)); | |
65 Lisp_Object string_latin1 = make_string (int_latin1, sizeof (int_latin1) - 1); | |
66 | |
67 /* Check for expected strings before and after conversion. | |
771 | 68 Conversions depend on whether MULE is defined. */ |
398 | 69 #ifdef MULE |
70 #define DFC_CHECK_DATA_COND_MULE(ptr,len, \ | |
71 constant_string_mule, \ | |
72 constant_string_non_mule) \ | |
73 DFC_CHECK_DATA (ptr, len, constant_string_mule) | |
74 #define DFC_CHECK_DATA_COND_MULE_NUL(ptr,len, \ | |
75 constant_string_mule, \ | |
76 constant_string_non_mule) \ | |
77 DFC_CHECK_DATA_NUL (ptr, len, constant_string_mule) | |
78 #else | |
79 #define DFC_CHECK_DATA_COND_MULE(ptr,len, \ | |
80 constant_string_mule, \ | |
81 constant_string_non_mule) \ | |
82 DFC_CHECK_DATA (ptr, len, constant_string_non_mule) | |
83 #define DFC_CHECK_DATA_COND_MULE_NUL(ptr,len, \ | |
84 constant_string_mule, \ | |
85 constant_string_non_mule) \ | |
86 DFC_CHECK_DATA_NUL (ptr, len, constant_string_non_mule) | |
87 #endif | |
88 | |
89 #define DFC_CHECK_DATA_COND_EOL(ptr,len, \ | |
90 constant_string_eol, \ | |
91 constant_string_non_eol) \ | |
92 DFC_CHECK_DATA (ptr, len, constant_string_eol) | |
93 #define DFC_CHECK_DATA_COND_EOL_NUL(ptr,len, \ | |
94 constant_string_eol, \ | |
95 constant_string_non_eol) \ | |
96 DFC_CHECK_DATA_NUL (ptr, len, constant_string_eol) | |
97 | |
98 /* Check for expected strings before and after conversion. */ | |
99 #define DFC_CHECK_DATA(ptr,len, constant_string) do { \ | |
100 assert ((len) == sizeof (constant_string) - 1); \ | |
101 assert (!memcmp (ptr, constant_string, len)); \ | |
102 } while (0) | |
103 | |
104 /* Macro version that includes the trailing NULL byte. */ | |
105 #define DFC_CHECK_DATA_NUL(ptr,len,constant_string) do {\ | |
106 assert ((len) == sizeof (constant_string)); \ | |
107 assert (!memcmp (ptr, constant_string, len)); \ | |
108 } while (0) | |
109 | |
110 #ifdef MULE | |
111 ptr = NULL, len = rand(); | |
112 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2)), | |
113 ALLOCA, (ptr, len), | |
771 | 114 intern ("iso-8859-2")); |
398 | 115 DFC_CHECK_DATA_NUL (ptr, len, ext_latin); |
116 | |
117 ptr = NULL, len = rand(); | |
118 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin2, | |
119 ALLOCA, (ptr, len), | |
771 | 120 intern ("iso-8859-2")); |
398 | 121 DFC_CHECK_DATA (ptr, len, ext_latin); |
122 | |
123 ptr = NULL, len = rand(); | |
124 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
125 ALLOCA, (ptr, len), | |
771 | 126 intern ("iso-8859-2")); |
398 | 127 DFC_CHECK_DATA (ptr, len, ext_latin12); |
128 | |
129 ptr = NULL, len = rand(); | |
130 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2) - 1), | |
131 MALLOC, (ptr, len), | |
771 | 132 intern ("iso-8859-2")); |
398 | 133 DFC_CHECK_DATA (ptr, len, ext_latin); |
1726 | 134 xfree (ptr, void *); |
398 | 135 |
136 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2) - 1), | |
137 LISP_OPAQUE, opaque, | |
771 | 138 intern ("iso-8859-2")); |
398 | 139 DFC_CHECK_DATA (XOPAQUE_DATA (opaque), XOPAQUE_SIZE (opaque), ext_latin); |
140 | |
141 ptr = NULL, len = rand(); | |
142 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
143 ALLOCA, (ptr, len), | |
144 intern ("iso-8859-2")); | |
145 DFC_CHECK_DATA (ptr, len, int_latin2); | |
146 | |
147 ptr = NULL, len = rand(); | |
148 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
149 MALLOC, (ptr, len), | |
150 intern ("iso-8859-2")); | |
151 DFC_CHECK_DATA (ptr, len, int_latin2); | |
1726 | 152 xfree (ptr, void *); |
398 | 153 |
154 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
155 LISP_STRING, string, | |
156 intern ("iso-8859-2")); | |
157 DFC_CHECK_DATA (XSTRING_DATA (string), XSTRING_LENGTH (string), int_latin2); | |
158 | |
159 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_latin, | |
160 LISP_STRING, string, | |
161 intern ("iso-8859-2")); | |
162 DFC_CHECK_DATA (XSTRING_DATA (string), XSTRING_LENGTH (string), int_latin2); | |
163 | |
164 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque0_latin, | |
165 LISP_STRING, string, | |
166 intern ("iso-8859-2")); | |
167 DFC_CHECK_DATA_NUL (XSTRING_DATA (string), XSTRING_LENGTH (string), int_latin2); | |
168 | |
169 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque0_latin, | |
170 LISP_BUFFER, Fcurrent_buffer(), | |
171 intern ("iso-8859-2")); | |
172 DFC_CHECK_DATA_NUL (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)), | |
173 sizeof (int_latin2), int_latin2); | |
174 | |
175 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_latin, | |
176 LISP_BUFFER, Fcurrent_buffer(), | |
177 intern ("iso-8859-1")); | |
178 DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)), | |
179 sizeof (int_latin1) - 1, int_latin1); | |
180 | |
181 TO_INTERNAL_FORMAT (DATA, (ext_latin12, sizeof (ext_latin12) - 1), | |
182 ALLOCA, (ptr, len), | |
183 intern ("iso-8859-2")); | |
184 DFC_CHECK_DATA (ptr, len, int_latin1); | |
185 | |
186 #endif /* MULE */ | |
187 | |
188 ptr = NULL, len = rand(); | |
189 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
190 ALLOCA, (ptr, len), | |
191 Qbinary); | |
192 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
193 | |
194 ptr = NULL, len = rand(); | |
195 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1)), | |
196 ALLOCA, (ptr, len), | |
197 Qbinary); | |
198 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, ext_latin, int_latin1); | |
199 | |
200 ptr = NULL, len = rand(); | |
201 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2) - 1), | |
202 ALLOCA, (ptr, len), | |
771 | 203 Qbinary); |
398 | 204 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_tilde, int_latin2); |
205 | |
206 ptr = NULL, len = rand(); | |
207 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
208 ALLOCA, (ptr, len), | |
209 intern ("iso-8859-1")); | |
210 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
211 | |
212 | |
213 ptr = NULL, len = rand(); | |
214 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
215 ALLOCA, (ptr, len), | |
216 Qbinary); | |
217 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
218 | |
219 ptr = NULL, len = rand(); | |
220 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
221 ALLOCA, (ptr, len), | |
771 | 222 Qbinary); |
398 | 223 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); |
224 | |
225 ptr = NULL, len = rand(); | |
226 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
227 ALLOCA, (ptr, len), | |
228 intern ("iso-8859-1")); | |
229 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
230 | |
231 ptr = NULL, len = rand(); | |
232 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
233 MALLOC, (ptr, len), | |
234 Qbinary); | |
235 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
1726 | 236 xfree (ptr, void *); |
398 | 237 |
238 ptr = NULL, len = rand(); | |
239 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2)), | |
240 MALLOC, (ptr, len), | |
771 | 241 Qbinary); |
398 | 242 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, ext_tilde, int_latin2); |
1726 | 243 xfree (ptr, void *); |
398 | 244 |
245 ptr = NULL, len = rand(); | |
246 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
247 MALLOC, (ptr, len), | |
248 intern ("iso-8859-1")); | |
249 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
1726 | 250 xfree (ptr, void *); |
398 | 251 |
252 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
253 LISP_OPAQUE, opaque, | |
254 Qbinary); | |
255 DFC_CHECK_DATA_COND_MULE (XOPAQUE_DATA (opaque), | |
256 XOPAQUE_SIZE (opaque), ext_latin, int_latin1); | |
257 | |
258 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2)), | |
259 LISP_OPAQUE, opaque, | |
771 | 260 Qbinary); |
398 | 261 DFC_CHECK_DATA_COND_MULE_NUL (XOPAQUE_DATA (opaque), |
262 XOPAQUE_SIZE (opaque), ext_tilde, int_latin2); | |
263 | |
264 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
265 LISP_OPAQUE, opaque, | |
266 intern ("iso-8859-1")); | |
267 DFC_CHECK_DATA_COND_MULE (XOPAQUE_DATA (opaque), | |
268 XOPAQUE_SIZE (opaque), ext_latin, int_latin1); | |
269 | |
270 ptr = NULL, len = rand(); | |
271 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
272 ALLOCA, (ptr, len), | |
273 Qbinary); | |
274 DFC_CHECK_DATA_COND_MULE (ptr, len, int_latin1, ext_latin); | |
275 | |
276 ptr = NULL, len = rand(); | |
277 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin)), | |
278 ALLOCA, (ptr, len), | |
279 intern ("iso-8859-1")); | |
280 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, int_latin1, ext_latin); | |
281 | |
282 ptr = NULL, len = rand(); | |
283 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin)), | |
284 MALLOC, (ptr, len), | |
285 intern ("iso-8859-1")); | |
286 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, int_latin1, ext_latin); | |
1726 | 287 xfree (ptr, void *); |
398 | 288 |
289 ptr = NULL, len = rand(); | |
290 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin)), | |
291 MALLOC, (ptr, len), | |
292 Qnil); | |
293 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, int_latin1, ext_latin); | |
1726 | 294 xfree (ptr, void *); |
398 | 295 |
296 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
297 LISP_STRING, string, | |
298 intern ("iso-8859-1")); | |
299 DFC_CHECK_DATA_COND_MULE (XSTRING_DATA (string), | |
300 XSTRING_LENGTH (string), int_latin1, ext_latin); | |
301 | |
302 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_latin, | |
303 LISP_STRING, string, | |
304 intern ("iso-8859-1")); | |
305 DFC_CHECK_DATA_COND_MULE (XSTRING_DATA (string), | |
306 XSTRING_LENGTH (string), int_latin1, ext_latin); | |
307 | |
308 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque0_latin, | |
309 LISP_STRING, string, | |
310 intern ("iso-8859-1")); | |
311 DFC_CHECK_DATA_COND_MULE_NUL (XSTRING_DATA (string), | |
312 XSTRING_LENGTH (string), int_latin1, ext_latin); | |
313 | |
314 | |
315 ptr = NULL, len = rand(); | |
316 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo)), | |
317 MALLOC, (ptr, len), | |
771 | 318 Qbinary); |
398 | 319 DFC_CHECK_DATA_COND_EOL_NUL (ptr, len, ext_unix, int_foo); |
1726 | 320 xfree (ptr, void *); |
398 | 321 |
322 ptr = NULL, len = rand(); | |
323 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1), | |
324 LISP_OPAQUE, opaque, | |
325 intern ("raw-text-mac")); | |
326 DFC_CHECK_DATA_COND_EOL (XOPAQUE_DATA (opaque), | |
327 XOPAQUE_SIZE (opaque), ext_mac, int_foo); | |
328 | |
329 ptr = NULL, len = rand(); | |
330 TO_EXTERNAL_FORMAT (LISP_STRING, string_foo, | |
331 ALLOCA, (ptr, len), | |
332 intern ("raw-text-dos")); | |
333 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_dos, int_foo); | |
334 | |
335 ptr = NULL, len = rand(); | |
336 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1), | |
337 ALLOCA, (ptr, len), | |
338 intern ("raw-text-unix")); | |
339 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_unix, int_foo); | |
340 | |
341 ptr = NULL, len = rand(); | |
342 TO_EXTERNAL_FORMAT (LISP_STRING, string_foo, | |
343 MALLOC, (ptr, len), | |
344 intern ("no-conversion-mac")); | |
345 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_mac, int_foo); | |
1726 | 346 xfree (ptr, void *); |
398 | 347 |
348 ptr = NULL, len = rand(); | |
349 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1), | |
350 ALLOCA, (ptr, len), | |
771 | 351 intern ("no-conversion-dos")); |
398 | 352 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_dos, int_foo); |
353 | |
354 ptr = NULL, len = rand(); | |
355 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo)), | |
356 ALLOCA, (ptr, len), | |
357 intern ("no-conversion-unix")); | |
358 DFC_CHECK_DATA_COND_EOL_NUL (ptr, len, ext_unix, int_foo); | |
359 | |
360 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_dos, | |
361 LISP_BUFFER, Fcurrent_buffer(), | |
362 intern ("undecided")); | |
826 | 363 /* &&#### needs some 8-bit work here */ |
398 | 364 DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)), |
365 sizeof (int_foo) - 1, int_foo); | |
366 | |
367 TO_INTERNAL_FORMAT (DATA, (ext_mac, sizeof (ext_mac) - 1), | |
368 LISP_STRING, string, | |
369 intern ("iso-8859-1")); | |
370 DFC_CHECK_DATA_COND_EOL (XSTRING_DATA (string), | |
371 XSTRING_LENGTH (string), int_foo, ext_mac); | |
372 | |
373 { | |
374 Lisp_Object stream = | |
375 make_fixed_buffer_input_stream (ext_dos, sizeof (ext_dos) - 1); | |
376 TO_INTERNAL_FORMAT (LISP_LSTREAM, stream, | |
377 LISP_STRING, string, | |
378 intern ("iso-8859-1")); | |
379 DFC_CHECK_DATA_COND_EOL (XSTRING_DATA (string), | |
380 XSTRING_LENGTH (string), int_foo, ext_dos); | |
381 } | |
382 | |
383 TO_INTERNAL_FORMAT (DATA, (ext_unix, sizeof (ext_unix) - 1), | |
384 LISP_STRING, string, | |
385 intern ("no-conversion")); | |
386 DFC_CHECK_DATA_COND_EOL (XSTRING_DATA (string), | |
387 XSTRING_LENGTH (string), int_foo, ext_unix); | |
388 | |
389 | |
390 ptr = NULL, len = rand(); | |
391 TO_EXTERNAL_FORMAT (LISP_OPAQUE, opaque_dos, | |
392 ALLOCA, (ptr, len), | |
393 Qbinary); | |
394 DFC_CHECK_DATA (ptr, len, ext_dos); | |
395 | |
396 return intern ("PASS"); | |
397 } | |
398 | |
399 | |
489 | 400 /* Hash Table testing */ |
401 | |
402 typedef struct | |
403 { | |
404 Lisp_Object hash_table; | |
405 EMACS_INT sum; | |
406 } test_hash_tables_data; | |
407 | |
408 | |
409 static int | |
2286 | 410 test_hash_tables_mapper (Lisp_Object UNUSED (key), Lisp_Object value, |
489 | 411 void *extra_arg) |
412 { | |
413 test_hash_tables_data *p = (test_hash_tables_data *) extra_arg; | |
414 p->sum += XINT (value); | |
415 return 0; | |
416 } | |
417 | |
418 static int | |
419 test_hash_tables_modifying_mapper (Lisp_Object key, Lisp_Object value, | |
420 void *extra_arg) | |
421 { | |
422 test_hash_tables_data *p = (test_hash_tables_data *) extra_arg; | |
423 Fputhash (make_int (- XINT (key)), | |
424 make_int (2 * XINT (value)), | |
425 p->hash_table); | |
426 p->sum += XINT (value); | |
427 return 0; | |
428 } | |
429 | |
430 static int | |
2286 | 431 test_hash_tables_predicate (Lisp_Object key, |
432 Lisp_Object UNUSED (value), | |
433 void *UNUSED (extra_arg)) | |
489 | 434 { |
435 return XINT (key) < 0; | |
436 } | |
437 | |
438 | |
439 DEFUN ("test-hash-tables", Ftest_hash_tables, 0, 0, "", /* | |
440 Test C interface to hash tables. | |
441 */ | |
442 ()) | |
443 { | |
444 test_hash_tables_data data; | |
445 data.hash_table = make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, | |
446 HASH_TABLE_EQUAL); | |
447 | |
448 Fputhash (make_int (1), make_int (2), data.hash_table); | |
449 Fputhash (make_int (3), make_int (4), data.hash_table); | |
450 | |
451 data.sum = 0; | |
452 elisp_maphash_unsafe (test_hash_tables_mapper, | |
453 data.hash_table, (void *) &data); | |
454 assert (data.sum == 2 + 4); | |
455 | |
456 data.sum = 0; | |
457 elisp_maphash (test_hash_tables_modifying_mapper, | |
458 data.hash_table, (void *) &data); | |
459 assert (data.sum == 2 + 4); | |
460 | |
461 /* hash table now contains: (1, 2) (3, 4) (-1, 2*2) (-3, 2*4) */ | |
462 | |
463 data.sum = 0; | |
464 elisp_maphash_unsafe (test_hash_tables_mapper, | |
465 data.hash_table, (void *) &data); | |
466 assert (data.sum == 3 * (2 + 4)); | |
467 | |
468 /* Remove entries with negative keys, added by modifying mapper */ | |
469 elisp_map_remhash (test_hash_tables_predicate, | |
470 data.hash_table, 0); | |
471 | |
472 data.sum = 0; | |
473 elisp_maphash_unsafe (test_hash_tables_mapper, | |
474 data.hash_table, (void *) &data); | |
475 assert (data.sum == 2 + 4); | |
476 | |
477 return intern ("PASS"); | |
478 } | |
479 | |
480 | |
398 | 481 |
482 #define TESTS_DEFSUBR(Fname) do { \ | |
483 DEFSUBR (Fname); \ | |
484 Vtest_function_list = \ | |
485 Fcons (intern (subr_name (&S##Fname)), \ | |
486 Vtest_function_list); \ | |
487 } while (0) | |
488 | |
489 void | |
490 syms_of_tests (void) | |
491 { | |
492 Vtest_function_list = Qnil; | |
493 | |
494 TESTS_DEFSUBR (Ftest_data_format_conversion); | |
489 | 495 TESTS_DEFSUBR (Ftest_hash_tables); |
398 | 496 /* Add other test functions here with TESTS_DEFSUBR */ |
497 } | |
498 | |
499 void | |
500 vars_of_tests (void) | |
501 { | |
502 DEFVAR_LISP ("test-function-list", &Vtest_function_list /* | |
503 List of all test functions defined in tests.c. | |
504 For use by the automated test suite. See tests/automated/c-tests. | |
505 */ ); | |
506 } |