Mercurial > hg > xemacs-beta
annotate netinstall/hash.cc @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 27 Dec 2008 14:05:50 +0000 |
| parents | 3078fd1074e8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* Simple hash class for install.cc */ | |
| 17 | |
| 18 #include "win32.h" | |
| 19 #include <stdlib.h> | |
| 20 #include <string.h> | |
| 21 | |
| 22 #include "hash.h" | |
| 23 | |
| 24 class hash_internals { | |
| 25 public: | |
| 26 char **keys; | |
| 27 int numkeys; | |
| 28 int maxkeys; | |
| 29 int prev_index; | |
| 30 }; | |
| 31 | |
| 32 hash::hash () | |
| 33 { | |
| 34 h = new hash_internals; | |
| 35 h->numkeys = 0; | |
| 36 h->maxkeys = 10; | |
| 37 h->keys = (char **) malloc (h->maxkeys * sizeof (char *)); | |
| 38 h->prev_index = 0; | |
| 39 } | |
| 40 | |
| 41 hash::~hash () | |
| 42 { | |
| 43 free (h->keys); | |
| 44 free (h); | |
| 45 } | |
| 46 | |
| 47 | |
| 48 void | |
| 49 hash::add (char *string) | |
| 50 { | |
| 51 int i; | |
| 52 for (i=0; i<h->numkeys; i++) | |
| 53 if (strcmp (h->keys[i], string) == 0) | |
| 54 return; | |
| 55 if (h->numkeys >= h->maxkeys) | |
| 56 { | |
| 57 h->maxkeys += 10; | |
| 58 h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *)); | |
| 59 } | |
| 60 | |
| 61 h->keys[h->numkeys] = _strdup (string); | |
| 62 h->numkeys ++; | |
| 63 } | |
| 64 | |
| 65 | |
| 66 int | |
| 67 hash::has (char *string) | |
| 68 { | |
| 69 int i; | |
| 70 for (i=0; i<h->numkeys; i++) | |
| 71 if (strcmp (h->keys[i], string) == 0) | |
| 72 return 1; | |
| 73 return 0; | |
| 74 } | |
| 75 | |
| 76 char * | |
| 77 hash::enumerate (char *prev) | |
| 78 { | |
| 79 if (prev == 0) | |
| 80 h->prev_index = -1; | |
| 81 h->prev_index ++; | |
| 82 if (h->prev_index >= h->numkeys) | |
| 83 return 0; | |
| 84 return h->keys[h->prev_index]; | |
| 85 } | |
| 86 | |
| 87 static int CDECL | |
| 88 rev_len (const void *va, const void *vb) | |
| 89 { | |
| 90 char *a = *(char **)va; | |
| 91 char *b = *(char **)vb; | |
| 92 return strcmp (b, a); | |
| 93 } | |
| 94 | |
| 95 void | |
| 96 hash::reverse_sort () | |
| 97 { | |
| 98 qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len); | |
| 99 } |