annotate netinstall/inilex.l @ 4885:6772ce4d982b

Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 24 Jan 2010 15:21:27 +0000
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 %{
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 /* tokenize the setup.ini files. We parse a string which we've
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18 previously downloaded. The program must call ini_init() to specify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 that string. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include <string.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 #include "ini.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 #include "iniparse.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 #define YY_INPUT(buf,result,max_size) { result = ini_getchar(buf, max_size); }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 static int ini_getchar(char *buf, int max_size);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 static void ignore_line ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 %}
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 /*%option debug */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 %option noyywrap
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 %option yylineno
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 %option never-interactive
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 STR [a-zA-Z0-9_./-]+
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 %%
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 \"[^"]*\" { yylval = strdup (yytext+1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 yylval[strlen (yylval)-1] = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 return STRING; }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 "setup-timestamp:" return SETUP_TIMESTAMP;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 "setup-version:" return SETUP_VERSION;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 "version:" return VERSION;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 "install:" return INSTALL;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 "type:" return TYPE;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 "source:" return SOURCE;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 "sdesc:" return SDESC;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 "ldesc:" return LDESC;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 ^{STR}":" ignore_line ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 "[curr]" return T_CURR;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 "[test]" return T_TEST;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 "[exp]" return T_TEST;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 "[prev]" return T_PREV;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 "["{STR}"]" return T_UNKNOWN;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 {STR} { yylval = strdup (yytext);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 return STRING; }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 [ \t\r]+ /* do nothing */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 "#".*\n /* ignore comments */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 \n { return yytext[0]; }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 . { return yytext[0]; }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 %%
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 static char *input_string = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78 static char *end_input_string;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 ini_init(char *string)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 input_string = string;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 end_input_string = input_string + strlen(input_string);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 static int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 ini_getchar(char *buf, int max_size)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 if (input_string)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 int avail = end_input_string - input_string;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 if (avail == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95 input_string = end_input_string = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
96 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
97 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
98 if (avail > max_size)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
99 avail = max_size;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
100 memcpy(buf, input_string, avail);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
101 input_string += avail;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
102 return avail;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
103 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
104 else
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
105 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
106 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
107
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
108 static void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
109 ignore_line ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
110 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
111 char c;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
112 while (c = input ())
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
113 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
114 if (c == EOF)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
115 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
116 if (c == '\n')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
117 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
118 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
119 }