annotate nt/Win32.cf @ 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 43dd3413c7c7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
1 XCOMM platform: $XConsortium: Win32.cf /main/51 1996/12/19 14:20:08 lehors $
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
3 #ifndef OSName
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
4 #define OSName Microsoft Windows NT 4.0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
5 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
6 XCOMM operating system: OSName
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
7 #ifndef OSMajorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
8 #define OSMajorVersion 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
9 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
10 #ifndef OSMinorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
11 #define OSMinorVersion 0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
12 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
13 #ifndef OSTeenyVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
14 #define OSTeenyVersion 0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
15 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
16
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
17 #ifndef CompilerMajorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
18 /* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
19 #define CompilerMajorVersion 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
20 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
21
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
22 #define BootstrapCFlags -DWIN32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
23 #ifdef _M_IX86
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
24 #define CpuDefines -D_X86_
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
25 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
26 /* brain-damaged windows headers will not compile with -Za */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
27 /*#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines*/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
28 /* Try with single threaded libc --marcpa */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
29 #define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D__STDC__ CpuDefines
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
30 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
31 #define DefaultCCOptions -nologo -batch -G4 -W2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
32 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
33 #define DefaultCCOptions -nologo -G4 -W2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
34 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
35 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
36 #define DebuggableCDebugFlags -Zi
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
37 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
38 #define DebuggableCDebugFlags -Zi -Od
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
39 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
40 #define ThreadedX NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
41 #define HasThreadSafeAPI NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
42 #define CpCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
43 #define LnCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
44 #define MvCmd ren
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
45 #define RmCmd del
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
46 #ifndef RmTreeCmd
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
47 /*#define RmTreeCmd del /q /s */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
48 #define RmTreeCmd rm -rf
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
49 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
50 #define CcCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
51 #define HasCplusplus YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
52 #define CplusplusCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
53 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
54 #define PreProcessCmd CcCmd -nologo -batch -EP
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
55 #define CppCmd CcCmd -nologo -batch -E
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
56 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
57 #define PreProcessCmd CcCmd -nologo -EP
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
58 #define CppCmd CcCmd -nologo -E
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
59 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
60 #define PatheticCpp YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
61 #define ConstructMFLAGS YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
62 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
63 #define ArCmdBase lib32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
64 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
65 #define ArCmdBase lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
66 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
67 #define ArCmd ArCmdBase
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
68 #define CplusplusCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
69 #define MkdirHierCmd mkdir
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
70 #define InstallCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
71 #define InstPgmFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
72 #define InstBinFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
73 #define InstUidFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
74 #define InstLibFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
75 #define InstIncFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
76 #define InstManFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
77 #define InstDatFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
78 #define InstallFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
79 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
80 #define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
81 #elif (CompilerMajorVersion < 4)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
82 #define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
83 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
84 /* Use LIBC.LIB instead of msvcrt.lib since we compile
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
85 with non-thread version. --marcpa */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
86 #define ExtraLibraries libc.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
87 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
88 #define MakeCmd nmake -nologo
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
89 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
90 #define LdCmd link32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
91 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
92 #define LdCmd link
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
93 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
94 #define MathLibrary
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
95 #define HasSymLinks NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
96 #define HasPutenv YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
97 #define Osuf obj
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
98 #ifndef CCsuf
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
99 #define CCsuf cxx
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
100 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
101 #define BuildServer NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
102 #define ConnectionFlags -DTCPCONN
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
103
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
104 /* override as necessary in site.def/host.def */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
105 #ifndef StdIncDir
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
106 #define StdIncDir C:/MSDEVSTD/INCLUDE
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
107 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
108 #define LdPreLib /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
109 #define LdPostLib /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
110 #ifndef UseInstalled
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
111 #define ImakeCmd $(IMAKESRC:/=\)\imake
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
112 #define DependCmd $(DEPENDSRC:/=\)\makedepend
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
113 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
114 #define DependFlags -D_WIN32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
115 #define FilesToClean *.bak *.obj *.lib make.log
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
116 #define ShLibDir $(BINDIR)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
117
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
118 #define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
119
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
120 #define XawI18nDefines -DHAS_WCHAR_H
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
121 #define UseRgbTxt YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
122 #define HasCbrt NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
123 #define HasFfs NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
124 #define HasXdmAuth NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
125
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
126 /* the following components haven't been ported yet */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
127 #define BuildLBX NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
128 #define BuildXprint NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
129 #define XprtServer NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
130
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
131 #include <Win32.rules>