Mercurial > emacs
annotate src/data.c @ 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 | c3852852bbc0 |
| children | 734b50109edf |
| rev | line source |
|---|---|
| 298 | 1 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. |
|
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, |
| 106815 | 3 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 79759 | 4 Free Software Foundation, Inc. |
| 298 | 5 |
| 6 This file is part of GNU Emacs. | |
| 7 | |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94122
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
| 298 | 9 it under the terms of the GNU General Public License as published by |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94122
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
|
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94122
diff
changeset
|
11 (at your option) any later version. |
| 298 | 12 |
| 13 GNU Emacs is distributed in the hope that it will be useful, | |
| 14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 GNU General Public License for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94122
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 298 | 20 |
| 21 | |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25780
diff
changeset
|
22 #include <config.h> |
| 298 | 23 #include <signal.h> |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
24 #include <stdio.h> |
|
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103052
diff
changeset
|
25 #include <setjmp.h> |
| 298 | 26 #include "lisp.h" |
| 336 | 27 #include "puresize.h" |
|
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
28 #include "character.h" |
| 298 | 29 #include "buffer.h" |
| 11341 | 30 #include "keyboard.h" |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
31 #include "frame.h" |
| 552 | 32 #include "syssignal.h" |
|
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
33 #include "termhooks.h" /* For FRAME_KBOARD reference in y-or-n-p. */ |
|
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
34 #include "font.h" |
| 348 | 35 |
|
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2647
diff
changeset
|
36 #ifdef STDC_HEADERS |
|
20122
923e1f635ace
No need to include <float.h> before "lisp.h",
Paul Eggert <eggert@twinsun.com>
parents:
20055
diff
changeset
|
37 #include <float.h> |
|
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2647
diff
changeset
|
38 #endif |
|
4860
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
39 |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
40 /* If IEEE_FLOATING_POINT isn't defined, default it from FLT_*. */ |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
41 #ifndef IEEE_FLOATING_POINT |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
42 #if (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \ |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
43 && FLT_MIN_EXP == -125 && FLT_MAX_EXP == 128) |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
44 #define IEEE_FLOATING_POINT 1 |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
45 #else |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
46 #define IEEE_FLOATING_POINT 0 |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
47 #endif |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
48 #endif |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
49 |
| 298 | 50 #include <math.h> |
| 51 | |
|
4780
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
52 #if !defined (atof) |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
53 extern double atof (); |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
54 #endif /* !atof */ |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
55 |
| 298 | 56 Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; |
| 57 Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; | |
| 58 Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; | |
| 648 | 59 Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
60 Lisp_Object Qcyclic_variable_indirection, Qcircular_list; |
| 298 | 61 Lisp_Object Qsetting_constant, Qinvalid_read_syntax; |
| 62 Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; | |
| 4036 | 63 Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; |
| 298 | 64 Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
65 Lisp_Object Qtext_read_only; |
| 53110 | 66 |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
67 Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; |
| 298 | 68 Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; |
| 69 Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; | |
| 26931 | 70 Lisp_Object Qbuffer_or_string_p, Qkeywordp; |
| 298 | 71 Lisp_Object Qboundp, Qfboundp; |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
72 Lisp_Object Qchar_table_p, Qvector_or_char_table_p; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
73 |
| 298 | 74 Lisp_Object Qcdr; |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
75 Lisp_Object Qad_advice_info, Qad_activate_internal; |
| 298 | 76 |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
77 Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error; |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
78 Lisp_Object Qoverflow_error, Qunderflow_error; |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
79 |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
80 Lisp_Object Qfloatp; |
| 298 | 81 Lisp_Object Qnumberp, Qnumber_or_marker_p; |
| 82 | |
| 53110 | 83 Lisp_Object Qinteger; |
| 84 static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; | |
| 17027 | 85 static Lisp_Object Qfloat, Qwindow_configuration, Qwindow; |
| 86 Lisp_Object Qprocess; | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
87 static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; |
| 26185 | 88 static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
89 static Lisp_Object Qsubrp, Qmany, Qunevalled; |
|
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
90 Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
91 |
|
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
92 Lisp_Object Qinteractive_form; |
|
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
93 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
94 static void swap_in_symval_forwarding (struct Lisp_Symbol *, struct Lisp_Buffer_Local_Value *); |
|
17830
3cf4a044aaad
Declare set_internal as Lisp_Object in advance to avoid
Kenichi Handa <handa@m17n.org>
parents:
17780
diff
changeset
|
95 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
96 Lisp_Object Vmost_positive_fixnum, Vmost_negative_fixnum; |
|
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
37853
diff
changeset
|
97 |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
98 |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
99 void |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
100 circular_list_error (list) |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
101 Lisp_Object list; |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
102 { |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
103 xsignal (Qcircular_list, list); |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
104 } |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
105 |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
106 |
| 298 | 107 Lisp_Object |
| 108 wrong_type_argument (predicate, value) | |
| 109 register Lisp_Object predicate, value; | |
| 110 { | |
|
105885
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
111 /* If VALUE is not even a valid Lisp object, we'd want to abort here |
|
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
112 where we can get a backtrace showing where it came from. We used |
|
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
113 to try and do that by checking the tagbits, but nowadays all |
|
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
114 tagbits are potentially valid. */ |
|
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
115 /* if ((unsigned int) XTYPE (value) >= Lisp_Type_Limit) |
|
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
116 * abort (); */ |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
117 |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
118 xsignal2 (Qwrong_type_argument, predicate, value); |
| 298 | 119 } |
| 120 | |
| 21514 | 121 void |
| 298 | 122 pure_write_error () |
| 123 { | |
| 124 error ("Attempt to modify read-only object"); | |
| 125 } | |
| 126 | |
| 127 void | |
| 128 args_out_of_range (a1, a2) | |
| 129 Lisp_Object a1, a2; | |
| 130 { | |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
131 xsignal2 (Qargs_out_of_range, a1, a2); |
| 298 | 132 } |
| 133 | |
| 134 void | |
| 135 args_out_of_range_3 (a1, a2, a3) | |
| 136 Lisp_Object a1, a2, a3; | |
| 137 { | |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
138 xsignal3 (Qargs_out_of_range, a1, a2, a3); |
| 298 | 139 } |
| 140 | |
| 141 /* On some machines, XINT needs a temporary location. | |
| 142 Here it is, in case it is needed. */ | |
| 143 | |
| 144 int sign_extend_temp; | |
| 145 | |
| 146 /* On a few machines, XINT can only be done by calling this. */ | |
| 147 | |
| 148 int | |
| 149 sign_extend_lisp_int (num) | |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
150 EMACS_INT num; |
| 298 | 151 { |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
152 if (num & (((EMACS_INT) 1) << (VALBITS - 1))) |
|
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
153 return num | (((EMACS_INT) (-1)) << VALBITS); |
| 298 | 154 else |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
155 return num & ((((EMACS_INT) 1) << VALBITS) - 1); |
| 298 | 156 } |
| 157 | |
| 158 /* Data type predicates */ | |
| 159 | |
| 160 DEFUN ("eq", Feq, Seq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
161 doc: /* Return t if the two args are the same Lisp object. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
162 (obj1, obj2) |
| 298 | 163 Lisp_Object obj1, obj2; |
| 164 { | |
| 165 if (EQ (obj1, obj2)) | |
| 166 return Qt; | |
| 167 return Qnil; | |
| 168 } | |
| 169 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
170 DEFUN ("null", Fnull, Snull, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
171 doc: /* Return t if OBJECT is nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
172 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
173 Lisp_Object object; |
| 298 | 174 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
175 if (NILP (object)) |
| 298 | 176 return Qt; |
| 177 return Qnil; | |
| 178 } | |
| 179 | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
180 DEFUN ("type-of", Ftype_of, Stype_of, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
181 doc: /* Return a symbol representing the type of OBJECT. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
182 The symbol returned names the object's basic type; |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
183 for example, (type-of 1) returns `integer'. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
184 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
185 Lisp_Object object; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
186 { |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
187 switch (XTYPE (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
188 { |
|
105885
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
189 case_Lisp_Int: |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
190 return Qinteger; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
191 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
192 case Lisp_Symbol: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
193 return Qsymbol; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
194 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
195 case Lisp_String: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
196 return Qstring; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
197 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
198 case Lisp_Cons: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
199 return Qcons; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
200 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
201 case Lisp_Misc: |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
202 switch (XMISCTYPE (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
203 { |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
204 case Lisp_Misc_Marker: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
205 return Qmarker; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
206 case Lisp_Misc_Overlay: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
207 return Qoverlay; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
208 case Lisp_Misc_Float: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
209 return Qfloat; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
210 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
211 abort (); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
212 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
213 case Lisp_Vectorlike: |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
214 if (WINDOW_CONFIGURATIONP (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
215 return Qwindow_configuration; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
216 if (PROCESSP (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
217 return Qprocess; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
218 if (WINDOWP (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
219 return Qwindow; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
220 if (SUBRP (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
221 return Qsubr; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
222 if (COMPILEDP (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
223 return Qcompiled_function; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
224 if (BUFFERP (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
225 return Qbuffer; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
226 if (CHAR_TABLE_P (object)) |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
227 return Qchar_table; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
228 if (BOOL_VECTOR_P (object)) |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
229 return Qbool_vector; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
230 if (FRAMEP (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
231 return Qframe; |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
232 if (HASH_TABLE_P (object)) |
| 26185 | 233 return Qhash_table; |
|
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
234 if (FONT_SPEC_P (object)) |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
235 return Qfont_spec; |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
236 if (FONT_ENTITY_P (object)) |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
237 return Qfont_entity; |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
238 if (FONT_OBJECT_P (object)) |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
239 return Qfont_object; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
240 return Qvector; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
241 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
242 case Lisp_Float: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
243 return Qfloat; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
244 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
245 default: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
246 abort (); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
247 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
248 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
249 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
250 DEFUN ("consp", Fconsp, Sconsp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
251 doc: /* Return t if OBJECT is a cons cell. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
252 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
253 Lisp_Object object; |
| 298 | 254 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
255 if (CONSP (object)) |
| 298 | 256 return Qt; |
| 257 return Qnil; | |
| 258 } | |
| 259 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
260 DEFUN ("atom", Fatom, Satom, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
261 doc: /* Return t if OBJECT is not a cons cell. This includes nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
262 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
263 Lisp_Object object; |
| 298 | 264 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
265 if (CONSP (object)) |
| 298 | 266 return Qnil; |
| 267 return Qt; | |
| 268 } | |
| 269 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
270 DEFUN ("listp", Flistp, Slistp, 1, 1, 0, |
| 68497 | 271 doc: /* Return t if OBJECT is a list, that is, a cons cell or nil. |
| 272 Otherwise, return nil. */) | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
273 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
274 Lisp_Object object; |
| 298 | 275 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
276 if (CONSP (object) || NILP (object)) |
| 298 | 277 return Qt; |
| 278 return Qnil; | |
| 279 } | |
| 280 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
281 DEFUN ("nlistp", Fnlistp, Snlistp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
282 doc: /* Return t if OBJECT is not a list. Lists include nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
283 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
284 Lisp_Object object; |
| 298 | 285 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
286 if (CONSP (object) || NILP (object)) |
| 298 | 287 return Qnil; |
| 288 return Qt; | |
| 289 } | |
| 290 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
291 DEFUN ("symbolp", Fsymbolp, Ssymbolp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
292 doc: /* Return t if OBJECT is a symbol. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
293 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
294 Lisp_Object object; |
| 298 | 295 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
296 if (SYMBOLP (object)) |
| 298 | 297 return Qt; |
| 298 return Qnil; | |
| 299 } | |
| 300 | |
| 26931 | 301 /* Define this in C to avoid unnecessarily consing up the symbol |
| 302 name. */ | |
| 303 DEFUN ("keywordp", Fkeywordp, Skeywordp, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
304 doc: /* Return t if OBJECT is a keyword. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
305 This means that it is a symbol with a print name beginning with `:' |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
306 interned in the initial obarray. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
307 (object) |
| 26931 | 308 Lisp_Object object; |
| 309 { | |
| 310 if (SYMBOLP (object) | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
311 && SREF (SYMBOL_NAME (object), 0) == ':' |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
312 && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object)) |
| 26931 | 313 return Qt; |
| 314 return Qnil; | |
| 315 } | |
| 316 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
317 DEFUN ("vectorp", Fvectorp, Svectorp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
318 doc: /* Return t if OBJECT is a vector. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
319 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
320 Lisp_Object object; |
| 298 | 321 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
322 if (VECTORP (object)) |
| 298 | 323 return Qt; |
| 324 return Qnil; | |
| 325 } | |
| 326 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
327 DEFUN ("stringp", Fstringp, Sstringp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
328 doc: /* Return t if OBJECT is a string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
329 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
330 Lisp_Object object; |
| 298 | 331 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
332 if (STRINGP (object)) |
| 298 | 333 return Qt; |
| 334 return Qnil; | |
| 335 } | |
| 336 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
337 DEFUN ("multibyte-string-p", Fmultibyte_string_p, Smultibyte_string_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
338 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
339 doc: /* Return t if OBJECT is a multibyte string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
340 (object) |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
341 Lisp_Object object; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
342 { |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
343 if (STRINGP (object) && STRING_MULTIBYTE (object)) |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
344 return Qt; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
345 return Qnil; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
346 } |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
347 |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
348 DEFUN ("char-table-p", Fchar_table_p, Schar_table_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
349 doc: /* Return t if OBJECT is a char-table. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
350 (object) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
351 Lisp_Object object; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
352 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
353 if (CHAR_TABLE_P (object)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
354 return Qt; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
355 return Qnil; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
356 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
357 |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
358 DEFUN ("vector-or-char-table-p", Fvector_or_char_table_p, |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
359 Svector_or_char_table_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
360 doc: /* Return t if OBJECT is a char-table or vector. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
361 (object) |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
362 Lisp_Object object; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
363 { |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
364 if (VECTORP (object) || CHAR_TABLE_P (object)) |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
365 return Qt; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
366 return Qnil; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
367 } |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
368 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
369 DEFUN ("bool-vector-p", Fbool_vector_p, Sbool_vector_p, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
370 doc: /* Return t if OBJECT is a bool-vector. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
371 (object) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
372 Lisp_Object object; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
373 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
374 if (BOOL_VECTOR_P (object)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
375 return Qt; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
376 return Qnil; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
377 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
378 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
379 DEFUN ("arrayp", Farrayp, Sarrayp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
380 doc: /* Return t if OBJECT is an array (string or vector). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
381 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
382 Lisp_Object object; |
| 298 | 383 { |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
384 if (ARRAYP (object)) |
| 298 | 385 return Qt; |
| 386 return Qnil; | |
| 387 } | |
| 388 | |
| 389 DEFUN ("sequencep", Fsequencep, Ssequencep, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
390 doc: /* Return t if OBJECT is a sequence (list or array). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
391 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
392 register Lisp_Object object; |
| 298 | 393 { |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
394 if (CONSP (object) || NILP (object) || ARRAYP (object)) |
| 298 | 395 return Qt; |
| 396 return Qnil; | |
| 397 } | |
| 398 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
399 DEFUN ("bufferp", Fbufferp, Sbufferp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
400 doc: /* Return t if OBJECT is an editor buffer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
401 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
402 Lisp_Object object; |
| 298 | 403 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
404 if (BUFFERP (object)) |
| 298 | 405 return Qt; |
| 406 return Qnil; | |
| 407 } | |
| 408 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
409 DEFUN ("markerp", Fmarkerp, Smarkerp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
410 doc: /* Return t if OBJECT is a marker (editor pointer). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
411 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
412 Lisp_Object object; |
| 298 | 413 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
414 if (MARKERP (object)) |
| 298 | 415 return Qt; |
| 416 return Qnil; | |
| 417 } | |
| 418 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
419 DEFUN ("subrp", Fsubrp, Ssubrp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
420 doc: /* Return t if OBJECT is a built-in function. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
421 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
422 Lisp_Object object; |
| 298 | 423 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
424 if (SUBRP (object)) |
| 298 | 425 return Qt; |
| 426 return Qnil; | |
| 427 } | |
| 428 | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
429 DEFUN ("byte-code-function-p", Fbyte_code_function_p, Sbyte_code_function_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
430 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
431 doc: /* Return t if OBJECT is a byte-compiled function object. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
432 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
433 Lisp_Object object; |
| 298 | 434 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
435 if (COMPILEDP (object)) |
| 298 | 436 return Qt; |
| 437 return Qnil; | |
| 438 } | |
| 439 | |
|
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
440 DEFUN ("char-or-string-p", Fchar_or_string_p, Schar_or_string_p, 1, 1, 0, |
|
91019
57f4ffc03d13
(Fchar_or_string_p): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
90996
diff
changeset
|
441 doc: /* Return t if OBJECT is a character or a string. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
442 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
443 register Lisp_Object object; |
| 298 | 444 { |
|
88623
0d7705c8ee3c
(Fchar_or_string_p): Doc fix. Use CHARACTERP.
Dave Love <fx@gnu.org>
parents:
88368
diff
changeset
|
445 if (CHARACTERP (object) || STRINGP (object)) |
| 298 | 446 return Qt; |
| 447 return Qnil; | |
| 448 } | |
| 449 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
450 DEFUN ("integerp", Fintegerp, Sintegerp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
451 doc: /* Return t if OBJECT is an integer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
452 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
453 Lisp_Object object; |
| 298 | 454 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
455 if (INTEGERP (object)) |
| 298 | 456 return Qt; |
| 457 return Qnil; | |
| 458 } | |
| 459 | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
460 DEFUN ("integer-or-marker-p", Finteger_or_marker_p, Sinteger_or_marker_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
461 doc: /* Return t if OBJECT is an integer or a marker (editor pointer). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
462 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
463 register Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
464 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
465 if (MARKERP (object) || INTEGERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
466 return Qt; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
467 return Qnil; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
468 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
469 |
|
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
470 DEFUN ("natnump", Fnatnump, Snatnump, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
471 doc: /* Return t if OBJECT is a nonnegative integer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
472 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
473 Lisp_Object object; |
| 298 | 474 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
475 if (NATNUMP (object)) |
| 298 | 476 return Qt; |
| 477 return Qnil; | |
| 478 } | |
| 479 | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
480 DEFUN ("numberp", Fnumberp, Snumberp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
481 doc: /* Return t if OBJECT is a number (floating point or integer). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
482 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
483 Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
484 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
485 if (NUMBERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
486 return Qt; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
487 else |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
488 return Qnil; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
489 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
490 |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
491 DEFUN ("number-or-marker-p", Fnumber_or_marker_p, |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
492 Snumber_or_marker_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
493 doc: /* Return t if OBJECT is a number or a marker. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
494 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
495 Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
496 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
497 if (NUMBERP (object) || MARKERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
498 return Qt; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
499 return Qnil; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
500 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
501 |
| 298 | 502 DEFUN ("floatp", Ffloatp, Sfloatp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
503 doc: /* Return t if OBJECT is a floating point number. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
504 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
505 Lisp_Object object; |
| 298 | 506 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
507 if (FLOATP (object)) |
| 298 | 508 return Qt; |
| 509 return Qnil; | |
| 510 } | |
|
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
511 |
| 298 | 512 |
| 513 /* Extract and set components of lists */ | |
| 514 | |
| 515 DEFUN ("car", Fcar, Scar, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
516 doc: /* Return the car of LIST. If arg is nil, return nil. |
|
68444
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
517 Error if arg is not nil and not a cons cell. See also `car-safe'. |
|
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
518 |
|
68446
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
519 See Info node `(elisp)Cons Cells' for a discussion of related basic |
|
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
520 Lisp concepts such as car, cdr, cons cell and list. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
521 (list) |
| 298 | 522 register Lisp_Object list; |
| 523 { | |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
524 return CAR (list); |
| 298 | 525 } |
| 526 | |
| 527 DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
528 doc: /* Return the car of OBJECT if it is a cons cell, or else nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
529 (object) |
| 298 | 530 Lisp_Object object; |
| 531 { | |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
532 return CAR_SAFE (object); |
| 298 | 533 } |
| 534 | |
| 535 DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
536 doc: /* Return the cdr of LIST. If arg is nil, return nil. |
|
68444
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
537 Error if arg is not nil and not a cons cell. See also `cdr-safe'. |
|
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
538 |
|
68446
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
539 See Info node `(elisp)Cons Cells' for a discussion of related basic |
|
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
540 Lisp concepts such as cdr, car, cons cell and list. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
541 (list) |
| 298 | 542 register Lisp_Object list; |
| 543 { | |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
544 return CDR (list); |
| 298 | 545 } |
| 546 | |
| 547 DEFUN ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
548 doc: /* Return the cdr of OBJECT if it is a cons cell, or else nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
549 (object) |
| 298 | 550 Lisp_Object object; |
| 551 { | |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
552 return CDR_SAFE (object); |
| 298 | 553 } |
| 554 | |
| 555 DEFUN ("setcar", Fsetcar, Ssetcar, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
556 doc: /* Set the car of CELL to be NEWCAR. Returns NEWCAR. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
557 (cell, newcar) |
| 298 | 558 register Lisp_Object cell, newcar; |
| 559 { | |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
560 CHECK_CONS (cell); |
| 298 | 561 CHECK_IMPURE (cell); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
562 XSETCAR (cell, newcar); |
| 298 | 563 return newcar; |
| 564 } | |
| 565 | |
| 566 DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
567 doc: /* Set the cdr of CELL to be NEWCDR. Returns NEWCDR. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
568 (cell, newcdr) |
| 298 | 569 register Lisp_Object cell, newcdr; |
| 570 { | |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
571 CHECK_CONS (cell); |
| 298 | 572 CHECK_IMPURE (cell); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
573 XSETCDR (cell, newcdr); |
| 298 | 574 return newcdr; |
| 575 } | |
| 576 | |
| 577 /* Extract and set components of symbols */ | |
| 578 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
579 DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
580 doc: /* Return t if SYMBOL's value is not void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
581 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
582 register Lisp_Object symbol; |
| 298 | 583 { |
| 584 Lisp_Object valcontents; | |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
585 struct Lisp_Symbol *sym; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
586 CHECK_SYMBOL (symbol); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
587 sym = XSYMBOL (symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
588 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
589 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
590 switch (sym->redirect) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
591 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
592 case SYMBOL_PLAINVAL: valcontents = SYMBOL_VAL (sym); break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
593 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
594 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
595 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
596 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
597 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
598 /* In set_internal, we un-forward vars when their value is |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
599 set to Qunbound. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
600 return Qt; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
601 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
602 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
603 swap_in_symval_forwarding (sym, blv); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
604 valcontents = BLV_VALUE (blv); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
605 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
606 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
607 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
608 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
609 /* In set_internal, we un-forward vars when their value is |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
610 set to Qunbound. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
611 return Qt; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
612 default: abort (); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
613 } |
| 298 | 614 |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
615 return (EQ (valcontents, Qunbound) ? Qnil : Qt); |
| 298 | 616 } |
| 617 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
618 DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
619 doc: /* Return t if SYMBOL's function definition is not void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
620 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
621 register Lisp_Object symbol; |
| 298 | 622 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
623 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
624 return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt); |
| 298 | 625 } |
| 626 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
627 DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
628 doc: /* Make SYMBOL's value be void. |
|
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
629 Return SYMBOL. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
630 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
631 register Lisp_Object symbol; |
| 298 | 632 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
633 CHECK_SYMBOL (symbol); |
|
73838
a99be0fe5bd4
(Fmakunbound): Use SYMBOL_CONSTANT_P macro.
Juanma Barranquero <lekktu@gmail.com>
parents:
71973
diff
changeset
|
634 if (SYMBOL_CONSTANT_P (symbol)) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
635 xsignal1 (Qsetting_constant, symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
636 Fset (symbol, Qunbound); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
637 return symbol; |
| 298 | 638 } |
| 639 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
640 DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
641 doc: /* Make SYMBOL's function definition be void. |
|
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
642 Return SYMBOL. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
643 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
644 register Lisp_Object symbol; |
| 298 | 645 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
646 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
647 if (NILP (symbol) || EQ (symbol, Qt)) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
648 xsignal1 (Qsetting_constant, symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
649 XSYMBOL (symbol)->function = Qunbound; |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
650 return symbol; |
| 298 | 651 } |
| 652 | |
| 653 DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
654 doc: /* Return SYMBOL's function definition. Error if that is void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
655 (symbol) |
| 648 | 656 register Lisp_Object symbol; |
| 298 | 657 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
658 CHECK_SYMBOL (symbol); |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
659 if (!EQ (XSYMBOL (symbol)->function, Qunbound)) |
|
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
660 return XSYMBOL (symbol)->function; |
|
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
661 xsignal1 (Qvoid_function, symbol); |
| 298 | 662 } |
| 663 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
664 DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
665 doc: /* Return SYMBOL's property list. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
666 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
667 register Lisp_Object symbol; |
| 298 | 668 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
669 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
670 return XSYMBOL (symbol)->plist; |
| 298 | 671 } |
| 672 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
673 DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
674 doc: /* Return SYMBOL's name, a string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
675 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
676 register Lisp_Object symbol; |
| 298 | 677 { |
| 678 register Lisp_Object name; | |
| 679 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
680 CHECK_SYMBOL (symbol); |
|
45397
bc5d63652a0a
* data.c (Fkeywordp, Fsymbol_name, store_symval_forwarding)
Ken Raeburn <raeburn@raeburn.org>
parents:
42274
diff
changeset
|
681 name = SYMBOL_NAME (symbol); |
| 298 | 682 return name; |
| 683 } | |
| 684 | |
| 685 DEFUN ("fset", Ffset, Sfset, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
686 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
687 (symbol, definition) |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
688 register Lisp_Object symbol, definition; |
| 298 | 689 { |
|
79083
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
690 register Lisp_Object function; |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
691 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
692 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
693 if (NILP (symbol) || EQ (symbol, Qt)) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
694 xsignal1 (Qsetting_constant, symbol); |
|
79083
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
695 |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
696 function = XSYMBOL (symbol)->function; |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
697 |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
698 if (!NILP (Vautoload_queue) && !EQ (function, Qunbound)) |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
699 Vautoload_queue = Fcons (Fcons (symbol, function), Vautoload_queue); |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
700 |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
701 if (CONSP (function) && EQ (XCAR (function), Qautoload)) |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
702 Fput (symbol, Qautoload, XCDR (function)); |
|
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
703 |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
704 XSYMBOL (symbol)->function = definition; |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
705 /* Handle automatic advice activation */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
706 if (CONSP (XSYMBOL (symbol)->plist) && !NILP (Fget (symbol, Qad_advice_info))) |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
707 { |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
708 call2 (Qad_activate_internal, symbol, Qnil); |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
709 definition = XSYMBOL (symbol)->function; |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
710 } |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
711 return definition; |
| 298 | 712 } |
| 713 | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
714 extern Lisp_Object Qfunction_documentation; |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
715 |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
716 DEFUN ("defalias", Fdefalias, Sdefalias, 2, 3, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
717 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. |
| 46521 | 718 Associates the function with the current load file, if any. |
| 719 The optional third argument DOCSTRING specifies the documentation string | |
| 720 for SYMBOL; if it is omitted or nil, SYMBOL uses the documentation string | |
| 721 determined by DEFINITION. */) | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
722 (symbol, definition, docstring) |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
723 register Lisp_Object symbol, definition, docstring; |
|
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
724 { |
|
65600
bd15c2b64526
(Fdefalias): Signal an error if SYMBOL is not a symbol.
John Paul Wallington <jpw@pobox.com>
parents:
64770
diff
changeset
|
725 CHECK_SYMBOL (symbol); |
|
48723
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
726 if (CONSP (XSYMBOL (symbol)->function) |
|
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
727 && EQ (XCAR (XSYMBOL (symbol)->function), Qautoload)) |
|
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
728 LOADHIST_ATTACH (Fcons (Qt, symbol)); |
|
25132
07b44154638f
(Fdefalias): Call Ffset instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
23602
diff
changeset
|
729 definition = Ffset (symbol, definition); |
|
59110
5feed0f86f52
(Fdefalias): Use (defun . FN_NAME) in LOADHIST_ATTACH.
Richard M. Stallman <rms@gnu.org>
parents:
58986
diff
changeset
|
730 LOADHIST_ATTACH (Fcons (Qdefun, symbol)); |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
731 if (!NILP (docstring)) |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
732 Fput (symbol, Qfunction_documentation, docstring); |
|
16756
71113ba79b1b
(Fdefalias): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16754
diff
changeset
|
733 return definition; |
|
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
734 } |
|
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
735 |
| 298 | 736 DEFUN ("setplist", Fsetplist, Ssetplist, 2, 2, 0, |
| 52938 | 737 doc: /* Set SYMBOL's property list to NEWPLIST, and return NEWPLIST. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
738 (symbol, newplist) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
739 register Lisp_Object symbol, newplist; |
| 298 | 740 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
741 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
742 XSYMBOL (symbol)->plist = newplist; |
| 298 | 743 return newplist; |
| 744 } | |
| 648 | 745 |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
746 DEFUN ("subr-arity", Fsubr_arity, Ssubr_arity, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
747 doc: /* Return minimum and maximum number of args allowed for SUBR. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
748 SUBR must be a built-in function. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
749 The returned value is a pair (MIN . MAX). MIN is the minimum number |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
750 of args. MAX is the maximum number or the symbol `many', for a |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
751 function with `&rest' args, or `unevalled' for a special form. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
752 (subr) |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
753 Lisp_Object subr; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
754 { |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
755 short minargs, maxargs; |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
756 CHECK_SUBR (subr); |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
757 minargs = XSUBR (subr)->min_args; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
758 maxargs = XSUBR (subr)->max_args; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
759 if (maxargs == MANY) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
760 return Fcons (make_number (minargs), Qmany); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
761 else if (maxargs == UNEVALLED) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
762 return Fcons (make_number (minargs), Qunevalled); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
763 else |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
764 return Fcons (make_number (minargs), make_number (maxargs)); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
765 } |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
766 |
|
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
767 DEFUN ("subr-name", Fsubr_name, Ssubr_name, 1, 1, 0, |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
768 doc: /* Return name of subroutine SUBR. |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
769 SUBR must be a built-in function. */) |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
770 (subr) |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
771 Lisp_Object subr; |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
772 { |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
773 const char *name; |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
774 CHECK_SUBR (subr); |
|
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
775 name = XSUBR (subr)->symbol_name; |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
776 return make_string (name, strlen (name)); |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
777 } |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
778 |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
779 DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
780 doc: /* Return the interactive form of CMD or nil if none. |
|
56590
f48e32fbfc6c
(Finteractive_form): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56193
diff
changeset
|
781 If CMD is not a command, the return value is nil. |
|
f48e32fbfc6c
(Finteractive_form): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56193
diff
changeset
|
782 Value, if non-nil, is a list \(interactive SPEC). */) |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
783 (cmd) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
784 Lisp_Object cmd; |
|
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
785 { |
|
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
786 Lisp_Object fun = indirect_function (cmd); /* Check cycles. */ |
|
85292
3fd2159a6a89
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
84438
diff
changeset
|
787 |
|
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
788 if (NILP (fun) || EQ (fun, Qunbound)) |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
789 return Qnil; |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
790 |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
791 /* Use an `interactive-form' property if present, analogous to the |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
792 function-documentation property. */ |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
793 fun = cmd; |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
794 while (SYMBOLP (fun)) |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
795 { |
|
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
796 Lisp_Object tmp = Fget (fun, Qinteractive_form); |
|
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
797 if (!NILP (tmp)) |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
798 return tmp; |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
799 else |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
800 fun = Fsymbol_function (fun); |
|
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
801 } |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
802 |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
803 if (SUBRP (fun)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
804 { |
|
84438
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Micha?l Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
805 char *spec = XSUBR (fun)->intspec; |
|
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Micha?l Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
806 if (spec) |
|
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Micha?l Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
807 return list2 (Qinteractive, |
|
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Micha?l Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
808 (*spec != '(') ? build_string (spec) : |
|
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Micha?l Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
809 Fcar (Fread_from_string (build_string (spec), Qnil, Qnil))); |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
810 } |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
811 else if (COMPILEDP (fun)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
812 { |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
813 if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) > COMPILED_INTERACTIVE) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
814 return list2 (Qinteractive, AREF (fun, COMPILED_INTERACTIVE)); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
815 } |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
816 else if (CONSP (fun)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
817 { |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
818 Lisp_Object funcar = XCAR (fun); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
819 if (EQ (funcar, Qlambda)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
820 return Fassq (Qinteractive, Fcdr (XCDR (fun))); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
821 else if (EQ (funcar, Qautoload)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
822 { |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
823 struct gcpro gcpro1; |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
824 GCPRO1 (cmd); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
825 do_autoload (fun, cmd); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
826 UNGCPRO; |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
827 return Finteractive_form (cmd); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
828 } |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
829 } |
|
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
830 return Qnil; |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
831 } |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
832 |
| 298 | 833 |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
834 /*********************************************************************** |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
835 Getting and Setting Values of Symbols |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
836 ***********************************************************************/ |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
837 |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
838 /* Return the symbol holding SYMBOL's value. Signal |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
839 `cyclic-variable-indirection' if SYMBOL's chain of variable |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
840 indirections contains a loop. */ |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
841 |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
842 struct Lisp_Symbol * |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
843 indirect_variable (symbol) |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
844 struct Lisp_Symbol *symbol; |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
845 { |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
846 struct Lisp_Symbol *tortoise, *hare; |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
847 |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
848 hare = tortoise = symbol; |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
849 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
850 while (hare->redirect == SYMBOL_VARALIAS) |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
851 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
852 hare = SYMBOL_ALIAS (hare); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
853 if (hare->redirect != SYMBOL_VARALIAS) |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
854 break; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
855 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
856 hare = SYMBOL_ALIAS (hare); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
857 tortoise = SYMBOL_ALIAS (tortoise); |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
858 |
|
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
859 if (hare == tortoise) |
|
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
860 { |
|
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
861 Lisp_Object tem; |
|
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
862 XSETSYMBOL (tem, symbol); |
|
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
863 xsignal1 (Qcyclic_variable_indirection, tem); |
|
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
864 } |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
865 } |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
866 |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
867 return hare; |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
868 } |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
869 |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
870 |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
871 DEFUN ("indirect-variable", Findirect_variable, Sindirect_variable, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
872 doc: /* Return the variable at the end of OBJECT's variable chain. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
873 If OBJECT is a symbol, follow all variable indirections and return the final |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
874 variable. If OBJECT is not a symbol, just return it. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
875 Signal a cyclic-variable-indirection error if there is a loop in the |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
876 variable chain of symbols. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
877 (object) |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
878 Lisp_Object object; |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
879 { |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
880 if (SYMBOLP (object)) |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
881 XSETSYMBOL (object, indirect_variable (XSYMBOL (object))); |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
882 return object; |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
883 } |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
884 |
| 298 | 885 |
| 886 /* Given the raw contents of a symbol value cell, | |
| 887 return the Lisp value of the symbol. | |
| 888 This does not handle buffer-local variables; use | |
| 889 swap_in_symval_forwarding for that. */ | |
| 890 | |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
891 #define do_blv_forwarding(blv) \ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
892 ((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
893 |
| 298 | 894 Lisp_Object |
| 895 do_symval_forwarding (valcontents) | |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
896 register union Lisp_Fwd *valcontents; |
| 298 | 897 { |
| 898 register Lisp_Object val; | |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
899 switch (XFWDTYPE (valcontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
900 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
901 case Lisp_Fwd_Int: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
902 XSETINT (val, *XINTFWD (valcontents)->intvar); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
903 return val; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
904 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
905 case Lisp_Fwd_Bool: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
906 return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
907 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
908 case Lisp_Fwd_Obj: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
909 return *XOBJFWD (valcontents)->objvar; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
910 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
911 case Lisp_Fwd_Buffer_Obj: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
912 return PER_BUFFER_VALUE (current_buffer, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
913 XBUFFER_OBJFWD (valcontents)->offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
914 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
915 case Lisp_Fwd_Kboard_Obj: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
916 /* We used to simply use current_kboard here, but from Lisp |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
917 code, it's value is often unexpected. It seems nicer to |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
918 allow constructions like this to work as intuitively expected: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
919 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
920 (with-selected-frame frame |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
921 (define-key local-function-map "\eOP" [f1])) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
922 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
923 On the other hand, this affects the semantics of |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
924 last-command and real-last-command, and people may rely on |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
925 that. I took a quick look at the Lisp codebase, and I |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
926 don't think anything will break. --lorentey */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
927 return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
928 + (char *)FRAME_KBOARD (SELECTED_FRAME ())); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
929 default: abort (); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
930 } |
| 298 | 931 } |
| 932 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
933 /* Store NEWVAL into SYMBOL, where VALCONTENTS is found in the value cell |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
934 of SYMBOL. If SYMBOL is buffer-local, VALCONTENTS should be the |
| 298 | 935 buffer-independent contents of the value cell: forwarded just one |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
936 step past the buffer-localness. |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
937 |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
938 BUF non-zero means set the value in buffer BUF instead of the |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
939 current buffer. This only plays a role for per-buffer variables. */ |
| 298 | 940 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
941 #define store_blv_forwarding(blv, newval, buf) \ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
942 do { \ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
943 if ((blv)->forwarded) \ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
944 store_symval_forwarding (BLV_FWD (blv), (newval), (buf)); \ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
945 else \ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
946 SET_BLV_VALUE (blv, newval); \ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
947 } while (0) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
948 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
949 static void |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
950 store_symval_forwarding (/* symbol, */ valcontents, newval, buf) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
951 /* struct Lisp_Symbol *symbol; */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
952 union Lisp_Fwd *valcontents; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
953 register Lisp_Object newval; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
954 struct buffer *buf; |
| 298 | 955 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
956 switch (XFWDTYPE (valcontents)) |
| 298 | 957 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
958 case Lisp_Fwd_Int: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
959 CHECK_NUMBER (newval); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
960 *XINTFWD (valcontents)->intvar = XINT (newval); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
961 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
962 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
963 case Lisp_Fwd_Bool: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
964 *XBOOLFWD (valcontents)->boolvar = !NILP (newval); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
965 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
966 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
967 case Lisp_Fwd_Obj: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
968 *XOBJFWD (valcontents)->objvar = newval; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
969 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
970 /* If this variable is a default for something stored |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
971 in the buffer itself, such as default-fill-column, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
972 find the buffers that don't have local values for it |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
973 and update them. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
974 if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
975 && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1)) |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
976 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
977 int offset = ((char *) XOBJFWD (valcontents)->objvar |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
978 - (char *) &buffer_defaults); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
979 int idx = PER_BUFFER_IDX (offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
980 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
981 Lisp_Object tail; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
982 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
983 if (idx <= 0) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
984 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
985 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
986 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
|
53365
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
987 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
988 Lisp_Object buf; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
989 struct buffer *b; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
990 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
991 buf = Fcdr (XCAR (tail)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
992 if (!BUFFERP (buf)) continue; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
993 b = XBUFFER (buf); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
994 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
995 if (! PER_BUFFER_VALUE_P (b, idx)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
996 PER_BUFFER_VALUE (b, offset) = newval; |
|
53365
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
997 } |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
998 } |
| 298 | 999 break; |
| 1000 | |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1001 case Lisp_Fwd_Buffer_Obj: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1002 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1003 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1004 Lisp_Object type = XBUFFER_OBJFWD (valcontents)->slottype; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1005 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1006 if (!(NILP (type) || NILP (newval) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1007 || (XINT (type) == LISP_INT_TAG |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1008 ? INTEGERP (newval) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1009 : XTYPE (newval) == XINT (type)))) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1010 buffer_slot_type_mismatch (newval, XINT (type)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1011 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1012 if (buf == NULL) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1013 buf = current_buffer; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1014 PER_BUFFER_VALUE (buf, offset) = newval; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1015 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1016 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1017 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1018 case Lisp_Fwd_Kboard_Obj: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1019 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1020 char *base = (char *) FRAME_KBOARD (SELECTED_FRAME ()); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1021 char *p = base + XKBOARD_OBJFWD (valcontents)->offset; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1022 *(Lisp_Object *) p = newval; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1023 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1024 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1025 |
| 298 | 1026 default: |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1027 abort (); /* goto def; */ |
| 298 | 1028 } |
| 1029 } | |
| 1030 | |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1031 /* Set up SYMBOL to refer to its global binding. |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1032 This makes it safe to alter the status of other bindings. */ |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1033 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1034 void |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1035 swap_in_global_binding (symbol) |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1036 struct Lisp_Symbol *symbol; |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1037 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1038 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (symbol); |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1039 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1040 /* Unload the previously loaded binding. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1041 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1042 SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd)); |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1043 |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1044 /* Select the global binding in the symbol. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1045 blv->valcell = blv->defcell; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1046 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1047 store_symval_forwarding (blv->fwd, XCDR (blv->defcell), NULL); |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1048 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1049 /* Indicate that the global binding is set up now. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1050 blv->where = Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1051 SET_BLV_FOUND (blv, 0); |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1052 } |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1053 |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1054 /* Set up the buffer-local symbol SYMBOL for validity in the current buffer. |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1055 VALCONTENTS is the contents of its value cell, |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1056 which points to a struct Lisp_Buffer_Local_Value. |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1057 |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1058 Return the value forwarded one step past the buffer-local stage. |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1059 This could be another forwarding pointer. */ |
| 298 | 1060 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1061 static void |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1062 swap_in_symval_forwarding (symbol, blv) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1063 struct Lisp_Symbol *symbol; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1064 struct Lisp_Buffer_Local_Value *blv; |
| 298 | 1065 { |
| 1066 register Lisp_Object tem1; | |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1067 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1068 eassert (blv == SYMBOL_BLV (symbol)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1069 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1070 tem1 = blv->where; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1071 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1072 if (NILP (tem1) |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1073 || (blv->frame_local |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1074 ? !EQ (selected_frame, tem1) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1075 : current_buffer != XBUFFER (tem1))) |
| 298 | 1076 { |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1077 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1078 /* Unload the previously loaded binding. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1079 tem1 = blv->valcell; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1080 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1081 SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd)); |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1082 /* Choose the new binding. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1083 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1084 Lisp_Object var; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1085 XSETSYMBOL (var, symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1086 if (blv->frame_local) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1087 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1088 tem1 = assq_no_quit (var, XFRAME (selected_frame)->param_alist); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1089 blv->where = selected_frame; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1090 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1091 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1092 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1093 tem1 = assq_no_quit (var, current_buffer->local_var_alist); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1094 XSETBUFFER (blv->where, current_buffer); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1095 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1096 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1097 if (!(blv->found = !NILP (tem1))) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1098 tem1 = blv->defcell; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1099 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1100 /* Load the new binding. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1101 blv->valcell = tem1; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1102 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1103 store_symval_forwarding (blv->fwd, BLV_VALUE (blv), NULL); |
| 298 | 1104 } |
| 1105 } | |
| 1106 | |
| 514 | 1107 /* Find the value of a symbol, returning Qunbound if it's not bound. |
| 1108 This is helpful for code which just wants to get a variable's value | |
| 14036 | 1109 if it has one, without signaling an error. |
| 514 | 1110 Note that it must not be possible to quit |
| 1111 within this function. Great care is required for this. */ | |
| 298 | 1112 |
| 514 | 1113 Lisp_Object |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1114 find_symbol_value (symbol) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1115 Lisp_Object symbol; |
| 298 | 1116 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1117 struct Lisp_Symbol *sym; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1118 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1119 CHECK_SYMBOL (symbol); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1120 sym = XSYMBOL (symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1121 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1122 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1123 switch (sym->redirect) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1124 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1125 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1126 case SYMBOL_PLAINVAL: return SYMBOL_VAL (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1127 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1128 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1129 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1130 swap_in_symval_forwarding (sym, blv); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1131 return blv->fwd ? do_symval_forwarding (blv->fwd) : BLV_VALUE (blv); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1132 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1133 /* FALLTHROUGH */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1134 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1135 return do_symval_forwarding (SYMBOL_FWD (sym)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1136 default: abort (); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1137 } |
| 298 | 1138 } |
| 1139 | |
| 514 | 1140 DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1141 doc: /* Return SYMBOL's value. Error if that is void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1142 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1143 Lisp_Object symbol; |
| 514 | 1144 { |
|
6497
89ff61b53cee
(store_symval_forwarding, Fsymbol_value): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6459
diff
changeset
|
1145 Lisp_Object val; |
| 514 | 1146 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1147 val = find_symbol_value (symbol); |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1148 if (!EQ (val, Qunbound)) |
| 514 | 1149 return val; |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1150 |
|
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1151 xsignal1 (Qvoid_variable, symbol); |
| 514 | 1152 } |
| 1153 | |
| 298 | 1154 DEFUN ("set", Fset, Sset, 2, 2, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1155 doc: /* Set SYMBOL's value to NEWVAL, and return NEWVAL. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1156 (symbol, newval) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1157 register Lisp_Object symbol, newval; |
| 298 | 1158 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1159 set_internal (symbol, newval, current_buffer, 0); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1160 return newval; |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1161 } |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1162 |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1163 /* Return 1 if SYMBOL currently has a let-binding |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1164 which was made in the buffer that is now current. */ |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1165 |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1166 static int |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1167 let_shadows_buffer_binding_p (struct Lisp_Symbol *symbol) |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1168 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1169 struct specbinding *p; |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1170 |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1171 for (p = specpdl_ptr - 1; p >= specpdl; p--) |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1172 if (p->func == NULL |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1173 && CONSP (p->symbol)) |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1174 { |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1175 struct Lisp_Symbol *let_bound_symbol = XSYMBOL (XCAR (p->symbol)); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1176 eassert (let_bound_symbol->redirect != SYMBOL_VARALIAS); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1177 if (symbol == let_bound_symbol |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1178 && XBUFFER (XCDR (XCDR (p->symbol))) == current_buffer) |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1179 break; |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1180 } |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1181 |
|
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1182 return p >= specpdl; |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1183 } |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1184 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1185 static int |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1186 let_shadows_global_binding_p (symbol) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1187 Lisp_Object symbol; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1188 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1189 struct specbinding *p; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1190 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1191 for (p = specpdl_ptr - 1; p >= specpdl; p--) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1192 if (p->func == NULL && EQ (p->symbol, symbol)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1193 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1194 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1195 return p >= specpdl; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1196 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1197 |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1198 /* Store the value NEWVAL into SYMBOL. |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1199 If buffer-locality is an issue, BUF specifies which buffer to use. |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1200 (0 stands for the current buffer.) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1201 |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1202 If BINDFLAG is zero, then if this symbol is supposed to become |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1203 local in every buffer where it is set, then we make it local. |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1204 If BINDFLAG is nonzero, we don't do that. */ |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1205 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1206 void |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1207 set_internal (symbol, newval, buf, bindflag) |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1208 register Lisp_Object symbol, newval; |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1209 struct buffer *buf; |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1210 int bindflag; |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1211 { |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1212 int voide = EQ (newval, Qunbound); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1213 struct Lisp_Symbol *sym; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1214 Lisp_Object tem1; |
| 298 | 1215 |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1216 if (buf == 0) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1217 buf = current_buffer; |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1218 |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1219 /* If restoring in a dead buffer, do nothing. */ |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1220 if (NILP (buf->name)) |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1221 return; |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1222 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1223 CHECK_SYMBOL (symbol); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1224 if (SYMBOL_CONSTANT_P (symbol)) |
| 298 | 1225 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1226 if (NILP (Fkeywordp (symbol)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1227 || !EQ (newval, Fsymbol_value (symbol))) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1228 xsignal1 (Qsetting_constant, symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1229 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1230 /* Allow setting keywords to their own value. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1231 return; |
| 298 | 1232 } |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1233 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1234 sym = XSYMBOL (symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1235 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1236 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1237 switch (sym->redirect) |
| 298 | 1238 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1239 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1240 case SYMBOL_PLAINVAL: SET_SYMBOL_VAL (sym , newval); return; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1241 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1242 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1243 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1244 Lisp_Object tmp; XSETBUFFER (tmp, buf); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1245 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1246 /* If the current buffer is not the buffer whose binding is |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1247 loaded, or if there may be frame-local bindings and the frame |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1248 isn't the right one, or if it's a Lisp_Buffer_Local_Value and |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1249 the default binding is loaded, the loaded binding may be the |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1250 wrong one. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1251 if (!EQ (blv->where, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1252 blv->frame_local ? selected_frame : tmp) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1253 /* Also unload a global binding (if the var is local_if_set). */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1254 || (EQ (blv->valcell, blv->defcell))) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1255 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1256 /* The currently loaded binding is not necessarily valid. |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1257 We need to unload it, and choose a new binding. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1258 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1259 /* Write out `realvalue' to the old loaded binding. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1260 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1261 SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1262 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1263 /* Find the new binding. */ |
| 733 | 1264 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1265 XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1266 if (blv->frame_local) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1267 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1268 tem1 = Fassq (symbol, XFRAME (selected_frame)->param_alist); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1269 blv->where = selected_frame; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1270 } |
| 733 | 1271 else |
| 1272 { | |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1273 tem1 = Fassq (symbol, buf->local_var_alist); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1274 blv->where = tmp; |
| 733 | 1275 } |
| 1276 } | |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1277 blv->found = 1; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1278 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1279 if (NILP (tem1)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1280 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1281 /* This buffer still sees the default value. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1282 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1283 /* If the variable is a Lisp_Some_Buffer_Local_Value, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1284 or if this is `let' rather than `set', |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1285 make CURRENT-ALIST-ELEMENT point to itself, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1286 indicating that we're seeing the default value. |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1287 Likewise if the variable has been let-bound |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1288 in the current buffer. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1289 if (bindflag || !blv->local_if_set |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1290 || let_shadows_buffer_binding_p (sym)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1291 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1292 blv->found = 0; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1293 tem1 = blv->defcell; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1294 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1295 /* If it's a local_if_set, being set not bound, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1296 and we're not within a let that was made for this buffer, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1297 create a new buffer-local binding for the variable. |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1298 That means, give this buffer a new assoc for a local value |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1299 and load that binding. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1300 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1301 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1302 /* local_if_set is only supported for buffer-local |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1303 bindings, not for frame-local bindings. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1304 eassert (!blv->frame_local); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1305 tem1 = Fcons (symbol, XCDR (blv->defcell)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1306 buf->local_var_alist |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1307 = Fcons (tem1, buf->local_var_alist); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1308 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1309 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1310 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1311 /* Record which binding is now loaded. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1312 blv->valcell = tem1; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1313 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1314 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1315 /* Store the new value in the cons cell. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1316 SET_BLV_VALUE (blv, newval); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1317 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1318 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1319 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1320 if (voide) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1321 /* If storing void (making the symbol void), forward only through |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1322 buffer-local indicator, not through Lisp_Objfwd, etc. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1323 blv->fwd = NULL; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1324 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1325 store_symval_forwarding (blv->fwd, newval, buf); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1326 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1327 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1328 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1329 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1330 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1331 union Lisp_Fwd *innercontents = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1332 if (BUFFER_OBJFWDP (innercontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1333 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1334 int offset = XBUFFER_OBJFWD (innercontents)->offset; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1335 int idx = PER_BUFFER_IDX (offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1336 if (idx > 0 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1337 && !bindflag |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1338 && !let_shadows_buffer_binding_p (sym)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1339 SET_PER_BUFFER_VALUE_P (buf, idx, 1); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1340 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1341 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1342 if (voide) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1343 { /* If storing void (making the symbol void), forward only through |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1344 buffer-local indicator, not through Lisp_Objfwd, etc. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1345 sym->redirect = SYMBOL_PLAINVAL; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1346 SET_SYMBOL_VAL (sym, newval); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1347 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1348 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1349 store_symval_forwarding (/* sym, */ innercontents, newval, buf); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1350 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1351 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1352 default: abort (); |
| 298 | 1353 } |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1354 return; |
| 298 | 1355 } |
| 1356 | |
| 1357 /* Access or set a buffer-local symbol's default value. */ | |
| 1358 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1359 /* Return the default value of SYMBOL, but don't check for voidness. |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1360 Return Qunbound if it is void. */ |
| 298 | 1361 |
| 1362 Lisp_Object | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1363 default_value (symbol) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1364 Lisp_Object symbol; |
| 298 | 1365 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1366 struct Lisp_Symbol *sym; |
| 298 | 1367 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1368 CHECK_SYMBOL (symbol); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1369 sym = XSYMBOL (symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1370 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1371 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1372 switch (sym->redirect) |
| 298 | 1373 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1374 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1375 case SYMBOL_PLAINVAL: return SYMBOL_VAL (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1376 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1377 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1378 /* If var is set up for a buffer that lacks a local value for it, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1379 the current value is nominally the default value. |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1380 But the `realvalue' slot may be more up to date, since |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1381 ordinary setq stores just that slot. So use that. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1382 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1383 if (blv->fwd && EQ (blv->valcell, blv->defcell)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1384 return do_symval_forwarding (blv->fwd); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1385 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1386 return XCDR (blv->defcell); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1387 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1388 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1389 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1390 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1391 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1392 /* For a built-in buffer-local variable, get the default value |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1393 rather than letting do_symval_forwarding get the current value. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1394 if (BUFFER_OBJFWDP (valcontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1395 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1396 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1397 if (PER_BUFFER_IDX (offset) != 0) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1398 return PER_BUFFER_DEFAULT (offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1399 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1400 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1401 /* For other variables, get the current value. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1402 return do_symval_forwarding (valcontents); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1403 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1404 default: abort (); |
| 298 | 1405 } |
| 1406 } | |
| 1407 | |
| 1408 DEFUN ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1409 doc: /* Return t if SYMBOL has a non-void default value. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1410 This is the value that is seen in buffers that do not have their own values |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1411 for this variable. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1412 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1413 Lisp_Object symbol; |
| 298 | 1414 { |
| 1415 register Lisp_Object value; | |
| 1416 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1417 value = default_value (symbol); |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1418 return (EQ (value, Qunbound) ? Qnil : Qt); |
| 298 | 1419 } |
| 1420 | |
| 1421 DEFUN ("default-value", Fdefault_value, Sdefault_value, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1422 doc: /* Return SYMBOL's default value. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1423 This is the value that is seen in buffers that do not have their own values |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1424 for this variable. The default value is meaningful for variables with |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1425 local bindings in certain buffers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1426 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1427 Lisp_Object symbol; |
| 298 | 1428 { |
| 1429 register Lisp_Object value; | |
| 1430 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1431 value = default_value (symbol); |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1432 if (!EQ (value, Qunbound)) |
|
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1433 return value; |
|
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1434 |
|
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1435 xsignal1 (Qvoid_variable, symbol); |
| 298 | 1436 } |
| 1437 | |
| 1438 DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0, | |
|
55616
c2be5da8c8cb
(Fset_default): Make argument names match their use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55455
diff
changeset
|
1439 doc: /* Set SYMBOL's default value to VALUE. SYMBOL and VALUE are evaluated. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1440 The default value is seen in buffers that do not have their own values |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1441 for this variable. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1442 (symbol, value) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1443 Lisp_Object symbol, value; |
| 298 | 1444 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1445 struct Lisp_Symbol *sym; |
| 298 | 1446 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1447 CHECK_SYMBOL (symbol); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1448 if (SYMBOL_CONSTANT_P (symbol)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1449 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1450 if (NILP (Fkeywordp (symbol)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1451 || !EQ (value, Fdefault_value (symbol))) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1452 xsignal1 (Qsetting_constant, symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1453 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1454 /* Allow setting keywords to their own value. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1455 return value; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1456 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1457 sym = XSYMBOL (symbol); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1458 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1459 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1460 switch (sym->redirect) |
| 298 | 1461 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1462 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1463 case SYMBOL_PLAINVAL: return Fset (symbol, value); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1464 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1465 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1466 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1467 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1468 /* Store new value into the DEFAULT-VALUE slot. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1469 XSETCDR (blv->defcell, value); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1470 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1471 /* If the default binding is now loaded, set the REALVALUE slot too. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1472 if (blv->fwd && EQ (blv->defcell, blv->valcell)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1473 store_symval_forwarding (blv->fwd, value, NULL); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1474 return value; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1475 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1476 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1477 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1478 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1479 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1480 /* Handle variables like case-fold-search that have special slots |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1481 in the buffer. |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1482 Make them work apparently like Lisp_Buffer_Local_Value variables. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1483 if (BUFFER_OBJFWDP (valcontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1484 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1485 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1486 int idx = PER_BUFFER_IDX (offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1487 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1488 PER_BUFFER_DEFAULT (offset) = value; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1489 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1490 /* If this variable is not always local in all buffers, |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1491 set it in the buffers that don't nominally have a local value. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1492 if (idx > 0) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1493 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1494 struct buffer *b; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1495 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1496 for (b = all_buffers; b; b = b->next) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1497 if (!PER_BUFFER_VALUE_P (b, idx)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1498 PER_BUFFER_VALUE (b, offset) = value; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1499 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1500 return value; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1501 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1502 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1503 return Fset (symbol, value); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1504 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1505 default: abort (); |
| 298 | 1506 } |
| 1507 } | |
| 1508 | |
|
60064
896e880eab56
(Fsetq_default): Allow no arg case.
Richard M. Stallman <rms@gnu.org>
parents:
59110
diff
changeset
|
1509 DEFUN ("setq-default", Fsetq_default, Ssetq_default, 0, UNEVALLED, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1510 doc: /* Set the default value of variable VAR to VALUE. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1511 VAR, the variable name, is literal (not evaluated); |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1512 VALUE is an expression: it is evaluated and its value returned. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1513 The default value of a variable is seen in buffers |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1514 that do not have their own values for the variable. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1515 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1516 More generally, you can use multiple variables and values, as in |
|
55378
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1517 (setq-default VAR VALUE VAR VALUE...) |
|
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1518 This sets each VAR's default value to the corresponding VALUE. |
|
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1519 The VALUE for the Nth VAR can refer to the new default values |
|
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1520 of previous VARs. |
|
78140
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
1521 usage: (setq-default [VAR VALUE]...) */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1522 (args) |
| 298 | 1523 Lisp_Object args; |
| 1524 { | |
| 1525 register Lisp_Object args_left; | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1526 register Lisp_Object val, symbol; |
| 298 | 1527 struct gcpro gcpro1; |
| 1528 | |
| 490 | 1529 if (NILP (args)) |
| 298 | 1530 return Qnil; |
| 1531 | |
| 1532 args_left = args; | |
| 1533 GCPRO1 (args); | |
| 1534 | |
| 1535 do | |
| 1536 { | |
| 1537 val = Feval (Fcar (Fcdr (args_left))); | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1538 symbol = XCAR (args_left); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1539 Fset_default (symbol, val); |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1540 args_left = Fcdr (XCDR (args_left)); |
| 298 | 1541 } |
| 490 | 1542 while (!NILP (args_left)); |
| 298 | 1543 |
| 1544 UNGCPRO; | |
| 1545 return val; | |
| 1546 } | |
| 1547 | |
|
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1548 /* Lisp functions for creating and removing buffer-local variables. */ |
|
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1549 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1550 union Lisp_Val_Fwd |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1551 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1552 Lisp_Object value; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1553 union Lisp_Fwd *fwd; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1554 }; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1555 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1556 static struct Lisp_Buffer_Local_Value * |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1557 make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1558 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1559 struct Lisp_Buffer_Local_Value *blv |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1560 = xmalloc (sizeof (struct Lisp_Buffer_Local_Value)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1561 Lisp_Object symbol; XSETSYMBOL (symbol, sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1562 Lisp_Object tem = Fcons (symbol, (forwarded |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1563 ? do_symval_forwarding (valcontents.fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1564 : valcontents.value)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1565 /* Buffer_Local_Values cannot have as realval a buffer-local |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1566 or keyboard-local forwarding. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1567 eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1568 eassert (!(forwarded && KBOARD_OBJFWDP (valcontents.fwd))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1569 blv->fwd = forwarded ? valcontents.fwd : NULL; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1570 blv->where = Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1571 blv->frame_local = 0; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1572 blv->local_if_set = 0; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1573 blv->defcell = tem; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1574 blv->valcell = tem; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1575 SET_BLV_FOUND (blv, 0); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1576 return blv; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1577 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1578 |
| 298 | 1579 DEFUN ("make-variable-buffer-local", Fmake_variable_buffer_local, Smake_variable_buffer_local, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1580 1, 1, "vMake Variable Buffer Local: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1581 doc: /* Make VARIABLE become buffer-local whenever it is set. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1582 At any time, the value for the current buffer is in effect, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1583 unless the variable has never been set in this buffer, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1584 in which case the default value is in effect. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1585 Note that binding the variable with `let', or setting it while |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1586 a `let'-style binding made in this buffer is in effect, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1587 does not make the variable buffer-local. Return VARIABLE. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1588 |
|
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1589 In most cases it is better to use `make-local-variable', |
|
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1590 which makes a variable local in just one buffer. |
|
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1591 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1592 The function `default-value' gets the default value and `set-default' sets it. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1593 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1594 register Lisp_Object variable; |
| 298 | 1595 { |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1596 struct Lisp_Symbol *sym; |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1597 struct Lisp_Buffer_Local_Value *blv = NULL; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1598 union Lisp_Val_Fwd valcontents; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1599 int forwarded; |
| 298 | 1600 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1601 CHECK_SYMBOL (variable); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1602 sym = XSYMBOL (variable); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1603 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1604 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1605 switch (sym->redirect) |
| 298 | 1606 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1607 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1608 case SYMBOL_PLAINVAL: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1609 forwarded = 0; valcontents.value = SYMBOL_VAL (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1610 if (EQ (valcontents.value, Qunbound)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1611 valcontents.value = Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1612 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1613 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1614 blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1615 if (blv->frame_local) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1616 error ("Symbol %s may not be buffer-local", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1617 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1618 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1619 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1620 forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1621 if (KBOARD_OBJFWDP (valcontents.fwd)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1622 error ("Symbol %s may not be buffer-local", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1623 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1624 else if (BUFFER_OBJFWDP (valcontents.fwd)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1625 return variable; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1626 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1627 default: abort (); |
| 298 | 1628 } |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1629 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1630 if (sym->constant) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1631 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1632 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1633 if (!blv) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1634 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1635 blv = make_blv (sym, forwarded, valcontents); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1636 sym->redirect = SYMBOL_LOCALIZED; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1637 SET_SYMBOL_BLV (sym, blv); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1638 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1639 Lisp_Object symbol; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1640 XSETSYMBOL (symbol, sym); /* In case `variable' is aliased. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1641 if (let_shadows_global_binding_p (symbol)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1642 error ("Making %s buffer-local while let-bound!", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1643 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1644 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1645 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1646 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1647 blv->local_if_set = 1; |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1648 return variable; |
| 298 | 1649 } |
| 1650 | |
| 1651 DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1652 1, 1, "vMake Local Variable: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1653 doc: /* Make VARIABLE have a separate value in the current buffer. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1654 Other buffers will continue to share a common default value. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1655 \(The buffer-local value of VARIABLE starts out as the same value |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1656 VARIABLE previously had. If VARIABLE was void, it remains void.\) |
|
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1657 Return VARIABLE. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1658 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1659 If the variable is already arranged to become local when set, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1660 this function causes a local value to exist for this buffer, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1661 just as setting the variable would do. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1662 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1663 This function returns VARIABLE, and therefore |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1664 (set (make-local-variable 'VARIABLE) VALUE-EXP) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1665 works. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1666 |
|
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1667 See also `make-variable-buffer-local'. |
|
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1668 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1669 Do not use `make-local-variable' to make a hook variable buffer-local. |
|
40628
ae231ad6710d
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40123
diff
changeset
|
1670 Instead, use `add-hook' and specify t for the LOCAL argument. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1671 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1672 register Lisp_Object variable; |
| 298 | 1673 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1674 register Lisp_Object tem; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1675 int forwarded; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1676 union Lisp_Val_Fwd valcontents; |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1677 struct Lisp_Symbol *sym; |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1678 struct Lisp_Buffer_Local_Value *blv = NULL; |
| 298 | 1679 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1680 CHECK_SYMBOL (variable); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1681 sym = XSYMBOL (variable); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1682 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1683 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1684 switch (sym->redirect) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1685 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1686 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1687 case SYMBOL_PLAINVAL: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1688 forwarded = 0; valcontents.value = SYMBOL_VAL (sym); break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1689 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1690 blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1691 if (blv->frame_local) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1692 error ("Symbol %s may not be buffer-local", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1693 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1694 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1695 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1696 forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1697 if (KBOARD_OBJFWDP (valcontents.fwd)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1698 error ("Symbol %s may not be buffer-local", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1699 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1700 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1701 default: abort (); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1702 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1703 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1704 if (sym->constant) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1705 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1706 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1707 if (blv ? blv->local_if_set |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1708 : (forwarded && BUFFER_OBJFWDP (valcontents.fwd))) |
| 298 | 1709 { |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1710 tem = Fboundp (variable); |
| 298 | 1711 /* Make sure the symbol has a local value in this particular buffer, |
| 1712 by setting it to the same value it already has. */ | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1713 Fset (variable, (EQ (tem, Qt) ? Fsymbol_value (variable) : Qunbound)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1714 return variable; |
| 298 | 1715 } |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1716 if (!blv) |
| 298 | 1717 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1718 blv = make_blv (sym, forwarded, valcontents); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1719 sym->redirect = SYMBOL_LOCALIZED; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1720 SET_SYMBOL_BLV (sym, blv); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1721 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1722 Lisp_Object symbol; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1723 XSETSYMBOL (symbol, sym); /* In case `variable' is aliased. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1724 if (let_shadows_global_binding_p (symbol)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1725 error ("Making %s local to %s while let-bound!", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1726 SDATA (SYMBOL_NAME (variable)), SDATA (current_buffer->name)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1727 } |
| 298 | 1728 } |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1729 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1730 /* Make sure this buffer has its own value of symbol. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1731 XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1732 tem = Fassq (variable, current_buffer->local_var_alist); |
| 490 | 1733 if (NILP (tem)) |
| 298 | 1734 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1735 if (let_shadows_buffer_binding_p (sym)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1736 message ("Making %s buffer-local while locally let-bound!", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1737 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1738 |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1739 /* Swap out any local binding for some other buffer, and make |
|
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1740 sure the current value is permanently recorded, if it's the |
|
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1741 default value. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1742 find_symbol_value (variable); |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1743 |
| 298 | 1744 current_buffer->local_var_alist |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1745 = Fcons (Fcons (variable, XCDR (blv->defcell)), |
| 298 | 1746 current_buffer->local_var_alist); |
| 1747 | |
| 1748 /* Make sure symbol does not think it is set up for this buffer; | |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1749 force it to look once again for this buffer's value. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1750 if (current_buffer == XBUFFER (blv->where)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1751 blv->where = Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1752 /* blv->valcell = blv->defcell; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1753 * SET_BLV_FOUND (blv, 0); */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1754 blv->found = 0; |
|
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1755 } |
| 298 | 1756 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1757 /* If the symbol forwards into a C variable, then load the binding |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1758 for this buffer now. If C code modifies the variable before we |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1759 load the binding in, then that new value will clobber the default |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1760 binding the next time we unload it. */ |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1761 if (blv->fwd) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1762 swap_in_symval_forwarding (sym, blv); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1763 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1764 return variable; |
| 298 | 1765 } |
| 1766 | |
| 1767 DEFUN ("kill-local-variable", Fkill_local_variable, Skill_local_variable, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1768 1, 1, "vKill Local Variable: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1769 doc: /* Make VARIABLE no longer have a separate value in the current buffer. |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1770 From now on the default value will apply in this buffer. Return VARIABLE. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1771 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1772 register Lisp_Object variable; |
| 298 | 1773 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1774 register Lisp_Object tem; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1775 struct Lisp_Buffer_Local_Value *blv; |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1776 struct Lisp_Symbol *sym; |
| 298 | 1777 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1778 CHECK_SYMBOL (variable); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1779 sym = XSYMBOL (variable); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1780 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1781 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1782 switch (sym->redirect) |
| 298 | 1783 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1784 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1785 case SYMBOL_PLAINVAL: return variable; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1786 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1787 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1788 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1789 if (BUFFER_OBJFWDP (valcontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1790 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1791 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1792 int idx = PER_BUFFER_IDX (offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1793 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1794 if (idx > 0) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1795 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1796 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1797 PER_BUFFER_VALUE (current_buffer, offset) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1798 = PER_BUFFER_DEFAULT (offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1799 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1800 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1801 return variable; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1802 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1803 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1804 blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1805 if (blv->frame_local) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1806 return variable; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1807 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1808 default: abort (); |
| 298 | 1809 } |
| 1810 | |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1811 /* Get rid of this buffer's alist element, if any. */ |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1812 XSETSYMBOL (variable, sym); /* Propagate variable indirection. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1813 tem = Fassq (variable, current_buffer->local_var_alist); |
| 490 | 1814 if (!NILP (tem)) |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1815 current_buffer->local_var_alist |
|
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1816 = Fdelq (tem, current_buffer->local_var_alist); |
| 298 | 1817 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1818 /* If the symbol is set up with the current buffer's binding |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1819 loaded, recompute its value. We have to do it now, or else |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1820 forwarded objects won't work right. */ |
| 298 | 1821 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1822 Lisp_Object buf; XSETBUFFER (buf, current_buffer); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1823 if (EQ (buf, blv->where)) |
|
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1824 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1825 blv->where = Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1826 /* blv->valcell = blv->defcell; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1827 * SET_BLV_FOUND (blv, 0); */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1828 blv->found = 0; |
|
14745
f78162b0fc6e
(Fkill_local_variable): Call find_symbol_value directly,
Richard M. Stallman <rms@gnu.org>
parents:
14302
diff
changeset
|
1829 find_symbol_value (variable); |
|
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1830 } |
| 298 | 1831 } |
| 1832 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1833 return variable; |
| 298 | 1834 } |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1835 |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1836 /* Lisp functions for creating and removing buffer-local variables. */ |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1837 |
| 97885 | 1838 /* Obsolete since 22.2. NB adjust doc of modify-frame-parameters |
| 1839 when/if this is removed. */ | |
| 1840 | |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1841 DEFUN ("make-variable-frame-local", Fmake_variable_frame_local, Smake_variable_frame_local, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1842 1, 1, "vMake Variable Frame Local: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1843 doc: /* Enable VARIABLE to have frame-local bindings. |
|
66542
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1844 This does not create any frame-local bindings for VARIABLE, |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1845 it just makes them possible. |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1846 |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1847 A frame-local binding is actually a frame parameter value. |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1848 If a frame F has a value for the frame parameter named VARIABLE, |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1849 that also acts as a frame-local binding for VARIABLE in F-- |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1850 provided this function has been called to enable VARIABLE |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1851 to have frame-local bindings at all. |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1852 |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1853 The only way to create a frame-local binding for VARIABLE in a frame |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1854 is to set the VARIABLE frame parameter of that frame. See |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1855 `modify-frame-parameters' for how to set frame parameters. |
|
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1856 |
|
97886
8e29e47e574f
(Fmake_variable_frame_local): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97885
diff
changeset
|
1857 Note that since Emacs 23.1, variables cannot be both buffer-local and |
|
8e29e47e574f
(Fmake_variable_frame_local): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97885
diff
changeset
|
1858 frame-local any more (buffer-local bindings used to take precedence over |
|
8e29e47e574f
(Fmake_variable_frame_local): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97885
diff
changeset
|
1859 frame-local bindings). */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1860 (variable) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1861 register Lisp_Object variable; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1862 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1863 int forwarded; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1864 union Lisp_Val_Fwd valcontents; |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1865 struct Lisp_Symbol *sym; |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1866 struct Lisp_Buffer_Local_Value *blv = NULL; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1867 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1868 CHECK_SYMBOL (variable); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1869 sym = XSYMBOL (variable); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1870 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1871 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1872 switch (sym->redirect) |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1873 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1874 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1875 case SYMBOL_PLAINVAL: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1876 forwarded = 0; valcontents.value = SYMBOL_VAL (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1877 if (EQ (valcontents.value, Qunbound)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1878 valcontents.value = Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1879 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1880 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1881 if (SYMBOL_BLV (sym)->frame_local) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1882 return variable; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1883 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1884 error ("Symbol %s may not be frame-local", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1885 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1886 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1887 forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1888 if (KBOARD_OBJFWDP (valcontents.fwd) || BUFFER_OBJFWDP (valcontents.fwd)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1889 error ("Symbol %s may not be frame-local", |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1890 SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1891 break; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1892 default: abort (); |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1893 } |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1894 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1895 if (sym->constant) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1896 error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable))); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1897 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1898 blv = make_blv (sym, forwarded, valcontents); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1899 blv->frame_local = 1; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1900 sym->redirect = SYMBOL_LOCALIZED; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1901 SET_SYMBOL_BLV (sym, blv); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1902 return variable; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1903 } |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1904 |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1905 DEFUN ("local-variable-p", Flocal_variable_p, Slocal_variable_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1906 1, 2, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1907 doc: /* Non-nil if VARIABLE has a local binding in buffer BUFFER. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1908 BUFFER defaults to the current buffer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1909 (variable, buffer) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1910 register Lisp_Object variable, buffer; |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1911 { |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1912 register struct buffer *buf; |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1913 struct Lisp_Symbol *sym; |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1914 |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1915 if (NILP (buffer)) |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1916 buf = current_buffer; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1917 else |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1918 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1919 CHECK_BUFFER (buffer); |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1920 buf = XBUFFER (buffer); |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1921 } |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1922 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1923 CHECK_SYMBOL (variable); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1924 sym = XSYMBOL (variable); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1925 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1926 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1927 switch (sym->redirect) |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1928 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1929 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1930 case SYMBOL_PLAINVAL: return Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1931 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1932 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1933 Lisp_Object tail, elt, tmp; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1934 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1935 XSETBUFFER (tmp, buf); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1936 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1937 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1938 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1939 elt = XCAR (tail); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1940 if (EQ (variable, XCAR (elt))) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1941 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1942 eassert (!blv->frame_local); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1943 eassert (BLV_FOUND (blv) || !EQ (blv->where, tmp)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1944 return Qt; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1945 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1946 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1947 eassert (!BLV_FOUND (blv) || !EQ (blv->where, tmp)); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1948 return Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1949 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1950 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1951 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1952 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1953 if (BUFFER_OBJFWDP (valcontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1954 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1955 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1956 int idx = PER_BUFFER_IDX (offset); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1957 if (idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1958 return Qt; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1959 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1960 return Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1961 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1962 default: abort (); |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1963 } |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1964 } |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1965 |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1966 DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1967 1, 2, 0, |
|
57618
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1968 doc: /* Non-nil if VARIABLE will be local in buffer BUFFER when set there. |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1969 More precisely, this means that setting the variable \(with `set' or`setq'), |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1970 while it does not have a `let'-style binding that was made in BUFFER, |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1971 will produce a buffer local binding. See Info node |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1972 `(elisp)Creating Buffer-Local'. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1973 BUFFER defaults to the current buffer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1974 (variable, buffer) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1975 register Lisp_Object variable, buffer; |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1976 { |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1977 struct Lisp_Symbol *sym; |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1978 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1979 CHECK_SYMBOL (variable); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1980 sym = XSYMBOL (variable); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1981 |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1982 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1983 switch (sym->redirect) |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1984 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1985 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1986 case SYMBOL_PLAINVAL: return Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1987 case SYMBOL_LOCALIZED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1988 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1989 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1990 if (blv->local_if_set) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1991 return Qt; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1992 XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1993 return Flocal_variable_p (variable, buffer); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1994 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1995 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1996 /* All BUFFER_OBJFWD slots become local if they are set. */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1997 return (BUFFER_OBJFWDP (SYMBOL_FWD (sym)) ? Qt : Qnil); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1998 default: abort (); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1999 } |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
2000 } |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2001 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2002 DEFUN ("variable-binding-locus", Fvariable_binding_locus, Svariable_binding_locus, |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2003 1, 1, 0, |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2004 doc: /* Return a value indicating where VARIABLE's current binding comes from. |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2005 If the current binding is buffer-local, the value is the current buffer. |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2006 If the current binding is frame-local, the value is the selected frame. |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2007 If the current binding is global (the default), the value is nil. */) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2008 (variable) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2009 register Lisp_Object variable; |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2010 { |
|
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
2011 struct Lisp_Symbol *sym; |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2012 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2013 CHECK_SYMBOL (variable); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2014 sym = XSYMBOL (variable); |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2015 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2016 /* Make sure the current binding is actually swapped in. */ |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2017 find_symbol_value (variable); |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2018 |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2019 start: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2020 switch (sym->redirect) |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2021 { |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2022 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2023 case SYMBOL_PLAINVAL: return Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2024 case SYMBOL_FORWARDED: |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2025 { |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2026 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2027 if (KBOARD_OBJFWDP (valcontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2028 return Fframe_terminal (Fselected_frame ()); |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2029 else if (!BUFFER_OBJFWDP (valcontents)) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2030 return Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2031 } |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2032 /* FALLTHROUGH */ |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2033 case SYMBOL_LOCALIZED: |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2034 /* For a local variable, record both the symbol and which |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2035 buffer's or frame's value we are saving. */ |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2036 if (!NILP (Flocal_variable_p (variable, Qnil))) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2037 return Fcurrent_buffer (); |
|
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2038 else if (sym->redirect == SYMBOL_LOCALIZED |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2039 && BLV_FOUND (SYMBOL_BLV (sym))) |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2040 return SYMBOL_BLV (sym)->where; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2041 else |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2042 return Qnil; |
|
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
2043 default: abort (); |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2044 } |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
2045 } |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2046 |
|
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
2047 /* This code is disabled now that we use the selected frame to return |
|
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
2048 keyboard-local-values. */ |
|
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
2049 #if 0 |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2050 extern struct terminal *get_terminal P_ ((Lisp_Object display, int)); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2051 |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2052 DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0, |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2053 doc: /* Return the terminal-local value of SYMBOL on TERMINAL. |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2054 If SYMBOL is not a terminal-local variable, then return its normal |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2055 value, like `symbol-value'. |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2056 |
|
103052
e68707cf48a5
* keyboard.c (Fset_input_meta_mode): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102718
diff
changeset
|
2057 TERMINAL may be a terminal object, a frame, or nil (meaning the |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2058 selected frame's terminal device). */) |
|
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2059 (symbol, terminal) |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2060 Lisp_Object symbol; |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2061 Lisp_Object terminal; |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2062 { |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2063 Lisp_Object result; |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2064 struct terminal *t = get_terminal (terminal, 1); |
|
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2065 push_kboard (t->kboard); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2066 result = Fsymbol_value (symbol); |
|
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2067 pop_kboard (); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2068 return result; |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2069 } |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2070 |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2071 DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_local_value, 3, 3, 0, |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2072 doc: /* Set the terminal-local binding of SYMBOL on TERMINAL to VALUE. |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2073 If VARIABLE is not a terminal-local variable, then set its normal |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
2074 binding, like `set'. |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
2075 |
|
103052
e68707cf48a5
* keyboard.c (Fset_input_meta_mode): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102718
diff
changeset
|
2076 TERMINAL may be a terminal object, a frame, or nil (meaning the |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2077 selected frame's terminal device). */) |
|
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2078 (symbol, terminal, value) |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2079 Lisp_Object symbol; |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2080 Lisp_Object terminal; |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2081 Lisp_Object value; |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2082 { |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2083 Lisp_Object result; |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
2084 struct terminal *t = get_terminal (terminal, 1); |
|
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2085 push_kboard (d->kboard); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2086 result = Fset (symbol, value); |
|
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2087 pop_kboard (); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2088 return result; |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2089 } |
|
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
2090 #endif |
| 298 | 2091 |
| 648 | 2092 /* Find the function at the end of a chain of symbol function indirections. */ |
| 2093 | |
| 2094 /* If OBJECT is a symbol, find the end of its function chain and | |
| 2095 return the value found there. If OBJECT is not a symbol, just | |
| 2096 return it. If there is a cycle in the function chain, signal a | |
| 2097 cyclic-function-indirection error. | |
| 2098 | |
| 2099 This is like Findirect_function, except that it doesn't signal an | |
| 2100 error if the chain ends up unbound. */ | |
| 2101 Lisp_Object | |
|
1648
27e9f99fe095
src/ * data.c (indirect_function): Delete unused argument ERROR.
Jim Blandy <jimb@redhat.com>
parents:
1508
diff
changeset
|
2102 indirect_function (object) |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
2103 register Lisp_Object object; |
| 648 | 2104 { |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2105 Lisp_Object tortoise, hare; |
| 648 | 2106 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2107 hare = tortoise = object; |
| 648 | 2108 |
| 2109 for (;;) | |
| 2110 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2111 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
| 648 | 2112 break; |
| 2113 hare = XSYMBOL (hare)->function; | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2114 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
| 648 | 2115 break; |
| 2116 hare = XSYMBOL (hare)->function; | |
| 2117 | |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2118 tortoise = XSYMBOL (tortoise)->function; |
| 648 | 2119 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2120 if (EQ (hare, tortoise)) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2121 xsignal1 (Qcyclic_function_indirection, object); |
| 648 | 2122 } |
| 2123 | |
| 2124 return hare; | |
| 2125 } | |
| 2126 | |
|
68758
13c1b7c5f555
* data.c (Findirect_function): Add NOERROR arg. All callers changed
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
2127 DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2128 doc: /* Return the function at the end of OBJECT's function chain. |
|
68780
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2129 If OBJECT is not a symbol, just return it. Otherwise, follow all |
|
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2130 function indirections to find the final function binding and return it. |
|
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2131 If the final symbol in the chain is unbound, signal a void-function error. |
|
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2132 Optional arg NOERROR non-nil means to return nil instead of signalling. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2133 Signal a cyclic-function-indirection error if there is a loop in the |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2134 function chain of symbols. */) |
|
68780
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2135 (object, noerror) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2136 register Lisp_Object object; |
|
68780
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2137 Lisp_Object noerror; |
| 648 | 2138 { |
| 2139 Lisp_Object result; | |
| 2140 | |
|
71871
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2141 /* Optimize for no indirection. */ |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2142 result = object; |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2143 if (SYMBOLP (result) && !EQ (result, Qunbound) |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2144 && (result = XSYMBOL (result)->function, SYMBOLP (result))) |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2145 result = indirect_function (result); |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2146 if (!EQ (result, Qunbound)) |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2147 return result; |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2148 |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2149 if (NILP (noerror)) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2150 xsignal1 (Qvoid_function, object); |
|
71871
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2151 |
|
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2152 return Qnil; |
| 648 | 2153 } |
| 2154 | |
| 298 | 2155 /* Extract and set vector and string elements */ |
| 2156 | |
| 2157 DEFUN ("aref", Faref, Saref, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2158 doc: /* Return the element of ARRAY at index IDX. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2159 ARRAY may be a vector, a string, a char-table, a bool-vector, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2160 or a byte-code object. IDX starts at 0. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2161 (array, idx) |
| 298 | 2162 register Lisp_Object array; |
| 2163 Lisp_Object idx; | |
| 2164 { | |
| 2165 register int idxval; | |
| 2166 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2167 CHECK_NUMBER (idx); |
| 298 | 2168 idxval = XINT (idx); |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2169 if (STRINGP (array)) |
| 298 | 2170 { |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2171 int c, idxval_byte; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2172 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2173 if (idxval < 0 || idxval >= SCHARS (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2174 args_out_of_range (array, idx); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2175 if (! STRING_MULTIBYTE (array)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2176 return make_number ((unsigned char) SREF (array, idxval)); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2177 idxval_byte = string_char_to_byte (array, idxval); |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2178 |
|
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105885
diff
changeset
|
2179 c = STRING_CHAR (SDATA (array) + idxval_byte); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2180 return make_number (c); |
| 298 | 2181 } |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2182 else if (BOOL_VECTOR_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2183 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2184 int val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2185 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2186 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2187 args_out_of_range (array, idx); |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2188 |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2189 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
|
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2190 return (val & (1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)) ? Qt : Qnil); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2191 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2192 else if (CHAR_TABLE_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2193 { |
|
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2194 CHECK_CHARACTER (idx); |
|
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2195 return CHAR_TABLE_REF (array, idxval); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2196 } |
| 298 | 2197 else |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2198 { |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2199 int size = 0; |
|
10290
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2200 if (VECTORP (array)) |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2201 size = XVECTOR (array)->size; |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2202 else if (COMPILEDP (array)) |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2203 size = XVECTOR (array)->size & PSEUDOVECTOR_SIZE_MASK; |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2204 else |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2205 wrong_type_argument (Qarrayp, array); |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2206 |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2207 if (idxval < 0 || idxval >= size) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2208 args_out_of_range (array, idx); |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2209 return XVECTOR (array)->contents[idxval]; |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2210 } |
| 298 | 2211 } |
| 2212 | |
| 2213 DEFUN ("aset", Faset, Saset, 3, 3, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2214 doc: /* Store into the element of ARRAY at index IDX the value NEWELT. |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2215 Return NEWELT. ARRAY may be a vector, a string, a char-table or a |
|
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2216 bool-vector. IDX starts at 0. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2217 (array, idx, newelt) |
| 298 | 2218 register Lisp_Object array; |
| 2219 Lisp_Object idx, newelt; | |
| 2220 { | |
| 2221 register int idxval; | |
| 2222 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2223 CHECK_NUMBER (idx); |
| 298 | 2224 idxval = XINT (idx); |
|
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
2225 CHECK_ARRAY (array, Qarrayp); |
| 298 | 2226 CHECK_IMPURE (array); |
| 2227 | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2228 if (VECTORP (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2229 { |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2230 if (idxval < 0 || idxval >= XVECTOR (array)->size) |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2231 args_out_of_range (array, idx); |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2232 XVECTOR (array)->contents[idxval] = newelt; |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2233 } |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2234 else if (BOOL_VECTOR_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2235 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2236 int val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2237 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2238 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2239 args_out_of_range (array, idx); |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2240 |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2241 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2242 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2243 if (! NILP (newelt)) |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2244 val |= 1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2245 else |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2246 val &= ~(1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)); |
|
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2247 XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR] = val; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2248 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2249 else if (CHAR_TABLE_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2250 { |
|
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2251 CHECK_CHARACTER (idx); |
|
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2252 CHAR_TABLE_SET (array, idxval, newelt); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2253 } |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2254 else if (STRING_MULTIBYTE (array)) |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2255 { |
|
50632
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2256 int idxval_byte, prev_bytes, new_bytes, nbytes; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2257 unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1; |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2258 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2259 if (idxval < 0 || idxval >= SCHARS (array)) |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2260 args_out_of_range (array, idx); |
|
89526
58eb89f2fdfc
(Faset): Check newelt by CHECK_CHARACTER. Don't change
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
2261 CHECK_CHARACTER (newelt); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2262 |
|
50632
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2263 nbytes = SBYTES (array); |
|
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2264 |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2265 idxval_byte = string_char_to_byte (array, idxval); |
|
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2266 p1 = SDATA (array) + idxval_byte; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2267 PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2268 new_bytes = CHAR_STRING (XINT (newelt), p0); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2269 if (prev_bytes != new_bytes) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2270 { |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2271 /* We must relocate the string data. */ |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2272 int nchars = SCHARS (array); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2273 unsigned char *str; |
| 56193 | 2274 USE_SAFE_ALLOCA; |
| 2275 | |
| 2276 SAFE_ALLOCA (str, unsigned char *, nbytes); | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2277 bcopy (SDATA (array), str, nbytes); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2278 allocate_string_data (XSTRING (array), nchars, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2279 nbytes + new_bytes - prev_bytes); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2280 bcopy (str, SDATA (array), idxval_byte); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2281 p1 = SDATA (array) + idxval_byte; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2282 bcopy (str + idxval_byte + prev_bytes, p1 + new_bytes, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2283 nbytes - (idxval_byte + prev_bytes)); |
|
57726
66e97a54985f
Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents:
57618
diff
changeset
|
2284 SAFE_FREE (); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2285 clear_string_char_byte_cache (); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2286 } |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2287 while (new_bytes--) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2288 *p1++ = *p0++; |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2289 } |
| 298 | 2290 else |
| 2291 { | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2292 if (idxval < 0 || idxval >= SCHARS (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2293 args_out_of_range (array, idx); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2294 CHECK_NUMBER (newelt); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2295 |
|
90321
344d06a17979
(Faset): On setting a character bigger than 255 in a
Kenichi Handa <handa@m17n.org>
parents:
90295
diff
changeset
|
2296 if (XINT (newelt) >= 0 && ! SINGLE_BYTE_CHAR_P (XINT (newelt))) |
|
94122
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2297 { |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2298 int i; |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2299 |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2300 for (i = SBYTES (array) - 1; i >= 0; i--) |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2301 if (SREF (array, i) >= 0x80) |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2302 args_out_of_range (array, newelt); |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2303 /* ARRAY is an ASCII string. Convert it to a multibyte |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2304 string, and try `aset' again. */ |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2305 STRING_SET_MULTIBYTE (array); |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2306 return Faset (array, idx, newelt); |
|
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2307 } |
|
90321
344d06a17979
(Faset): On setting a character bigger than 255 in a
Kenichi Handa <handa@m17n.org>
parents:
90295
diff
changeset
|
2308 SSET (array, idxval, XINT (newelt)); |
| 298 | 2309 } |
| 2310 | |
| 2311 return newelt; | |
| 2312 } | |
| 2313 | |
| 2314 /* Arithmetic functions */ | |
| 2315 | |
| 2316 enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal }; | |
| 2317 | |
| 2318 Lisp_Object | |
| 2319 arithcompare (num1, num2, comparison) | |
| 2320 Lisp_Object num1, num2; | |
| 2321 enum comparison comparison; | |
| 2322 { | |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2323 double f1 = 0, f2 = 0; |
| 298 | 2324 int floatp = 0; |
| 2325 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2326 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2327 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2); |
| 298 | 2328 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2329 if (FLOATP (num1) || FLOATP (num2)) |
| 298 | 2330 { |
| 2331 floatp = 1; | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2332 f1 = (FLOATP (num1)) ? XFLOAT_DATA (num1) : XINT (num1); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2333 f2 = (FLOATP (num2)) ? XFLOAT_DATA (num2) : XINT (num2); |
| 298 | 2334 } |
| 2335 | |
| 2336 switch (comparison) | |
| 2337 { | |
| 2338 case equal: | |
| 2339 if (floatp ? f1 == f2 : XINT (num1) == XINT (num2)) | |
| 2340 return Qt; | |
| 2341 return Qnil; | |
| 2342 | |
| 2343 case notequal: | |
| 2344 if (floatp ? f1 != f2 : XINT (num1) != XINT (num2)) | |
| 2345 return Qt; | |
| 2346 return Qnil; | |
| 2347 | |
| 2348 case less: | |
| 2349 if (floatp ? f1 < f2 : XINT (num1) < XINT (num2)) | |
| 2350 return Qt; | |
| 2351 return Qnil; | |
| 2352 | |
| 2353 case less_or_equal: | |
| 2354 if (floatp ? f1 <= f2 : XINT (num1) <= XINT (num2)) | |
| 2355 return Qt; | |
| 2356 return Qnil; | |
| 2357 | |
| 2358 case grtr: | |
| 2359 if (floatp ? f1 > f2 : XINT (num1) > XINT (num2)) | |
| 2360 return Qt; | |
| 2361 return Qnil; | |
| 2362 | |
| 2363 case grtr_or_equal: | |
| 2364 if (floatp ? f1 >= f2 : XINT (num1) >= XINT (num2)) | |
| 2365 return Qt; | |
| 2366 return Qnil; | |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2367 |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2368 default: |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2369 abort (); |
| 298 | 2370 } |
| 2371 } | |
| 2372 | |
| 2373 DEFUN ("=", Feqlsign, Seqlsign, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2374 doc: /* Return t if two args, both numbers or markers, are equal. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2375 (num1, num2) |
| 298 | 2376 register Lisp_Object num1, num2; |
| 2377 { | |
| 2378 return arithcompare (num1, num2, equal); | |
| 2379 } | |
| 2380 | |
| 2381 DEFUN ("<", Flss, Slss, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2382 doc: /* Return t if first arg is less than second arg. Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2383 (num1, num2) |
| 298 | 2384 register Lisp_Object num1, num2; |
| 2385 { | |
| 2386 return arithcompare (num1, num2, less); | |
| 2387 } | |
| 2388 | |
| 2389 DEFUN (">", Fgtr, Sgtr, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2390 doc: /* Return t if first arg is greater than second arg. Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2391 (num1, num2) |
| 298 | 2392 register Lisp_Object num1, num2; |
| 2393 { | |
| 2394 return arithcompare (num1, num2, grtr); | |
| 2395 } | |
| 2396 | |
| 2397 DEFUN ("<=", Fleq, Sleq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2398 doc: /* Return t if first arg is less than or equal to second arg. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2399 Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2400 (num1, num2) |
| 298 | 2401 register Lisp_Object num1, num2; |
| 2402 { | |
| 2403 return arithcompare (num1, num2, less_or_equal); | |
| 2404 } | |
| 2405 | |
| 2406 DEFUN (">=", Fgeq, Sgeq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2407 doc: /* Return t if first arg is greater than or equal to second arg. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2408 Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2409 (num1, num2) |
| 298 | 2410 register Lisp_Object num1, num2; |
| 2411 { | |
| 2412 return arithcompare (num1, num2, grtr_or_equal); | |
| 2413 } | |
| 2414 | |
| 2415 DEFUN ("/=", Fneq, Sneq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2416 doc: /* Return t if first arg is not equal to second arg. Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2417 (num1, num2) |
| 298 | 2418 register Lisp_Object num1, num2; |
| 2419 { | |
| 2420 return arithcompare (num1, num2, notequal); | |
| 2421 } | |
| 2422 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2423 DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2424 doc: /* Return t if NUMBER is zero. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2425 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2426 register Lisp_Object number; |
| 298 | 2427 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2428 CHECK_NUMBER_OR_FLOAT (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2429 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2430 if (FLOATP (number)) |
| 298 | 2431 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2432 if (XFLOAT_DATA (number) == 0.0) |
| 298 | 2433 return Qt; |
| 2434 return Qnil; | |
| 2435 } | |
| 2436 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2437 if (!XINT (number)) |
| 298 | 2438 return Qt; |
| 2439 return Qnil; | |
| 2440 } | |
| 2441 | |
|
78140
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2442 /* Convert between long values and pairs of Lisp integers. |
|
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2443 Note that long_to_cons returns a single Lisp integer |
|
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2444 when the value fits in one. */ |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2445 |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2446 Lisp_Object |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2447 long_to_cons (i) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2448 unsigned long i; |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2449 { |
|
50109
d23ab2416c49
(long_to_cons): Fix type of top.
Andreas Schwab <schwab@suse.de>
parents:
48996
diff
changeset
|
2450 unsigned long top = i >> 16; |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2451 unsigned int bot = i & 0xFFFF; |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2452 if (top == 0) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2453 return make_number (bot); |
|
11879
606889516975
(long_to_cons): Don't assume 32-bit longs.
Karl Heuer <kwzh@gnu.org>
parents:
11734
diff
changeset
|
2454 if (top == (unsigned long)-1 >> 16) |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2455 return Fcons (make_number (-1), make_number (bot)); |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2456 return Fcons (make_number (top), make_number (bot)); |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2457 } |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2458 |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2459 unsigned long |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2460 cons_to_long (c) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2461 Lisp_Object c; |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2462 { |
|
3675
f42eaf84478f
(cons_to_long): Declare top, bot as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
2463 Lisp_Object top, bot; |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2464 if (INTEGERP (c)) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2465 return XINT (c); |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2466 top = XCAR (c); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2467 bot = XCDR (c); |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2468 if (CONSP (bot)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2469 bot = XCAR (bot); |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2470 return ((XINT (top) << 16) | XINT (bot)); |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2471 } |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2472 |
|
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
2473 DEFUN ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2474 doc: /* Return the decimal representation of NUMBER as a string. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2475 Uses a minus sign if negative. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2476 NUMBER may be an integer or a floating point number. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2477 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2478 Lisp_Object number; |
| 298 | 2479 { |
|
12528
ed5b91dd829a
(Fnumber_to_string): Make `buffer' long enough.
Karl Heuer <kwzh@gnu.org>
parents:
12295
diff
changeset
|
2480 char buffer[VALBITS]; |
| 298 | 2481 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2482 CHECK_NUMBER_OR_FLOAT (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2483 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2484 if (FLOATP (number)) |
| 298 | 2485 { |
| 2486 char pigbuf[350]; /* see comments in float_to_string */ | |
| 2487 | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2488 float_to_string (pigbuf, XFLOAT_DATA (number)); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2489 return build_string (pigbuf); |
| 298 | 2490 } |
| 2491 | |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2492 if (sizeof (int) == sizeof (EMACS_INT)) |
|
86330
eba0d96e791f
(Fnumber_to_string): Add cast when passing EMACS_INT
Andreas Schwab <schwab@suse.de>
parents:
86285
diff
changeset
|
2493 sprintf (buffer, "%d", (int) XINT (number)); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2494 else if (sizeof (long) == sizeof (EMACS_INT)) |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
2495 sprintf (buffer, "%ld", (long) XINT (number)); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2496 else |
|
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2497 abort (); |
| 298 | 2498 return build_string (buffer); |
| 2499 } | |
| 2500 | |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2501 INLINE static int |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2502 digit_to_number (character, base) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2503 int character, base; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2504 { |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2505 int digit; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2506 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2507 if (character >= '0' && character <= '9') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2508 digit = character - '0'; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2509 else if (character >= 'a' && character <= 'z') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2510 digit = character - 'a' + 10; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2511 else if (character >= 'A' && character <= 'Z') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2512 digit = character - 'A' + 10; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2513 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2514 return -1; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2515 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2516 if (digit >= base) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2517 return -1; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2518 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2519 return digit; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2520 } |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2521 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2522 DEFUN ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0, |
|
48996
7931f73b31db
(Fstring_to_number, Fminus): Better English in doc strings.
Francesco Potort? <pot@gnu.org>
parents:
48961
diff
changeset
|
2523 doc: /* Parse STRING as a decimal number and return the number. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2524 This parses both integers and floating point numbers. |
|
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2525 It ignores leading spaces and tabs, and all trailing chars. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2526 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2527 If BASE, interpret STRING as a number in that base. If BASE isn't |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2528 present, base 10 is used. BASE must be between 2 and 16 (inclusive). |
|
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2529 If the base used is not 10, STRING is always parsed as integer. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2530 (string, base) |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2531 register Lisp_Object string, base; |
| 298 | 2532 { |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2533 register unsigned char *p; |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2534 register int b; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2535 int sign = 1; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2536 Lisp_Object val; |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2537 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2538 CHECK_STRING (string); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2539 |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2540 if (NILP (base)) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2541 b = 10; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2542 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2543 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2544 CHECK_NUMBER (base); |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2545 b = XINT (base); |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2546 if (b < 2 || b > 16) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2547 xsignal1 (Qargs_out_of_range, base); |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2548 } |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2549 |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2550 /* Skip any whitespace at the front of the number. Some versions of |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2551 atoi do this anyway, so we might as well make Emacs lisp consistent. */ |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2552 p = SDATA (string); |
|
1987
cd893024d6b9
* data.c (Fstring_to_number): Declare p to be an unsigned char, to
Jim Blandy <jimb@redhat.com>
parents:
1914
diff
changeset
|
2553 while (*p == ' ' || *p == '\t') |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2554 p++; |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2555 |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2556 if (*p == '-') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2557 { |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2558 sign = -1; |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2559 p++; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2560 } |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2561 else if (*p == '+') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2562 p++; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2563 |
|
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2564 if (isfloat_string (p, 1) && b == 10) |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2565 val = make_float (sign * atof (p)); |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2566 else |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2567 { |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2568 double v = 0; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2569 |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2570 while (1) |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2571 { |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2572 int digit = digit_to_number (*p++, b); |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2573 if (digit < 0) |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2574 break; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2575 v = v * b + digit; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2576 } |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2577 |
|
39775
280975f8c65e
(Fstring_to_number): Use make_fixnum_or_float.
Gerd Moellmann <gerd@gnu.org>
parents:
39767
diff
changeset
|
2578 val = make_fixnum_or_float (sign * v); |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2579 } |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2580 |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2581 return val; |
| 298 | 2582 } |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2583 |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2584 |
| 298 | 2585 enum arithop |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2586 { |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2587 Aadd, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2588 Asub, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2589 Amult, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2590 Adiv, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2591 Alogand, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2592 Alogior, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2593 Alogxor, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2594 Amax, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2595 Amin |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2596 }; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2597 |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2598 static Lisp_Object float_arith_driver P_ ((double, int, enum arithop, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2599 int, Lisp_Object *)); |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2600 extern Lisp_Object fmod_float (); |
|
1508
768d4c10c2bf
* data.c (Fset): See if current_alist_element points to itself
Jim Blandy <jimb@redhat.com>
parents:
1293
diff
changeset
|
2601 |
| 298 | 2602 Lisp_Object |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2603 arith_driver (code, nargs, args) |
| 298 | 2604 enum arithop code; |
| 2605 int nargs; | |
| 2606 register Lisp_Object *args; | |
| 2607 { | |
| 2608 register Lisp_Object val; | |
| 2609 register int argnum; | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2610 register EMACS_INT accum = 0; |
|
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2611 register EMACS_INT next; |
| 298 | 2612 |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2613 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2614 { |
| 2615 case Alogior: | |
| 2616 case Alogxor: | |
| 2617 case Aadd: | |
| 2618 case Asub: | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2619 accum = 0; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2620 break; |
| 298 | 2621 case Amult: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2622 accum = 1; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2623 break; |
| 298 | 2624 case Alogand: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2625 accum = -1; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2626 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2627 default: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2628 break; |
| 298 | 2629 } |
| 2630 | |
| 2631 for (argnum = 0; argnum < nargs; argnum++) | |
| 2632 { | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2633 /* Using args[argnum] as argument to CHECK_NUMBER_... */ |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2634 val = args[argnum]; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2635 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
| 298 | 2636 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2637 if (FLOATP (val)) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2638 return float_arith_driver ((double) accum, argnum, code, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2639 nargs, args); |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2640 args[argnum] = val; |
| 298 | 2641 next = XINT (args[argnum]); |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2642 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2643 { |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2644 case Aadd: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2645 accum += next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2646 break; |
| 298 | 2647 case Asub: |
|
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2648 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
| 298 | 2649 break; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2650 case Amult: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2651 accum *= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2652 break; |
| 298 | 2653 case Adiv: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2654 if (!argnum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2655 accum = next; |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2656 else |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2657 { |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2658 if (next == 0) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2659 xsignal0 (Qarith_error); |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2660 accum /= next; |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2661 } |
| 298 | 2662 break; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2663 case Alogand: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2664 accum &= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2665 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2666 case Alogior: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2667 accum |= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2668 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2669 case Alogxor: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2670 accum ^= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2671 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2672 case Amax: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2673 if (!argnum || next > accum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2674 accum = next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2675 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2676 case Amin: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2677 if (!argnum || next < accum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2678 accum = next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2679 break; |
| 298 | 2680 } |
| 2681 } | |
| 2682 | |
|
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2683 XSETINT (val, accum); |
| 298 | 2684 return val; |
| 2685 } | |
| 2686 | |
| 6201 | 2687 #undef isnan |
| 2688 #define isnan(x) ((x) != (x)) | |
| 2689 | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2690 static Lisp_Object |
| 298 | 2691 float_arith_driver (accum, argnum, code, nargs, args) |
| 2692 double accum; | |
| 2693 register int argnum; | |
| 2694 enum arithop code; | |
| 2695 int nargs; | |
| 2696 register Lisp_Object *args; | |
| 2697 { | |
| 2698 register Lisp_Object val; | |
| 2699 double next; | |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2700 |
| 298 | 2701 for (; argnum < nargs; argnum++) |
| 2702 { | |
| 2703 val = args[argnum]; /* using args[argnum] as argument to CHECK_NUMBER_... */ | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2704 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
| 298 | 2705 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2706 if (FLOATP (val)) |
| 298 | 2707 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2708 next = XFLOAT_DATA (val); |
| 298 | 2709 } |
| 2710 else | |
| 2711 { | |
| 2712 args[argnum] = val; /* runs into a compiler bug. */ | |
| 2713 next = XINT (args[argnum]); | |
| 2714 } | |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2715 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2716 { |
| 2717 case Aadd: | |
| 2718 accum += next; | |
| 2719 break; | |
| 2720 case Asub: | |
|
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2721 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
| 298 | 2722 break; |
| 2723 case Amult: | |
| 2724 accum *= next; | |
| 2725 break; | |
| 2726 case Adiv: | |
| 2727 if (!argnum) | |
| 2728 accum = next; | |
| 2729 else | |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2730 { |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2731 if (! IEEE_FLOATING_POINT && next == 0) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2732 xsignal0 (Qarith_error); |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2733 accum /= next; |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2734 } |
| 298 | 2735 break; |
| 2736 case Alogand: | |
| 2737 case Alogior: | |
| 2738 case Alogxor: | |
| 2739 return wrong_type_argument (Qinteger_or_marker_p, val); | |
| 2740 case Amax: | |
| 6201 | 2741 if (!argnum || isnan (next) || next > accum) |
| 298 | 2742 accum = next; |
| 2743 break; | |
| 2744 case Amin: | |
| 6201 | 2745 if (!argnum || isnan (next) || next < accum) |
| 298 | 2746 accum = next; |
| 2747 break; | |
| 2748 } | |
| 2749 } | |
| 2750 | |
| 2751 return make_float (accum); | |
| 2752 } | |
|
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
2753 |
| 298 | 2754 |
| 2755 DEFUN ("+", Fplus, Splus, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2756 doc: /* Return sum of any number of arguments, which are numbers or markers. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2757 usage: (+ &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2758 (nargs, args) |
| 298 | 2759 int nargs; |
| 2760 Lisp_Object *args; | |
| 2761 { | |
| 2762 return arith_driver (Aadd, nargs, args); | |
| 2763 } | |
| 2764 | |
| 2765 DEFUN ("-", Fminus, Sminus, 0, MANY, 0, | |
|
48996
7931f73b31db
(Fstring_to_number, Fminus): Better English in doc strings.
Francesco Potort? <pot@gnu.org>
parents:
48961
diff
changeset
|
2766 doc: /* Negate number or subtract numbers or markers and return the result. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2767 With one arg, negates it. With more than one arg, |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2768 subtracts all but the first from the first. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2769 usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2770 (nargs, args) |
| 298 | 2771 int nargs; |
| 2772 Lisp_Object *args; | |
| 2773 { | |
| 2774 return arith_driver (Asub, nargs, args); | |
| 2775 } | |
| 2776 | |
| 2777 DEFUN ("*", Ftimes, Stimes, 0, MANY, 0, | |
| 41153 | 2778 doc: /* Return product of any number of arguments, which are numbers or markers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2779 usage: (* &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2780 (nargs, args) |
| 298 | 2781 int nargs; |
| 2782 Lisp_Object *args; | |
| 2783 { | |
| 2784 return arith_driver (Amult, nargs, args); | |
| 2785 } | |
| 2786 | |
| 2787 DEFUN ("/", Fquo, Squo, 2, MANY, 0, | |
| 41153 | 2788 doc: /* Return first argument divided by all the remaining arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2789 The arguments must be numbers or markers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2790 usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2791 (nargs, args) |
| 298 | 2792 int nargs; |
| 2793 Lisp_Object *args; | |
| 2794 { | |
|
55440
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2795 int argnum; |
| 55455 | 2796 for (argnum = 2; argnum < nargs; argnum++) |
|
55440
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2797 if (FLOATP (args[argnum])) |
|
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2798 return float_arith_driver (0, 0, Adiv, nargs, args); |
| 298 | 2799 return arith_driver (Adiv, nargs, args); |
| 2800 } | |
| 2801 | |
| 2802 DEFUN ("%", Frem, Srem, 2, 2, 0, | |
| 41153 | 2803 doc: /* Return remainder of X divided by Y. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2804 Both must be integers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2805 (x, y) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2806 register Lisp_Object x, y; |
| 298 | 2807 { |
| 2808 Lisp_Object val; | |
| 2809 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2810 CHECK_NUMBER_COERCE_MARKER (x); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2811 CHECK_NUMBER_COERCE_MARKER (y); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2812 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2813 if (XFASTINT (y) == 0) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2814 xsignal0 (Qarith_error); |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2815 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2816 XSETINT (val, XINT (x) % XINT (y)); |
| 298 | 2817 return val; |
| 2818 } | |
| 2819 | |
|
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2820 #ifndef HAVE_FMOD |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2821 double |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2822 fmod (f1, f2) |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2823 double f1, f2; |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2824 { |
|
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2825 double r = f1; |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2826 |
|
13296
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2827 if (f2 < 0.0) |
|
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2828 f2 = -f2; |
|
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2829 |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2830 /* If the magnitude of the result exceeds that of the divisor, or |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2831 the sign of the result does not agree with that of the dividend, |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2832 iterate with the reduced value. This does not yield a |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2833 particularly accurate result, but at least it will be in the |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2834 range promised by fmod. */ |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2835 do |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2836 r -= f2 * floor (r / f2); |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2837 while (f2 <= (r < 0 ? -r : r) || ((r < 0) != (f1 < 0) && ! isnan (r))); |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2838 |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2839 return r; |
|
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2840 } |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2841 #endif /* ! HAVE_FMOD */ |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2842 |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2843 DEFUN ("mod", Fmod, Smod, 2, 2, 0, |
| 41153 | 2844 doc: /* Return X modulo Y. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2845 The result falls between zero (inclusive) and Y (exclusive). |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2846 Both X and Y must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2847 (x, y) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2848 register Lisp_Object x, y; |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2849 { |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2850 Lisp_Object val; |
|
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2851 EMACS_INT i1, i2; |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2852 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2853 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (x); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2854 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (y); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2855 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2856 if (FLOATP (x) || FLOATP (y)) |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2857 return fmod_float (x, y); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2858 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2859 i1 = XINT (x); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2860 i2 = XINT (y); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2861 |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2862 if (i2 == 0) |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2863 xsignal0 (Qarith_error); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2864 |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2865 i1 %= i2; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2866 |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2867 /* If the "remainder" comes out with the wrong sign, fix it. */ |
|
11155
0aede77c1593
(Fmod): Fix the final adjustment, when i2 < 0 and i1 == 0.
Richard M. Stallman <rms@gnu.org>
parents:
11019
diff
changeset
|
2868 if (i2 < 0 ? i1 > 0 : i1 < 0) |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2869 i1 += i2; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2870 |
|
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2871 XSETINT (val, i1); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2872 return val; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2873 } |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2874 |
| 298 | 2875 DEFUN ("max", Fmax, Smax, 1, MANY, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2876 doc: /* Return largest of all the arguments (which must be numbers or markers). |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2877 The value is always a number; markers are converted to numbers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2878 usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2879 (nargs, args) |
| 298 | 2880 int nargs; |
| 2881 Lisp_Object *args; | |
| 2882 { | |
| 2883 return arith_driver (Amax, nargs, args); | |
| 2884 } | |
| 2885 | |
| 2886 DEFUN ("min", Fmin, Smin, 1, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2887 doc: /* Return smallest of all the arguments (which must be numbers or markers). |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2888 The value is always a number; markers are converted to numbers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2889 usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2890 (nargs, args) |
| 298 | 2891 int nargs; |
| 2892 Lisp_Object *args; | |
| 2893 { | |
| 2894 return arith_driver (Amin, nargs, args); | |
| 2895 } | |
| 2896 | |
| 2897 DEFUN ("logand", Flogand, Slogand, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2898 doc: /* Return bitwise-and of all the arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2899 Arguments may be integers, or markers converted to integers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2900 usage: (logand &rest INTS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2901 (nargs, args) |
| 298 | 2902 int nargs; |
| 2903 Lisp_Object *args; | |
| 2904 { | |
| 2905 return arith_driver (Alogand, nargs, args); | |
| 2906 } | |
| 2907 | |
| 2908 DEFUN ("logior", Flogior, Slogior, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2909 doc: /* Return bitwise-or of all the arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2910 Arguments may be integers, or markers converted to integers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2911 usage: (logior &rest INTS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2912 (nargs, args) |
| 298 | 2913 int nargs; |
| 2914 Lisp_Object *args; | |
| 2915 { | |
| 2916 return arith_driver (Alogior, nargs, args); | |
| 2917 } | |
| 2918 | |
| 2919 DEFUN ("logxor", Flogxor, Slogxor, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2920 doc: /* Return bitwise-exclusive-or of all the arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2921 Arguments may be integers, or markers converted to integers. |
|
73925
a248fe2d281f
(Flogxor): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
73838
diff
changeset
|
2922 usage: (logxor &rest INTS-OR-MARKERS) */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2923 (nargs, args) |
| 298 | 2924 int nargs; |
| 2925 Lisp_Object *args; | |
| 2926 { | |
| 2927 return arith_driver (Alogxor, nargs, args); | |
| 2928 } | |
| 2929 | |
| 2930 DEFUN ("ash", Fash, Sash, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2931 doc: /* Return VALUE with its bits shifted left by COUNT. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2932 If COUNT is negative, shifting is actually to the right. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2933 In this case, the sign bit is duplicated. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2934 (value, count) |
|
11002
ff115809a39e
(Fash): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
10951
diff
changeset
|
2935 register Lisp_Object value, count; |
| 298 | 2936 { |
| 2937 register Lisp_Object val; | |
| 2938 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2939 CHECK_NUMBER (value); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2940 CHECK_NUMBER (count); |
| 298 | 2941 |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2942 if (XINT (count) >= BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2943 XSETINT (val, 0); |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2944 else if (XINT (count) > 0) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2945 XSETINT (val, XINT (value) << XFASTINT (count)); |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2946 else if (XINT (count) <= -BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2947 XSETINT (val, XINT (value) < 0 ? -1 : 0); |
| 298 | 2948 else |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2949 XSETINT (val, XINT (value) >> -XINT (count)); |
| 298 | 2950 return val; |
| 2951 } | |
| 2952 | |
| 2953 DEFUN ("lsh", Flsh, Slsh, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2954 doc: /* Return VALUE with its bits shifted left by COUNT. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2955 If COUNT is negative, shifting is actually to the right. |
|
47276
fbe02a367006
(Flsh): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
46831
diff
changeset
|
2956 In this case, zeros are shifted in on the left. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2957 (value, count) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2958 register Lisp_Object value, count; |
| 298 | 2959 { |
| 2960 register Lisp_Object val; | |
| 2961 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2962 CHECK_NUMBER (value); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2963 CHECK_NUMBER (count); |
| 298 | 2964 |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2965 if (XINT (count) >= BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2966 XSETINT (val, 0); |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2967 else if (XINT (count) > 0) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2968 XSETINT (val, (EMACS_UINT) XUINT (value) << XFASTINT (count)); |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2969 else if (XINT (count) <= -BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2970 XSETINT (val, 0); |
| 298 | 2971 else |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2972 XSETINT (val, (EMACS_UINT) XUINT (value) >> -XINT (count)); |
| 298 | 2973 return val; |
| 2974 } | |
| 2975 | |
| 2976 DEFUN ("1+", Fadd1, Sadd1, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2977 doc: /* Return NUMBER plus one. NUMBER may be a number or a marker. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2978 Markers are converted to integers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2979 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2980 register Lisp_Object number; |
| 298 | 2981 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2982 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2983 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2984 if (FLOATP (number)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2985 return (make_float (1.0 + XFLOAT_DATA (number))); |
| 298 | 2986 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2987 XSETINT (number, XINT (number) + 1); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2988 return number; |
| 298 | 2989 } |
| 2990 | |
| 2991 DEFUN ("1-", Fsub1, Ssub1, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2992 doc: /* Return NUMBER minus one. NUMBER may be a number or a marker. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2993 Markers are converted to integers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2994 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2995 register Lisp_Object number; |
| 298 | 2996 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2997 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2998 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2999 if (FLOATP (number)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3000 return (make_float (-1.0 + XFLOAT_DATA (number))); |
| 298 | 3001 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3002 XSETINT (number, XINT (number) - 1); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3003 return number; |
| 298 | 3004 } |
| 3005 | |
| 3006 DEFUN ("lognot", Flognot, Slognot, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
3007 doc: /* Return the bitwise complement of NUMBER. NUMBER must be an integer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
3008 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3009 register Lisp_Object number; |
| 298 | 3010 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
3011 CHECK_NUMBER (number); |
|
14096
f3766d691555
(Flognot): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14066
diff
changeset
|
3012 XSETINT (number, ~XINT (number)); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3013 return number; |
| 298 | 3014 } |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3015 |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3016 DEFUN ("byteorder", Fbyteorder, Sbyteorder, 0, 0, 0, |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3017 doc: /* Return the byteorder for the machine. |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3018 Returns 66 (ASCII uppercase B) for big endian machines or 108 (ASCII |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3019 lowercase l) for small endian machines. */) |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3020 () |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3021 { |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3022 unsigned i = 0x04030201; |
|
54660
122a60d4f165
data.c (Fbyteorder): Make test work even if unsigned is not 4 bytes.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54627
diff
changeset
|
3023 int order = *(char *)&i == 1 ? 108 : 66; |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3024 |
|
53966
26dc8943ee64
Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53910
diff
changeset
|
3025 return make_number (order); |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3026 } |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3027 |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3028 |
| 298 | 3029 |
| 3030 void | |
| 3031 syms_of_data () | |
| 3032 { | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3033 Lisp_Object error_tail, arith_tail; |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3034 |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3035 Qquote = intern_c_string ("quote"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3036 Qlambda = intern_c_string ("lambda"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3037 Qsubr = intern_c_string ("subr"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3038 Qerror_conditions = intern_c_string ("error-conditions"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3039 Qerror_message = intern_c_string ("error-message"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3040 Qtop_level = intern_c_string ("top-level"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3041 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3042 Qerror = intern_c_string ("error"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3043 Qquit = intern_c_string ("quit"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3044 Qwrong_type_argument = intern_c_string ("wrong-type-argument"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3045 Qargs_out_of_range = intern_c_string ("args-out-of-range"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3046 Qvoid_function = intern_c_string ("void-function"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3047 Qcyclic_function_indirection = intern_c_string ("cyclic-function-indirection"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3048 Qcyclic_variable_indirection = intern_c_string ("cyclic-variable-indirection"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3049 Qvoid_variable = intern_c_string ("void-variable"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3050 Qsetting_constant = intern_c_string ("setting-constant"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3051 Qinvalid_read_syntax = intern_c_string ("invalid-read-syntax"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3052 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3053 Qinvalid_function = intern_c_string ("invalid-function"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3054 Qwrong_number_of_arguments = intern_c_string ("wrong-number-of-arguments"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3055 Qno_catch = intern_c_string ("no-catch"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3056 Qend_of_file = intern_c_string ("end-of-file"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3057 Qarith_error = intern_c_string ("arith-error"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3058 Qbeginning_of_buffer = intern_c_string ("beginning-of-buffer"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3059 Qend_of_buffer = intern_c_string ("end-of-buffer"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3060 Qbuffer_read_only = intern_c_string ("buffer-read-only"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3061 Qtext_read_only = intern_c_string ("text-read-only"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3062 Qmark_inactive = intern_c_string ("mark-inactive"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3063 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3064 Qlistp = intern_c_string ("listp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3065 Qconsp = intern_c_string ("consp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3066 Qsymbolp = intern_c_string ("symbolp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3067 Qkeywordp = intern_c_string ("keywordp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3068 Qintegerp = intern_c_string ("integerp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3069 Qnatnump = intern_c_string ("natnump"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3070 Qwholenump = intern_c_string ("wholenump"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3071 Qstringp = intern_c_string ("stringp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3072 Qarrayp = intern_c_string ("arrayp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3073 Qsequencep = intern_c_string ("sequencep"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3074 Qbufferp = intern_c_string ("bufferp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3075 Qvectorp = intern_c_string ("vectorp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3076 Qchar_or_string_p = intern_c_string ("char-or-string-p"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3077 Qmarkerp = intern_c_string ("markerp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3078 Qbuffer_or_string_p = intern_c_string ("buffer-or-string-p"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3079 Qinteger_or_marker_p = intern_c_string ("integer-or-marker-p"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3080 Qboundp = intern_c_string ("boundp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3081 Qfboundp = intern_c_string ("fboundp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3082 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3083 Qfloatp = intern_c_string ("floatp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3084 Qnumberp = intern_c_string ("numberp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3085 Qnumber_or_marker_p = intern_c_string ("number-or-marker-p"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3086 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3087 Qchar_table_p = intern_c_string ("char-table-p"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3088 Qvector_or_char_table_p = intern_c_string ("vector-or-char-table-p"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3089 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3090 Qsubrp = intern_c_string ("subrp"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3091 Qunevalled = intern_c_string ("unevalled"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3092 Qmany = intern_c_string ("many"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3093 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3094 Qcdr = intern_c_string ("cdr"); |
| 298 | 3095 |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
3096 /* Handle automatic advice activation */ |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3097 Qad_advice_info = intern_c_string ("ad-advice-info"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3098 Qad_activate_internal = intern_c_string ("ad-activate-internal"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3099 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3100 error_tail = pure_cons (Qerror, Qnil); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3101 |
| 298 | 3102 /* ERROR is used as a signaler for random errors for which nothing else is right */ |
| 3103 | |
| 3104 Fput (Qerror, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3105 error_tail); |
| 298 | 3106 Fput (Qerror, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3107 make_pure_c_string ("error")); |
| 298 | 3108 |
| 3109 Fput (Qquit, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3110 pure_cons (Qquit, Qnil)); |
| 298 | 3111 Fput (Qquit, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3112 make_pure_c_string ("Quit")); |
| 298 | 3113 |
| 3114 Fput (Qwrong_type_argument, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3115 pure_cons (Qwrong_type_argument, error_tail)); |
| 298 | 3116 Fput (Qwrong_type_argument, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3117 make_pure_c_string ("Wrong type argument")); |
| 298 | 3118 |
| 3119 Fput (Qargs_out_of_range, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3120 pure_cons (Qargs_out_of_range, error_tail)); |
| 298 | 3121 Fput (Qargs_out_of_range, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3122 make_pure_c_string ("Args out of range")); |
| 298 | 3123 |
| 3124 Fput (Qvoid_function, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3125 pure_cons (Qvoid_function, error_tail)); |
| 298 | 3126 Fput (Qvoid_function, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3127 make_pure_c_string ("Symbol's function definition is void")); |
| 298 | 3128 |
| 648 | 3129 Fput (Qcyclic_function_indirection, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3130 pure_cons (Qcyclic_function_indirection, error_tail)); |
| 648 | 3131 Fput (Qcyclic_function_indirection, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3132 make_pure_c_string ("Symbol's chain of function indirections contains a loop")); |
| 648 | 3133 |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3134 Fput (Qcyclic_variable_indirection, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3135 pure_cons (Qcyclic_variable_indirection, error_tail)); |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3136 Fput (Qcyclic_variable_indirection, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3137 make_pure_c_string ("Symbol's chain of variable indirections contains a loop")); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3138 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3139 Qcircular_list = intern_c_string ("circular-list"); |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3140 staticpro (&Qcircular_list); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3141 Fput (Qcircular_list, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3142 pure_cons (Qcircular_list, error_tail)); |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3143 Fput (Qcircular_list, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3144 make_pure_c_string ("List contains a loop")); |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3145 |
| 298 | 3146 Fput (Qvoid_variable, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3147 pure_cons (Qvoid_variable, error_tail)); |
| 298 | 3148 Fput (Qvoid_variable, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3149 make_pure_c_string ("Symbol's value as variable is void")); |
| 298 | 3150 |
| 3151 Fput (Qsetting_constant, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3152 pure_cons (Qsetting_constant, error_tail)); |
| 298 | 3153 Fput (Qsetting_constant, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3154 make_pure_c_string ("Attempt to set a constant symbol")); |
| 298 | 3155 |
| 3156 Fput (Qinvalid_read_syntax, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3157 pure_cons (Qinvalid_read_syntax, error_tail)); |
| 298 | 3158 Fput (Qinvalid_read_syntax, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3159 make_pure_c_string ("Invalid read syntax")); |
| 298 | 3160 |
| 3161 Fput (Qinvalid_function, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3162 pure_cons (Qinvalid_function, error_tail)); |
| 298 | 3163 Fput (Qinvalid_function, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3164 make_pure_c_string ("Invalid function")); |
| 298 | 3165 |
| 3166 Fput (Qwrong_number_of_arguments, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3167 pure_cons (Qwrong_number_of_arguments, error_tail)); |
| 298 | 3168 Fput (Qwrong_number_of_arguments, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3169 make_pure_c_string ("Wrong number of arguments")); |
| 298 | 3170 |
| 3171 Fput (Qno_catch, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3172 pure_cons (Qno_catch, error_tail)); |
| 298 | 3173 Fput (Qno_catch, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3174 make_pure_c_string ("No catch for tag")); |
| 298 | 3175 |
| 3176 Fput (Qend_of_file, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3177 pure_cons (Qend_of_file, error_tail)); |
| 298 | 3178 Fput (Qend_of_file, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3179 make_pure_c_string ("End of file during parsing")); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3180 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3181 arith_tail = pure_cons (Qarith_error, error_tail); |
| 298 | 3182 Fput (Qarith_error, Qerror_conditions, |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3183 arith_tail); |
| 298 | 3184 Fput (Qarith_error, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3185 make_pure_c_string ("Arithmetic error")); |
| 298 | 3186 |
| 3187 Fput (Qbeginning_of_buffer, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3188 pure_cons (Qbeginning_of_buffer, error_tail)); |
| 298 | 3189 Fput (Qbeginning_of_buffer, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3190 make_pure_c_string ("Beginning of buffer")); |
| 298 | 3191 |
| 3192 Fput (Qend_of_buffer, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3193 pure_cons (Qend_of_buffer, error_tail)); |
| 298 | 3194 Fput (Qend_of_buffer, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3195 make_pure_c_string ("End of buffer")); |
| 298 | 3196 |
| 3197 Fput (Qbuffer_read_only, Qerror_conditions, | |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3198 pure_cons (Qbuffer_read_only, error_tail)); |
| 298 | 3199 Fput (Qbuffer_read_only, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3200 make_pure_c_string ("Buffer is read-only")); |
| 298 | 3201 |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3202 Fput (Qtext_read_only, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3203 pure_cons (Qtext_read_only, error_tail)); |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3204 Fput (Qtext_read_only, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3205 make_pure_c_string ("Text is read-only")); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3206 |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3207 Qrange_error = intern_c_string ("range-error"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3208 Qdomain_error = intern_c_string ("domain-error"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3209 Qsingularity_error = intern_c_string ("singularity-error"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3210 Qoverflow_error = intern_c_string ("overflow-error"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3211 Qunderflow_error = intern_c_string ("underflow-error"); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3212 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3213 Fput (Qdomain_error, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3214 pure_cons (Qdomain_error, arith_tail)); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3215 Fput (Qdomain_error, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3216 make_pure_c_string ("Arithmetic domain error")); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3217 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3218 Fput (Qrange_error, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3219 pure_cons (Qrange_error, arith_tail)); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3220 Fput (Qrange_error, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3221 make_pure_c_string ("Arithmetic range error")); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3222 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3223 Fput (Qsingularity_error, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3224 pure_cons (Qsingularity_error, Fcons (Qdomain_error, arith_tail))); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3225 Fput (Qsingularity_error, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3226 make_pure_c_string ("Arithmetic singularity error")); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3227 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3228 Fput (Qoverflow_error, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3229 pure_cons (Qoverflow_error, Fcons (Qdomain_error, arith_tail))); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3230 Fput (Qoverflow_error, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3231 make_pure_c_string ("Arithmetic overflow error")); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3232 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3233 Fput (Qunderflow_error, Qerror_conditions, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3234 pure_cons (Qunderflow_error, Fcons (Qdomain_error, arith_tail))); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3235 Fput (Qunderflow_error, Qerror_message, |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3236 make_pure_c_string ("Arithmetic underflow error")); |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3237 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3238 staticpro (&Qrange_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3239 staticpro (&Qdomain_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3240 staticpro (&Qsingularity_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3241 staticpro (&Qoverflow_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3242 staticpro (&Qunderflow_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3243 |
| 298 | 3244 staticpro (&Qnil); |
| 3245 staticpro (&Qt); | |
| 3246 staticpro (&Qquote); | |
| 3247 staticpro (&Qlambda); | |
| 3248 staticpro (&Qsubr); | |
| 3249 staticpro (&Qunbound); | |
| 3250 staticpro (&Qerror_conditions); | |
| 3251 staticpro (&Qerror_message); | |
| 3252 staticpro (&Qtop_level); | |
| 3253 | |
| 3254 staticpro (&Qerror); | |
| 3255 staticpro (&Qquit); | |
| 3256 staticpro (&Qwrong_type_argument); | |
| 3257 staticpro (&Qargs_out_of_range); | |
| 3258 staticpro (&Qvoid_function); | |
| 648 | 3259 staticpro (&Qcyclic_function_indirection); |
|
61888
a0e6e458f2fc
(syms_of_data) Staticpro Qcyclic_variable_indirection.
Kim F. Storm <storm@cua.dk>
parents:
61686
diff
changeset
|
3260 staticpro (&Qcyclic_variable_indirection); |
| 298 | 3261 staticpro (&Qvoid_variable); |
| 3262 staticpro (&Qsetting_constant); | |
| 3263 staticpro (&Qinvalid_read_syntax); | |
| 3264 staticpro (&Qwrong_number_of_arguments); | |
| 3265 staticpro (&Qinvalid_function); | |
| 3266 staticpro (&Qno_catch); | |
| 3267 staticpro (&Qend_of_file); | |
| 3268 staticpro (&Qarith_error); | |
| 3269 staticpro (&Qbeginning_of_buffer); | |
| 3270 staticpro (&Qend_of_buffer); | |
| 3271 staticpro (&Qbuffer_read_only); | |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3272 staticpro (&Qtext_read_only); |
|
4037
aecb99c65ab0
(syms_of_data): Staticpro Qmark_inactive.
Roland McGrath <roland@gnu.org>
parents:
4036
diff
changeset
|
3273 staticpro (&Qmark_inactive); |
| 298 | 3274 |
| 3275 staticpro (&Qlistp); | |
| 3276 staticpro (&Qconsp); | |
| 3277 staticpro (&Qsymbolp); | |
| 26931 | 3278 staticpro (&Qkeywordp); |
| 298 | 3279 staticpro (&Qintegerp); |
| 3280 staticpro (&Qnatnump); | |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3281 staticpro (&Qwholenump); |
| 298 | 3282 staticpro (&Qstringp); |
| 3283 staticpro (&Qarrayp); | |
| 3284 staticpro (&Qsequencep); | |
| 3285 staticpro (&Qbufferp); | |
| 3286 staticpro (&Qvectorp); | |
| 3287 staticpro (&Qchar_or_string_p); | |
| 3288 staticpro (&Qmarkerp); | |
| 1293 | 3289 staticpro (&Qbuffer_or_string_p); |
| 298 | 3290 staticpro (&Qinteger_or_marker_p); |
| 3291 staticpro (&Qfloatp); | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3292 staticpro (&Qnumberp); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3293 staticpro (&Qnumber_or_marker_p); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3294 staticpro (&Qchar_table_p); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3295 staticpro (&Qvector_or_char_table_p); |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3296 staticpro (&Qsubrp); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3297 staticpro (&Qmany); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3298 staticpro (&Qunevalled); |
| 298 | 3299 |
| 3300 staticpro (&Qboundp); | |
| 3301 staticpro (&Qfboundp); | |
| 3302 staticpro (&Qcdr); | |
|
8448
b6335ce87e16
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
Richard M. Stallman <rms@gnu.org>
parents:
8415
diff
changeset
|
3303 staticpro (&Qad_advice_info); |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
3304 staticpro (&Qad_activate_internal); |
| 298 | 3305 |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3306 /* Types that type-of returns. */ |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3307 Qinteger = intern_c_string ("integer"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3308 Qsymbol = intern_c_string ("symbol"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3309 Qstring = intern_c_string ("string"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3310 Qcons = intern_c_string ("cons"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3311 Qmarker = intern_c_string ("marker"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3312 Qoverlay = intern_c_string ("overlay"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3313 Qfloat = intern_c_string ("float"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3314 Qwindow_configuration = intern_c_string ("window-configuration"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3315 Qprocess = intern_c_string ("process"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3316 Qwindow = intern_c_string ("window"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3317 /* Qsubr = intern_c_string ("subr"); */ |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3318 Qcompiled_function = intern_c_string ("compiled-function"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3319 Qbuffer = intern_c_string ("buffer"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3320 Qframe = intern_c_string ("frame"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3321 Qvector = intern_c_string ("vector"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3322 Qchar_table = intern_c_string ("char-table"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3323 Qbool_vector = intern_c_string ("bool-vector"); |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3324 Qhash_table = intern_c_string ("hash-table"); |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3325 |
|
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3326 DEFSYM (Qfont_spec, "font-spec"); |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3327 DEFSYM (Qfont_entity, "font-entity"); |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3328 DEFSYM (Qfont_object, "font-object"); |
|
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3329 |
|
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
3330 DEFSYM (Qinteractive_form, "interactive-form"); |
|
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
3331 |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3332 staticpro (&Qinteger); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3333 staticpro (&Qsymbol); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3334 staticpro (&Qstring); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3335 staticpro (&Qcons); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3336 staticpro (&Qmarker); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3337 staticpro (&Qoverlay); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3338 staticpro (&Qfloat); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3339 staticpro (&Qwindow_configuration); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3340 staticpro (&Qprocess); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3341 staticpro (&Qwindow); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3342 /* staticpro (&Qsubr); */ |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3343 staticpro (&Qcompiled_function); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3344 staticpro (&Qbuffer); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3345 staticpro (&Qframe); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3346 staticpro (&Qvector); |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3347 staticpro (&Qchar_table); |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3348 staticpro (&Qbool_vector); |
| 26185 | 3349 staticpro (&Qhash_table); |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3350 |
|
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3351 defsubr (&Sindirect_variable); |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
3352 defsubr (&Sinteractive_form); |
| 298 | 3353 defsubr (&Seq); |
| 3354 defsubr (&Snull); | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3355 defsubr (&Stype_of); |
| 298 | 3356 defsubr (&Slistp); |
| 3357 defsubr (&Snlistp); | |
| 3358 defsubr (&Sconsp); | |
| 3359 defsubr (&Satom); | |
| 3360 defsubr (&Sintegerp); | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3361 defsubr (&Sinteger_or_marker_p); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3362 defsubr (&Snumberp); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3363 defsubr (&Snumber_or_marker_p); |
| 298 | 3364 defsubr (&Sfloatp); |
| 3365 defsubr (&Snatnump); | |
| 3366 defsubr (&Ssymbolp); | |
| 26931 | 3367 defsubr (&Skeywordp); |
| 298 | 3368 defsubr (&Sstringp); |
|
20793
b2af60896559
(syms_of_data): Register multibyte-string-p as a Lisp
Kenichi Handa <handa@m17n.org>
parents:
20716
diff
changeset
|
3369 defsubr (&Smultibyte_string_p); |
| 298 | 3370 defsubr (&Svectorp); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3371 defsubr (&Schar_table_p); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3372 defsubr (&Svector_or_char_table_p); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3373 defsubr (&Sbool_vector_p); |
| 298 | 3374 defsubr (&Sarrayp); |
| 3375 defsubr (&Ssequencep); | |
| 3376 defsubr (&Sbufferp); | |
| 3377 defsubr (&Smarkerp); | |
| 3378 defsubr (&Ssubrp); | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
3379 defsubr (&Sbyte_code_function_p); |
| 298 | 3380 defsubr (&Schar_or_string_p); |
| 3381 defsubr (&Scar); | |
| 3382 defsubr (&Scdr); | |
| 3383 defsubr (&Scar_safe); | |
| 3384 defsubr (&Scdr_safe); | |
| 3385 defsubr (&Ssetcar); | |
| 3386 defsubr (&Ssetcdr); | |
| 3387 defsubr (&Ssymbol_function); | |
| 648 | 3388 defsubr (&Sindirect_function); |
| 298 | 3389 defsubr (&Ssymbol_plist); |
| 3390 defsubr (&Ssymbol_name); | |
| 3391 defsubr (&Smakunbound); | |
| 3392 defsubr (&Sfmakunbound); | |
| 3393 defsubr (&Sboundp); | |
| 3394 defsubr (&Sfboundp); | |
| 3395 defsubr (&Sfset); | |
|
2565
c1a1557bffde
(Fdefine_function): Changed name back to Fdefalias, so we get things
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2548
diff
changeset
|
3396 defsubr (&Sdefalias); |
| 298 | 3397 defsubr (&Ssetplist); |
| 3398 defsubr (&Ssymbol_value); | |
| 3399 defsubr (&Sset); | |
| 3400 defsubr (&Sdefault_boundp); | |
| 3401 defsubr (&Sdefault_value); | |
| 3402 defsubr (&Sset_default); | |
| 3403 defsubr (&Ssetq_default); | |
| 3404 defsubr (&Smake_variable_buffer_local); | |
| 3405 defsubr (&Smake_local_variable); | |
| 3406 defsubr (&Skill_local_variable); | |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
3407 defsubr (&Smake_variable_frame_local); |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
3408 defsubr (&Slocal_variable_p); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
3409 defsubr (&Slocal_variable_if_set_p); |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
3410 defsubr (&Svariable_binding_locus); |
|
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
3411 #if 0 /* XXX Remove this. --lorentey */ |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
3412 defsubr (&Sterminal_local_value); |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
3413 defsubr (&Sset_terminal_local_value); |
|
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
3414 #endif |
| 298 | 3415 defsubr (&Saref); |
| 3416 defsubr (&Saset); | |
|
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
3417 defsubr (&Snumber_to_string); |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
3418 defsubr (&Sstring_to_number); |
| 298 | 3419 defsubr (&Seqlsign); |
| 3420 defsubr (&Slss); | |
| 3421 defsubr (&Sgtr); | |
| 3422 defsubr (&Sleq); | |
| 3423 defsubr (&Sgeq); | |
| 3424 defsubr (&Sneq); | |
| 3425 defsubr (&Szerop); | |
| 3426 defsubr (&Splus); | |
| 3427 defsubr (&Sminus); | |
| 3428 defsubr (&Stimes); | |
| 3429 defsubr (&Squo); | |
| 3430 defsubr (&Srem); | |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
3431 defsubr (&Smod); |
| 298 | 3432 defsubr (&Smax); |
| 3433 defsubr (&Smin); | |
| 3434 defsubr (&Slogand); | |
| 3435 defsubr (&Slogior); | |
| 3436 defsubr (&Slogxor); | |
| 3437 defsubr (&Slsh); | |
| 3438 defsubr (&Sash); | |
| 3439 defsubr (&Sadd1); | |
| 3440 defsubr (&Ssub1); | |
| 3441 defsubr (&Slognot); | |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3442 defsubr (&Sbyteorder); |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3443 defsubr (&Ssubr_arity); |
|
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
3444 defsubr (&Ssubr_name); |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3445 |
|
9954
18b408b05189
(syms_of_data): Set Qwholenump as function, not variable.
Karl Heuer <kwzh@gnu.org>
parents:
9895
diff
changeset
|
3446 XSYMBOL (Qwholenump)->function = XSYMBOL (Qnatnump)->function; |
|
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
37853
diff
changeset
|
3447 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3448 DEFVAR_LISP ("most-positive-fixnum", &Vmost_positive_fixnum, |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3449 doc: /* The largest value that is representable in a Lisp integer. */); |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3450 Vmost_positive_fixnum = make_number (MOST_POSITIVE_FIXNUM); |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3451 XSYMBOL (intern_c_string ("most-positive-fixnum"))->constant = 1; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
3452 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3453 DEFVAR_LISP ("most-negative-fixnum", &Vmost_negative_fixnum, |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3454 doc: /* The smallest value that is representable in a Lisp integer. */); |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3455 Vmost_negative_fixnum = make_number (MOST_NEGATIVE_FIXNUM); |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3456 XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1; |
| 298 | 3457 } |
| 3458 | |
| 490 | 3459 SIGTYPE |
| 298 | 3460 arith_error (signo) |
| 3461 int signo; | |
| 3462 { | |
| 638 | 3463 sigsetmask (SIGEMPTYMASK); |
| 298 | 3464 |
|
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58733
diff
changeset
|
3465 SIGNAL_THREAD_CHECK (signo); |
|
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
3466 xsignal0 (Qarith_error); |
| 298 | 3467 } |
| 3468 | |
| 21514 | 3469 void |
| 298 | 3470 init_data () |
| 3471 { | |
| 3472 /* Don't do this if just dumping out. | |
| 3473 We don't want to call `signal' in this case | |
| 3474 so that we don't have trouble with dumping | |
| 3475 signal-delivering routines in an inconsistent state. */ | |
| 3476 #ifndef CANNOT_DUMP | |
| 3477 if (!initialized) | |
| 3478 return; | |
| 3479 #endif /* CANNOT_DUMP */ | |
| 3480 signal (SIGFPE, arith_error); | |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
3481 |
| 298 | 3482 #ifdef uts |
| 3483 signal (SIGEMT, arith_error); | |
| 3484 #endif /* uts */ | |
| 3485 } | |
| 52401 | 3486 |
| 3487 /* arch-tag: 25879798-b84d-479a-9c89-7d148e2109f7 | |
| 3488 (do not change this comment) */ |
