Mercurial > hg > xemacs-beta
view modules/base64/base64.c @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 01:02:40 -0600 |
parents | 8661af9617f8 |
children | 0ac12485616c |
line wrap: on
line source
/* base64 interface for XEmacs. Copyright (C) 1998, 1999 Free Software Foundation, Inc. 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: Not in FSF. */ /* Author: William Perry <wmperry@aventail.com> */ #include <emodules.h> unsigned char alphabet[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; DEFUN ("base64-encode", Fbase64_encode, 1, 5, 0, /* Return the base64 encoding of an object. OBJECT is either a string or a buffer. Optional arguments START and END denote buffer positions for computing the hash of a portion of OBJECT. The optional CODING argument specifies the coding system the text is to be represented in while computing the digest. This only has meaning with MULE, and defaults to the current format of the data. If ERROR-ME-NOT is nil, report an error if the coding system can't be determined. Else assume binary coding if all else fails. */ (object, start, end, coding, error_me_not)) { int cols,bits,char_count; Lisp_Object instream, outstream,deststream; Lstream *istr, *ostr, *dstr; static Extbyte_dynarr *conversion_out_dynarr; static Extbyte_dynarr *out_dynarr; char tempbuf[1024]; /* some random amount */ struct gcpro gcpro1, gcpro2; #ifdef FILE_CODING Lisp_Object conv_out_stream, coding_system; Lstream *costr; struct gcpro gcpro3; #endif if (!conversion_out_dynarr) conversion_out_dynarr = Dynarr_new (Extbyte); else Dynarr_reset (conversion_out_dynarr); if (!out_dynarr) out_dynarr = Dynarr_new(Extbyte); else Dynarr_reset (out_dynarr); char_count = bits = cols = 0; /* set up the in stream */ if (BUFFERP (object)) { struct buffer *b = XBUFFER (object); Charbpos begv, endv; /* Figure out where we need to get info from */ get_buffer_range_char (b, start, end, &begv, &endv, GB_ALLOW_NIL); instream = make_lisp_buffer_input_stream (b, begv, endv, 0); } else { Bytecount bstart, bend; CHECK_STRING (object); get_string_range_byte (object, start, end, &bstart, &bend, GB_HISTORICAL_STRING_BEHAVIOR); instream = make_lisp_string_input_stream (object, bstart, bend); } istr = XLSTREAM (instream); #ifdef FILE_CODING /* Find out what format the buffer will be saved in, so we can make the digest based on what it will look like on disk */ if (NILP(coding)) { if (BUFFERP(object)) { /* Use the file coding for this buffer by default */ coding_system = XBUFFER(object)->buffer_file_coding_system; } else { /* attempt to autodetect the coding of the string. Note: this VERY hit-and-miss */ enum eol_type eol = EOL_AUTODETECT; coding_system = Fget_coding_system(Qundecided); determine_real_coding_system(istr, &coding_system, &eol); } if (NILP(coding_system)) coding_system = Fget_coding_system(Qbinary); else { coding_system = Ffind_coding_system (coding_system); if (NILP(coding_system)) coding_system = Fget_coding_system(Qbinary); } } else { coding_system = Ffind_coding_system (coding); if (NILP(coding_system)) { if (NILP(error_me_not)) signal_simple_error("No such coding system", coding); else coding_system = Fget_coding_system(Qbinary); /* default to binary */ } } #endif /* setup the out stream */ outstream = make_dynarr_output_stream((unsigned_char_dynarr *)conversion_out_dynarr); ostr = XLSTREAM (outstream); deststream = make_dynarr_output_stream((unsigned_char_dynarr *)out_dynarr); dstr = XLSTREAM (deststream); #ifdef FILE_CODING /* setup the conversion stream */ conv_out_stream = make_encoding_output_stream (ostr, coding_system); costr = XLSTREAM (conv_out_stream); GCPRO3 (instream, outstream, conv_out_stream); #else GCPRO2 (instream, outstream); #endif /* Get the data while doing the conversion */ while (1) { int size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf)); int l; if (!size_in_bytes) break; /* It does seem the flushes are necessary... */ #ifdef FILE_CODING Lstream_write (costr, tempbuf, size_in_bytes); Lstream_flush (costr); #else Lstream_write (ostr, tempbuf, size_in_bytes); #endif Lstream_flush (ostr); /* Update the base64 output buffer */ for (l = 0; l < size_in_bytes; l++) { bits += Dynarr_at(conversion_out_dynarr,l); char_count++; if (char_count == 3) { static char obuf[4]; obuf[0] = alphabet[(bits >> 18)]; obuf[1] = alphabet[(bits >> 12) & 0x3f]; obuf[2] = alphabet[(bits >> 6) & 0x3f]; obuf[3] = alphabet[bits & 0x3f]; Lstream_write(dstr,obuf,sizeof(obuf)); cols += 4; if (cols == 72) { Lstream_write(dstr,"\n",sizeof(unsigned char)); cols = 0; } bits = char_count = 0; } else { bits <<= 8; } } /* reset the dynarr */ Lstream_rewind(ostr); } Lstream_close (istr); #ifdef FILE_CODING Lstream_close (costr); #endif Lstream_close (ostr); if (char_count != 0) { bits <<= 16 - (8 * char_count); Lstream_write(dstr,&alphabet[bits >> 18],sizeof(unsigned char)); Lstream_write(dstr,&alphabet[(bits >> 12) & 0x3f],sizeof(unsigned char)); if (char_count == 1) { Lstream_write(dstr,"==",2 * sizeof(unsigned char)); } else { Lstream_write(dstr,&alphabet[(bits >> 6) & 0x3f],sizeof(unsigned char)); Lstream_write(dstr,"=",sizeof(unsigned char)); } } #if 0 if (cols > 0) { Lstream_write(dstr,"\n",sizeof(unsigned char)); } #endif UNGCPRO; Lstream_delete (istr); Lstream_delete (ostr); #ifdef FILE_CODING Lstream_delete (costr); #endif Lstream_flush(dstr); Lstream_delete(dstr); return(make_string(Dynarr_atp(out_dynarr,0),Dynarr_length(out_dynarr))); } DEFUN ("base64-decode", Fbase64_decode, 1, 5, 0, /* Undo the base64 encoding of an object. OBJECT is either a string or a buffer. Optional arguments START and END denote buffer positions for computing the hash of a portion of OBJECT. The optional CODING argument specifies the coding system the text is to be represented in while computing the digest. This only has meaning with MULE, and defaults to the current format of the data. If ERROR-ME-NOT is nil, report an error if the coding system can't be determined. Else assume binary coding if all else fails. */ (object, start, end, coding, error_me_not)) { static char inalphabet[256], decoder[256]; int i,cols,bits,char_count,hit_eof; Lisp_Object instream, outstream,deststream; Lstream *istr, *ostr, *dstr; static Extbyte_dynarr *conversion_out_dynarr; static Extbyte_dynarr *out_dynarr; char tempbuf[1024]; /* some random amount */ struct gcpro gcpro1, gcpro2; #ifdef FILE_CODING Lisp_Object conv_out_stream, coding_system; Lstream *costr; struct gcpro gcpro3; #endif for (i = (sizeof alphabet) - 1; i >= 0 ; i--) { inalphabet[alphabet[i]] = 1; decoder[alphabet[i]] = i; } if (!conversion_out_dynarr) conversion_out_dynarr = Dynarr_new (Extbyte); else Dynarr_reset (conversion_out_dynarr); if (!out_dynarr) out_dynarr = Dynarr_new(Extbyte); else Dynarr_reset (out_dynarr); char_count = bits = cols = hit_eof = 0; /* set up the in stream */ if (BUFFERP (object)) { struct buffer *b = XBUFFER (object); Charbpos begv, endv; /* Figure out where we need to get info from */ get_buffer_range_char (b, start, end, &begv, &endv, GB_ALLOW_NIL); instream = make_lisp_buffer_input_stream (b, begv, endv, 0); } else { Bytecount bstart, bend; CHECK_STRING (object); get_string_range_byte (object, start, end, &bstart, &bend, GB_HISTORICAL_STRING_BEHAVIOR); instream = make_lisp_string_input_stream (object, bstart, bend); } istr = XLSTREAM (instream); #ifdef FILE_CODING /* Find out what format the buffer will be saved in, so we can make the digest based on what it will look like on disk */ if (NILP(coding)) { if (BUFFERP(object)) { /* Use the file coding for this buffer by default */ coding_system = XBUFFER(object)->buffer_file_coding_system; } else { /* attempt to autodetect the coding of the string. Note: this VERY hit-and-miss */ enum eol_type eol = EOL_AUTODETECT; coding_system = Fget_coding_system(Qundecided); determine_real_coding_system(istr, &coding_system, &eol); } if (NILP(coding_system)) coding_system = Fget_coding_system(Qbinary); else { coding_system = Ffind_coding_system (coding_system); if (NILP(coding_system)) coding_system = Fget_coding_system(Qbinary); } } else { coding_system = Ffind_coding_system (coding); if (NILP(coding_system)) { if (NILP(error_me_not)) signal_simple_error("No such coding system", coding); else coding_system = Fget_coding_system(Qbinary); /* default to binary */ } } #endif /* setup the out stream */ outstream = make_dynarr_output_stream((unsigned_char_dynarr *)conversion_out_dynarr); ostr = XLSTREAM (outstream); deststream = make_dynarr_output_stream((unsigned_char_dynarr *)out_dynarr); dstr = XLSTREAM (deststream); #ifdef FILE_CODING /* setup the conversion stream */ conv_out_stream = make_encoding_output_stream (ostr, coding_system); costr = XLSTREAM (conv_out_stream); GCPRO3 (instream, outstream, conv_out_stream); #else GCPRO2 (instream, outstream); #endif /* Get the data while doing the conversion */ while (1) { int size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf)); int l; if (!size_in_bytes) { hit_eof = 1; break; } /* It does seem the flushes are necessary... */ #ifdef FILE_CODING Lstream_write (costr, tempbuf, size_in_bytes); Lstream_flush (costr); #else Lstream_write (ostr, tempbuf, size_in_bytes); #endif Lstream_flush (ostr); /* Update the base64 output buffer */ for (l = 0; l < size_in_bytes; l++) { if (Dynarr_at(conversion_out_dynarr,l) == '=') goto decoder_out; bits += decoder[Dynarr_at(conversion_out_dynarr,l)]; fprintf(stderr,"%d\n",bits); char_count++; if (char_count == 4) { static unsigned char obuf[3]; obuf[0] = (bits >> 16); obuf[1] = (bits >> 8) & 0xff; obuf[2] = (bits & 0xff); Lstream_write(dstr,obuf,sizeof(obuf)); bits = char_count = 0; } else { bits <<= 6; } } /* reset the dynarr */ Lstream_rewind(ostr); } decoder_out: Lstream_close (istr); #ifdef FILE_CODING Lstream_close (costr); #endif Lstream_close (ostr); if (hit_eof) { if (char_count) { error_with_frob(object,"base64-decode failed: at least %d bits truncated",((4 - char_count) * 6)); } } switch(char_count) { case 1: error_with_frob(object, "base64 encoding incomplete: at least 2 bits missing"); break; case 2: char_count = bits >> 10; Lstream_write(dstr,&char_count,sizeof(char_count)); break; case 3: { unsigned char buf[2]; buf[0] = (bits >> 16); buf[1] = (bits >> 8) & 0xff; Lstream_write(dstr,buf,sizeof(buf)); break; } } UNGCPRO; Lstream_delete (istr); Lstream_delete (ostr); #ifdef FILE_CODING Lstream_delete (costr); #endif Lstream_flush(dstr); Lstream_delete(dstr); return(make_string(Dynarr_atp(out_dynarr,0),Dynarr_length(out_dynarr))); } void syms_of_base64 (void) { DEFSUBR(Fbase64_encode); DEFSUBR(Fbase64_decode); } void vars_of_base64 (void) { Fprovide (intern ("base64")); }