Mercurial > hg > xemacs-beta
annotate netinstall/inilex.l @ 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 /* | |
| 3 * Copyright (c) 2000, Red Hat, Inc. | |
| 4 * | |
| 5 * This program is free software; you can redistribute it and/or modify | |
| 6 * it under the terms of the GNU General Public License as published by | |
| 7 * the Free Software Foundation; either version 2 of the License, or | |
| 8 * (at your option) any later version. | |
| 9 * | |
| 10 * A copy of the GNU General Public License can be found at | |
| 11 * http://www.gnu.org/ | |
| 12 * | |
| 13 * Written by DJ Delorie <dj@cygnus.com> | |
| 14 * | |
| 15 */ | |
| 16 | |
| 17 /* tokenize the setup.ini files. We parse a string which we've | |
| 18 previously downloaded. The program must call ini_init() to specify | |
| 19 that string. */ | |
| 20 | |
| 21 #include "win32.h" | |
| 22 #include <string.h> | |
| 23 #include <stdlib.h> | |
| 24 | |
| 25 #include "ini.h" | |
| 26 #include "iniparse.h" | |
| 27 | |
| 28 #define YY_INPUT(buf,result,max_size) { result = ini_getchar(buf, max_size); } | |
| 29 | |
| 30 static int ini_getchar(char *buf, int max_size); | |
| 31 static void ignore_line (); | |
| 32 | |
| 33 %} | |
| 34 | |
| 35 /*%option debug */ | |
| 36 %option noyywrap | |
| 37 %option yylineno | |
| 38 %option never-interactive | |
| 39 | |
| 40 STR [a-zA-Z0-9_./-]+ | |
| 41 | |
| 42 %% | |
| 43 | |
| 44 \"[^"]*\" { yylval = strdup (yytext+1); | |
| 45 yylval[strlen (yylval)-1] = 0; | |
| 46 return STRING; } | |
| 47 | |
| 48 "setup-timestamp:" return SETUP_TIMESTAMP; | |
| 49 "setup-version:" return SETUP_VERSION; | |
| 50 "version:" return VERSION; | |
| 51 "install:" return INSTALL; | |
| 52 "type:" return TYPE; | |
| 53 "source:" return SOURCE; | |
| 54 "sdesc:" return SDESC; | |
| 55 "ldesc:" return LDESC; | |
| 56 | |
| 57 ^{STR}":" ignore_line (); | |
| 58 | |
| 59 "[curr]" return T_CURR; | |
| 60 "[test]" return T_TEST; | |
| 61 "[exp]" return T_TEST; | |
| 62 "[prev]" return T_PREV; | |
| 63 "["{STR}"]" return T_UNKNOWN; | |
| 64 | |
| 65 {STR} { yylval = strdup (yytext); | |
| 66 return STRING; } | |
| 67 | |
| 68 [ \t\r]+ /* do nothing */ | |
| 69 | |
| 70 "#".*\n /* ignore comments */ | |
| 71 | |
| 72 \n { return yytext[0]; } | |
| 73 . { return yytext[0]; } | |
| 74 | |
| 75 %% | |
| 76 | |
| 77 static char *input_string = 0; | |
| 78 static char *end_input_string; | |
| 79 | |
| 80 void | |
| 81 ini_init(char *string) | |
| 82 { | |
| 83 input_string = string; | |
| 84 end_input_string = input_string + strlen(input_string); | |
| 85 } | |
| 86 | |
| 87 static int | |
| 88 ini_getchar(char *buf, int max_size) | |
| 89 { | |
| 90 if (input_string) | |
| 91 { | |
| 92 int avail = end_input_string - input_string; | |
| 93 if (avail == 0) | |
| 94 { | |
| 95 input_string = end_input_string = 0; | |
| 96 return 0; | |
| 97 } | |
| 98 if (avail > max_size) | |
| 99 avail = max_size; | |
| 100 memcpy(buf, input_string, avail); | |
| 101 input_string += avail; | |
| 102 return avail; | |
| 103 } | |
| 104 else | |
| 105 return 0; | |
| 106 } | |
| 107 | |
| 108 static void | |
| 109 ignore_line () | |
| 110 { | |
| 111 char c; | |
| 112 while (c = input ()) | |
| 113 { | |
| 114 if (c == EOF) | |
| 115 return; | |
| 116 if (c == '\n') | |
| 117 return; | |
| 118 } | |
| 119 } |