Mercurial > emacs
annotate lib-src/ntlib.h @ 107984:bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Basically, this makes the structure of buffer-local values and object
forwarding explicit in the type of Lisp_Symbols rather than use
special Lisp_Objects for that. This tends to lead to slightly more
verbose code, but is more C-like, simpler, and makes it easier to make
sure we handled all cases, among other things by letting the compiler
help us check it.
* lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
Removing forwarding objects.
(enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
(struct Lisp_Symbol): Make the various forms of variable-forwarding
explicit rather than hiding them inside Lisp_Object "values".
(XFWDTYPE): New macro.
(XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
(XBUFFER_LOCAL_VALUE): Remove.
(SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
(SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
(SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
(struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
(struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
Remove the Lisp_Misc_* header.
(struct Lisp_Buffer_Local_Value): Redefine.
(BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
(struct Lisp_Misc_Any): Add filler to get the right size.
(struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
Lisp_Intfwd.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_KBOARD): Allocate a forwarding object.
* data.c (do_blv_forwarding, store_blv_forwarding): New macros.
(let_shadows_global_binding_p): New function.
(union Lisp_Val_Fwd): New type.
(make_blv): New function.
(swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
(store_symval_forwarding, swap_in_global_binding, Fboundp)
(swap_in_symval_forwarding, find_symbol_value, Fset)
(let_shadows_buffer_binding_p, set_internal, default_value)
(Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local)
(Flocal_variable_p, Flocal_variable_if_set_p)
(Fvariable_binding_locus):
* xdisp.c (select_frame_for_redisplay):
* lread.c (Fintern, Funintern, init_obarray, defvar_int)
(defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
* frame.c (store_frame_param):
* eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
* bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
value structure.
* buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
(clone_per_buffer_values): Only adjust markers into the current buffer.
(reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
(Fbuffer_local_value, set_buffer_internal_1)
(swap_out_buffer_local_variables):
Adapt to the new symbol value structure.
(DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
(defvar_per_buffer): Take a new arg for the fwd object.
(buffer_lisp_local_variables): Return a proper alist (different fix
for bug#4138).
* alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
(Fgarbage_collect): Don't handle buffer_defaults specially.
(mark_object): Handle new symbol value structure rather than the old
special Lisp_Misc_* objects.
(gc_sweep) <symbols>: Free also the buffer-local-value objects.
* term.c (set_tty_color_mode):
* bidi.c (bidi_initialize): Don't access the ->value field directly.
* buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
a buffer_local_flags.
* print.c (print_object): Get rid of impossible forwarding objects.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 19 Apr 2010 21:50:52 -0400 |
parents | 65405dd90a72 |
children | d86e65007470 376148b31b5e |
rev | line source |
---|---|
15139 | 1 /* Utility and Unix shadow routines for GNU Emacs support programs on NT. |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
2 Copyright (C) 1994, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 3 2008, 2009, 2010 Free Software Foundation, Inc. |
15139 | 4 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
5 This file is part of GNU Emacs. |
15139 | 6 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
8 it under the terms of the GNU General Public License as published by |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
10 (at your option) any later version. |
15139 | 11 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
12 GNU Emacs is distributed in the hope that it will be useful, |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
15 GNU General Public License for more details. |
15139 | 16 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
19 |
15139 | 20 |
21 #include <pwd.h> | |
22 #include <malloc.h> | |
23 | |
19232 | 24 /* Include these headers now so we don't have to worry about include |
25 order dependencies in common source files. */ | |
26 #include <direct.h> | |
27 #include <io.h> | |
28 #include <stdio.h> | |
29 | |
30 #ifdef sleep | |
31 #undef sleep | |
32 #endif | |
31082
9865d23be9e7
(WIN32): Remove unnecessary definition.
Andrew Innes <andrewi@gnu.org>
parents:
22315
diff
changeset
|
33 void sleep(unsigned long seconds); |
15674 | 34 char *getwd (char *dir); |
15139 | 35 int getppid(void); |
36 char * getlogin (); | |
37 char * cuserid (char * s); | |
102670
06ca3efb355b
inc/sys/stat.h (struct stat): Change the types of st_uid and st_gid to unsigned.
Eli Zaretskii <eliz@gnu.org>
parents:
100958
diff
changeset
|
38 unsigned getuid (); |
107769
65405dd90a72
Add stubs for Windows, required after CVE-2010-0825 change.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
39 unsigned getegid (); |
65405dd90a72
Add stubs for Windows, required after CVE-2010-0825 change.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
40 unsigned getgid (); |
102670
06ca3efb355b
inc/sys/stat.h (struct stat): Change the types of st_uid and st_gid to unsigned.
Eli Zaretskii <eliz@gnu.org>
parents:
100958
diff
changeset
|
41 int setuid (unsigned uid); |
107769
65405dd90a72
Add stubs for Windows, required after CVE-2010-0825 change.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
42 int setegid (unsigned gid); |
15139 | 43 char * getpass (const char * prompt); |
102670
06ca3efb355b
inc/sys/stat.h (struct stat): Change the types of st_uid and st_gid to unsigned.
Eli Zaretskii <eliz@gnu.org>
parents:
100958
diff
changeset
|
44 int fchown (int fd, unsigned uid, unsigned gid); |
15139 | 45 |
46 #ifndef BSTRING | |
47 #define bzero(b, l) memset(b, 0, l) | |
48 #define bcopy(s, d, l) memcpy(d, s, l) | |
49 #define bcmp(a, b, l) memcmp(a, b, l) | |
50 #endif | |
51 | |
22315 | 52 /* redirect or undo interceptions created by config.h */ |
19232 | 53 #undef access |
54 #define access _access | |
55 #undef chdir | |
56 #define chdir _chdir | |
57 #undef chmod | |
58 #define chmod _chmod | |
59 #undef close | |
60 #define close _close | |
61 #undef creat | |
62 #define creat _creat | |
63 #undef ctime | |
64 #undef dup | |
65 #define dup _dup | |
66 #undef dup2 | |
67 #define dup2 _dup2 | |
68 #undef fopen | |
69 #undef mkdir | |
70 #define mkdir _mkdir | |
71 #undef mktemp | |
72 #define mktemp _mktemp | |
73 #undef open | |
74 #define open _open | |
75 #undef pipe | |
76 #define pipe _pipe | |
77 #undef read | |
78 #define read _read | |
79 #undef rename | |
80 #undef rmdir | |
81 #define rmdir _rmdir | |
82 #undef unlink | |
83 #define unlink _unlink | |
84 #undef write | |
85 #define write _write | |
86 | |
87 /* map to MSVC names */ | |
88 #define execlp _execlp | |
89 #define execvp _execvp | |
90 #define fdopen _fdopen | |
63018
e50e8a19d938
(fileno): Don't define if already defined.
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
91 #ifndef fileno |
19232 | 92 #define fileno _fileno |
63018
e50e8a19d938
(fileno): Don't define if already defined.
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
93 #endif |
19232 | 94 #define getcwd _getcwd |
95 #define getw _getw | |
96 #define getpid _getpid | |
97 #define isatty _isatty | |
98 #define locking _locking | |
99 #define logb _logb | |
100 #define _longjmp longjmp | |
101 #define lseek _lseek | |
102 #define popen _popen | |
103 #define pclose _pclose | |
104 #define umask _umask | |
105 #define utime _utime | |
106 #define index strchr | |
107 #define rindex strrchr | |
108 | |
22315 | 109 /* Make standard winsock definitions available if needed. */ |
110 #undef _WINSOCKAPI_ | |
31082
9865d23be9e7
(WIN32): Remove unnecessary definition.
Andrew Innes <andrewi@gnu.org>
parents:
22315
diff
changeset
|
111 #undef _WINSOCK_H |
22315 | 112 |
15139 | 113 /* end of ntlib.h */ |
52401 | 114 |
115 /* arch-tag: 93444f66-7b98-4aa5-a5cd-01444094af28 | |
116 (do not change this comment) */ |