Mercurial > hg > xemacs-beta
view netinstall/hash.cc @ 5277:d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
src/ChangeLog addition:
2010-09-18 Aidan Kehoe <kehoea@parhasard.net>
Simplify the API of PARSE_KEYWORDS for callers.
* lisp.h (PARSE_KEYWORDS): Simply the API, while making the
implementation a little more complex; work out KEYWORDS_OFFSET
from the appropriate Lisp_Subr struct, take the function name as
the C name of the DEFUN rather than a symbol visible as a
Lisp_Object, on debug builds assert that we're actually in the
function so we choke on badly-done copy-and-pasting,
* lisp.h (PARSE_KEYWORDS_8): New. This is the old PARSE_KEYWORDS.
* fns.c (Fmerge, FsortX, Ffill, Freduce, Freplace):
Change to use the new PARSE_KEYWORDS syntax.
* elhash.c (Fmake_hash_table): Chance to the new PARSE_KEYWORDS
syntax, rename a define to correspond to what other files use.
* symbols.c (intern_massaging_name):
* buffer.c (ADD_INT):
Rename intern_converting_underscores_to_dashes() to
intern_massaging_name(), now it does a little more.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 18 Sep 2010 15:57:20 +0100 |
parents | 3078fd1074e8 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program 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 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* Simple hash class for install.cc */ #include "win32.h" #include <stdlib.h> #include <string.h> #include "hash.h" class hash_internals { public: char **keys; int numkeys; int maxkeys; int prev_index; }; hash::hash () { h = new hash_internals; h->numkeys = 0; h->maxkeys = 10; h->keys = (char **) malloc (h->maxkeys * sizeof (char *)); h->prev_index = 0; } hash::~hash () { free (h->keys); free (h); } void hash::add (char *string) { int i; for (i=0; i<h->numkeys; i++) if (strcmp (h->keys[i], string) == 0) return; if (h->numkeys >= h->maxkeys) { h->maxkeys += 10; h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *)); } h->keys[h->numkeys] = _strdup (string); h->numkeys ++; } int hash::has (char *string) { int i; for (i=0; i<h->numkeys; i++) if (strcmp (h->keys[i], string) == 0) return 1; return 0; } char * hash::enumerate (char *prev) { if (prev == 0) h->prev_index = -1; h->prev_index ++; if (h->prev_index >= h->numkeys) return 0; return h->keys[h->prev_index]; } static int CDECL rev_len (const void *va, const void *vb) { char *a = *(char **)va; char *b = *(char **)vb; return strcmp (b, a); } void hash::reverse_sort () { qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len); }