Mercurial > emacs
annotate src/data.c @ 46521:84a08db3c1e6
(Fdefalias): Doc fix.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 18 Jul 2002 15:04:29 +0000 |
| parents | 50a2414d96b7 |
| children | 06e2e0c47046 |
| rev | line source |
|---|---|
| 298 | 1 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2 Copyright (C) 1985,86,88,93,94,95,97,98,99, 2000, 2001 |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
3 Free Software Foundation, Inc. |
| 298 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
| 7 GNU Emacs is free software; you can redistribute it and/or modify | |
| 8 it under the terms of the GNU General Public License as published by | |
| 12244 | 9 the Free Software Foundation; either version 2, or (at your option) |
| 298 | 10 any later version. |
| 11 | |
| 12 GNU Emacs is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14096
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14096
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
| 298 | 21 |
| 22 | |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25780
diff
changeset
|
23 #include <config.h> |
| 298 | 24 #include <signal.h> |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
25 #include <stdio.h> |
| 298 | 26 #include "lisp.h" |
| 336 | 27 #include "puresize.h" |
| 17027 | 28 #include "charset.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" |
| 348 | 33 |
|
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2647
diff
changeset
|
34 #ifdef STDC_HEADERS |
|
20122
923e1f635ace
No need to include <float.h> before "lisp.h",
Paul Eggert <eggert@twinsun.com>
parents:
20055
diff
changeset
|
35 #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
|
36 #endif |
|
4860
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
37 |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
38 /* 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
|
39 #ifndef IEEE_FLOATING_POINT |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
40 #if (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \ |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
41 && FLT_MIN_EXP == -125 && FLT_MAX_EXP == 128) |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
42 #define IEEE_FLOATING_POINT 1 |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
43 #else |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
44 #define IEEE_FLOATING_POINT 0 |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
45 #endif |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
46 #endif |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
47 |
|
4860
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
48 /* Work around a problem that happens because math.h on hpux 7 |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
49 defines two static variables--which, in Emacs, are not really static, |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
50 because `static' is defined as nothing. The problem is that they are |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
51 here, in floatfns.c, and in lread.c. |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
52 These macros prevent the name conflict. */ |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
53 #if defined (HPUX) && !defined (HPUX8) |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
54 #define _MAXLDBL data_c_maxldbl |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
55 #define _NMAXLDBL data_c_nmaxldbl |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
56 #endif |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
57 |
| 298 | 58 #include <math.h> |
| 59 | |
|
4780
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
60 #if !defined (atof) |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
61 extern double atof (); |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
62 #endif /* !atof */ |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
63 |
| 298 | 64 Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; |
| 65 Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; | |
| 66 Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; | |
| 648 | 67 Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
68 Lisp_Object Qcyclic_variable_indirection, Qcircular_list; |
| 298 | 69 Lisp_Object Qsetting_constant, Qinvalid_read_syntax; |
| 70 Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; | |
| 4036 | 71 Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; |
| 298 | 72 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
|
73 Lisp_Object Qtext_read_only; |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
74 Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; |
| 298 | 75 Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; |
| 76 Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; | |
| 26931 | 77 Lisp_Object Qbuffer_or_string_p, Qkeywordp; |
| 298 | 78 Lisp_Object Qboundp, Qfboundp; |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
79 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
|
80 |
| 298 | 81 Lisp_Object Qcdr; |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
82 Lisp_Object Qad_advice_info, Qad_activate_internal; |
| 298 | 83 |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
84 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
|
85 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
|
86 |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
87 Lisp_Object Qfloatp; |
| 298 | 88 Lisp_Object Qnumberp, Qnumber_or_marker_p; |
| 89 | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
90 static Lisp_Object Qinteger, Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; |
| 17027 | 91 static Lisp_Object Qfloat, Qwindow_configuration, Qwindow; |
| 92 Lisp_Object Qprocess; | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
93 static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; |
| 26185 | 94 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
|
95 static Lisp_Object Qsubrp, Qmany, Qunevalled; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
96 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
97 static Lisp_Object swap_in_symval_forwarding P_ ((Lisp_Object, Lisp_Object)); |
|
17830
3cf4a044aaad
Declare set_internal as Lisp_Object in advance to avoid
Kenichi Handa <handa@m17n.org>
parents:
17780
diff
changeset
|
98 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
99 Lisp_Object Vmost_positive_fixnum, Vmost_negative_fixnum; |
|
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
39575
diff
changeset
|
100 |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
101 |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
102 void |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
103 circular_list_error (list) |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
104 Lisp_Object list; |
|
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 Fsignal (Qcircular_list, list); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
107 } |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
108 |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
109 |
| 298 | 110 Lisp_Object |
| 111 wrong_type_argument (predicate, value) | |
| 112 register Lisp_Object predicate, value; | |
| 113 { | |
| 114 register Lisp_Object tem; | |
| 115 do | |
| 116 { | |
|
10245
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
117 /* If VALUE is not even a valid Lisp object, abort here |
|
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
118 where we can get a backtrace showing where it came from. */ |
|
10248
8b95a9a6d466
(wrong_type_argument): Use Lisp_Type_Limit.
Richard M. Stallman <rms@gnu.org>
parents:
10245
diff
changeset
|
119 if ((unsigned int) XGCTYPE (value) >= Lisp_Type_Limit) |
|
10245
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
120 abort (); |
|
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
121 |
| 298 | 122 value = Fsignal (Qwrong_type_argument, Fcons (predicate, Fcons (value, Qnil))); |
| 123 tem = call1 (predicate, value); | |
| 124 } | |
| 490 | 125 while (NILP (tem)); |
| 298 | 126 return value; |
| 127 } | |
| 128 | |
| 21514 | 129 void |
| 298 | 130 pure_write_error () |
| 131 { | |
| 132 error ("Attempt to modify read-only object"); | |
| 133 } | |
| 134 | |
| 135 void | |
| 136 args_out_of_range (a1, a2) | |
| 137 Lisp_Object a1, a2; | |
| 138 { | |
| 139 while (1) | |
| 140 Fsignal (Qargs_out_of_range, Fcons (a1, Fcons (a2, Qnil))); | |
| 141 } | |
| 142 | |
| 143 void | |
| 144 args_out_of_range_3 (a1, a2, a3) | |
| 145 Lisp_Object a1, a2, a3; | |
| 146 { | |
| 147 while (1) | |
| 148 Fsignal (Qargs_out_of_range, Fcons (a1, Fcons (a2, Fcons (a3, Qnil)))); | |
| 149 } | |
| 150 | |
| 151 /* On some machines, XINT needs a temporary location. | |
| 152 Here it is, in case it is needed. */ | |
| 153 | |
| 154 int sign_extend_temp; | |
| 155 | |
| 156 /* On a few machines, XINT can only be done by calling this. */ | |
| 157 | |
| 158 int | |
| 159 sign_extend_lisp_int (num) | |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
160 EMACS_INT num; |
| 298 | 161 { |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
162 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
|
163 return num | (((EMACS_INT) (-1)) << VALBITS); |
| 298 | 164 else |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
165 return num & ((((EMACS_INT) 1) << VALBITS) - 1); |
| 298 | 166 } |
| 167 | |
| 168 /* Data type predicates */ | |
| 169 | |
| 170 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
|
171 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
|
172 (obj1, obj2) |
| 298 | 173 Lisp_Object obj1, obj2; |
| 174 { | |
| 175 if (EQ (obj1, obj2)) | |
| 176 return Qt; | |
| 177 return Qnil; | |
| 178 } | |
| 179 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
180 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
|
181 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
|
182 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
183 Lisp_Object object; |
| 298 | 184 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
185 if (NILP (object)) |
| 298 | 186 return Qt; |
| 187 return Qnil; | |
| 188 } | |
| 189 | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
190 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
|
191 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
|
192 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
|
193 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
|
194 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
195 Lisp_Object object; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
196 { |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
197 switch (XGCTYPE (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
198 { |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
199 case Lisp_Int: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
200 return Qinteger; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
201 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
202 case Lisp_Symbol: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
203 return Qsymbol; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
204 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
205 case Lisp_String: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
206 return Qstring; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
207 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
208 case Lisp_Cons: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
209 return Qcons; |
|
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 case Lisp_Misc: |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
212 switch (XMISCTYPE (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
213 { |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
214 case Lisp_Misc_Marker: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
215 return Qmarker; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
216 case Lisp_Misc_Overlay: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
217 return Qoverlay; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
218 case Lisp_Misc_Float: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
219 return Qfloat; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
220 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
221 abort (); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
222 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
223 case Lisp_Vectorlike: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
224 if (GC_WINDOW_CONFIGURATIONP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
225 return Qwindow_configuration; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
226 if (GC_PROCESSP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
227 return Qprocess; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
228 if (GC_WINDOWP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
229 return Qwindow; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
230 if (GC_SUBRP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
231 return Qsubr; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
232 if (GC_COMPILEDP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
233 return Qcompiled_function; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
234 if (GC_BUFFERP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
235 return Qbuffer; |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
236 if (GC_CHAR_TABLE_P (object)) |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
237 return Qchar_table; |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
238 if (GC_BOOL_VECTOR_P (object)) |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
239 return Qbool_vector; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
240 if (GC_FRAMEP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
241 return Qframe; |
| 26185 | 242 if (GC_HASH_TABLE_P (object)) |
| 243 return Qhash_table; | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
244 return Qvector; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
245 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
246 case Lisp_Float: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
247 return Qfloat; |
|
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 default: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
250 abort (); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
251 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
252 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
253 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
254 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
|
255 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
|
256 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
257 Lisp_Object object; |
| 298 | 258 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
259 if (CONSP (object)) |
| 298 | 260 return Qt; |
| 261 return Qnil; | |
| 262 } | |
| 263 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
264 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
|
265 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
|
266 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
267 Lisp_Object object; |
| 298 | 268 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
269 if (CONSP (object)) |
| 298 | 270 return Qnil; |
| 271 return Qt; | |
| 272 } | |
| 273 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
274 DEFUN ("listp", Flistp, Slistp, 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
|
275 doc: /* Return t if OBJECT is a list. This includes nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
276 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
277 Lisp_Object object; |
| 298 | 278 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
279 if (CONSP (object) || NILP (object)) |
| 298 | 280 return Qt; |
| 281 return Qnil; | |
| 282 } | |
| 283 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
284 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
|
285 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
|
286 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
287 Lisp_Object object; |
| 298 | 288 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
289 if (CONSP (object) || NILP (object)) |
| 298 | 290 return Qnil; |
| 291 return Qt; | |
| 292 } | |
| 293 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
294 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
|
295 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
|
296 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
297 Lisp_Object object; |
| 298 | 298 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
299 if (SYMBOLP (object)) |
| 298 | 300 return Qt; |
| 301 return Qnil; | |
| 302 } | |
| 303 | |
| 26931 | 304 /* Define this in C to avoid unnecessarily consing up the symbol |
| 305 name. */ | |
| 306 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
|
307 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
|
308 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
|
309 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
|
310 (object) |
| 26931 | 311 Lisp_Object object; |
| 312 { | |
| 313 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
|
314 && SREF (SYMBOL_NAME (object), 0) == ':' |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
315 && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object)) |
| 26931 | 316 return Qt; |
| 317 return Qnil; | |
| 318 } | |
| 319 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
320 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
|
321 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
|
322 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
323 Lisp_Object object; |
| 298 | 324 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
325 if (VECTORP (object)) |
| 298 | 326 return Qt; |
| 327 return Qnil; | |
| 328 } | |
| 329 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
330 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
|
331 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
|
332 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
333 Lisp_Object object; |
| 298 | 334 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
335 if (STRINGP (object)) |
| 298 | 336 return Qt; |
| 337 return Qnil; | |
| 338 } | |
| 339 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
340 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
|
341 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
342 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
|
343 (object) |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
344 Lisp_Object object; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
345 { |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
346 if (STRINGP (object) && STRING_MULTIBYTE (object)) |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
347 return Qt; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
348 return Qnil; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
349 } |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
350 |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
351 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
|
352 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
|
353 (object) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
354 Lisp_Object object; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
355 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
356 if (CHAR_TABLE_P (object)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
357 return Qt; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
358 return Qnil; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
359 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
360 |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
361 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
|
362 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
|
363 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
|
364 (object) |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
365 Lisp_Object object; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
366 { |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
367 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
|
368 return Qt; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
369 return Qnil; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
370 } |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
371 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
372 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
|
373 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
|
374 (object) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
375 Lisp_Object object; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
376 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
377 if (BOOL_VECTOR_P (object)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
378 return Qt; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
379 return Qnil; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
380 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
381 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
382 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
|
383 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
|
384 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
385 Lisp_Object object; |
| 298 | 386 { |
|
18045
a2029aaffb4f
(Farrayp): Accept bool-vectors and char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
18011
diff
changeset
|
387 if (VECTORP (object) || STRINGP (object) |
|
a2029aaffb4f
(Farrayp): Accept bool-vectors and char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
18011
diff
changeset
|
388 || CHAR_TABLE_P (object) || BOOL_VECTOR_P (object)) |
| 298 | 389 return Qt; |
| 390 return Qnil; | |
| 391 } | |
| 392 | |
| 393 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
|
394 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
|
395 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
396 register Lisp_Object object; |
| 298 | 397 { |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
398 if (CONSP (object) || NILP (object) || VECTORP (object) || STRINGP (object) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
399 || CHAR_TABLE_P (object) || BOOL_VECTOR_P (object)) |
| 298 | 400 return Qt; |
| 401 return Qnil; | |
| 402 } | |
| 403 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
404 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
|
405 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
|
406 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
407 Lisp_Object object; |
| 298 | 408 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
409 if (BUFFERP (object)) |
| 298 | 410 return Qt; |
| 411 return Qnil; | |
| 412 } | |
| 413 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
414 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
|
415 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
|
416 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
417 Lisp_Object object; |
| 298 | 418 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
419 if (MARKERP (object)) |
| 298 | 420 return Qt; |
| 421 return Qnil; | |
| 422 } | |
| 423 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
424 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
|
425 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
|
426 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
427 Lisp_Object object; |
| 298 | 428 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
429 if (SUBRP (object)) |
| 298 | 430 return Qt; |
| 431 return Qnil; | |
| 432 } | |
| 433 | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
434 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
|
435 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
436 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
|
437 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
438 Lisp_Object object; |
| 298 | 439 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
440 if (COMPILEDP (object)) |
| 298 | 441 return Qt; |
| 442 return Qnil; | |
| 443 } | |
| 444 | |
|
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
445 DEFUN ("char-or-string-p", Fchar_or_string_p, Schar_or_string_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
|
446 doc: /* Return t if OBJECT is a character (an integer) or a string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
447 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
448 register Lisp_Object object; |
| 298 | 449 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
450 if (INTEGERP (object) || STRINGP (object)) |
| 298 | 451 return Qt; |
| 452 return Qnil; | |
| 453 } | |
| 454 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
455 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
|
456 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
|
457 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
458 Lisp_Object object; |
| 298 | 459 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
460 if (INTEGERP (object)) |
| 298 | 461 return Qt; |
| 462 return Qnil; | |
| 463 } | |
| 464 | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
465 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
|
466 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
|
467 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
468 register Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
469 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
470 if (MARKERP (object) || INTEGERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
471 return Qt; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
472 return Qnil; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
473 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
474 |
|
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
475 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
|
476 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
|
477 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
478 Lisp_Object object; |
| 298 | 479 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
480 if (NATNUMP (object)) |
| 298 | 481 return Qt; |
| 482 return Qnil; | |
| 483 } | |
| 484 | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
485 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
|
486 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
|
487 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
488 Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
489 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
490 if (NUMBERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
491 return Qt; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
492 else |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
493 return Qnil; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
494 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
495 |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
496 DEFUN ("number-or-marker-p", Fnumber_or_marker_p, |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
497 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
|
498 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
|
499 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
500 Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
501 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
502 if (NUMBERP (object) || MARKERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
503 return Qt; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
504 return Qnil; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
505 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
506 |
| 298 | 507 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
|
508 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
|
509 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
510 Lisp_Object object; |
| 298 | 511 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
512 if (FLOATP (object)) |
| 298 | 513 return Qt; |
| 514 return Qnil; | |
| 515 } | |
|
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
516 |
| 298 | 517 |
| 518 /* Extract and set components of lists */ | |
| 519 | |
| 520 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
|
521 doc: /* Return the car of LIST. If arg is nil, return nil. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
522 Error if arg is not nil and not a cons cell. See also `car-safe'. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
523 (list) |
| 298 | 524 register Lisp_Object list; |
| 525 { | |
| 526 while (1) | |
| 527 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
528 if (CONSP (list)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
529 return XCAR (list); |
| 298 | 530 else if (EQ (list, Qnil)) |
| 531 return Qnil; | |
| 532 else | |
| 533 list = wrong_type_argument (Qlistp, list); | |
| 534 } | |
| 535 } | |
| 536 | |
| 537 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
|
538 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
|
539 (object) |
| 298 | 540 Lisp_Object object; |
| 541 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
542 if (CONSP (object)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
543 return XCAR (object); |
| 298 | 544 else |
| 545 return Qnil; | |
| 546 } | |
| 547 | |
| 548 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
|
549 doc: /* Return the cdr of LIST. If arg is nil, return nil. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
550 Error if arg is not nil and not a cons cell. See also `cdr-safe'. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
551 (list) |
| 298 | 552 register Lisp_Object list; |
| 553 { | |
| 554 while (1) | |
| 555 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
556 if (CONSP (list)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
557 return XCDR (list); |
| 298 | 558 else if (EQ (list, Qnil)) |
| 559 return Qnil; | |
| 560 else | |
| 561 list = wrong_type_argument (Qlistp, list); | |
| 562 } | |
| 563 } | |
| 564 | |
| 565 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
|
566 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
|
567 (object) |
| 298 | 568 Lisp_Object object; |
| 569 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
570 if (CONSP (object)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
571 return XCDR (object); |
| 298 | 572 else |
| 573 return Qnil; | |
| 574 } | |
| 575 | |
| 576 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
|
577 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
|
578 (cell, newcar) |
| 298 | 579 register Lisp_Object cell, newcar; |
| 580 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
581 if (!CONSP (cell)) |
| 298 | 582 cell = wrong_type_argument (Qconsp, cell); |
| 583 | |
| 584 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
|
585 XSETCAR (cell, newcar); |
| 298 | 586 return newcar; |
| 587 } | |
| 588 | |
| 589 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
|
590 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
|
591 (cell, newcdr) |
| 298 | 592 register Lisp_Object cell, newcdr; |
| 593 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
594 if (!CONSP (cell)) |
| 298 | 595 cell = wrong_type_argument (Qconsp, cell); |
| 596 | |
| 597 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
|
598 XSETCDR (cell, newcdr); |
| 298 | 599 return newcdr; |
| 600 } | |
| 601 | |
| 602 /* Extract and set components of symbols */ | |
| 603 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
604 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
|
605 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
|
606 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
607 register Lisp_Object symbol; |
| 298 | 608 { |
| 609 Lisp_Object valcontents; | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
610 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
611 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
612 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 613 |
| 9889 | 614 if (BUFFER_LOCAL_VALUEP (valcontents) |
| 615 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
616 valcontents = swap_in_symval_forwarding (symbol, valcontents); |
| 298 | 617 |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
618 return (EQ (valcontents, Qunbound) ? Qnil : Qt); |
| 298 | 619 } |
| 620 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
621 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
|
622 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
|
623 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
624 register Lisp_Object symbol; |
| 298 | 625 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
626 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
627 return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt); |
| 298 | 628 } |
| 629 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
630 DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
631 doc: /* Make SYMBOL's value be void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
632 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
633 register Lisp_Object symbol; |
| 298 | 634 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
635 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
636 if (XSYMBOL (symbol)->constant) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
637 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
638 Fset (symbol, Qunbound); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
639 return symbol; |
| 298 | 640 } |
| 641 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
642 DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
643 doc: /* Make SYMBOL's function definition be void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
644 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
645 register Lisp_Object symbol; |
| 298 | 646 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
647 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
648 if (NILP (symbol) || EQ (symbol, Qt)) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
649 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
650 XSYMBOL (symbol)->function = Qunbound; |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
651 return symbol; |
| 298 | 652 } |
| 653 | |
| 654 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
|
655 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
|
656 (symbol) |
| 648 | 657 register Lisp_Object symbol; |
| 298 | 658 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
659 CHECK_SYMBOL (symbol); |
| 648 | 660 if (EQ (XSYMBOL (symbol)->function, Qunbound)) |
| 661 return Fsignal (Qvoid_function, Fcons (symbol, Qnil)); | |
| 662 return XSYMBOL (symbol)->function; | |
| 298 | 663 } |
| 664 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
665 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
|
666 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
|
667 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
668 register Lisp_Object symbol; |
| 298 | 669 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
670 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
671 return XSYMBOL (symbol)->plist; |
| 298 | 672 } |
| 673 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
674 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
|
675 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
|
676 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
677 register Lisp_Object symbol; |
| 298 | 678 { |
| 679 register Lisp_Object name; | |
| 680 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
681 CHECK_SYMBOL (symbol); |
|
45397
bc5d63652a0a
* data.c (Fkeywordp, Fsymbol_name, store_symval_forwarding)
Ken Raeburn <raeburn@raeburn.org>
parents:
42274
diff
changeset
|
682 name = SYMBOL_NAME (symbol); |
| 298 | 683 return name; |
| 684 } | |
| 685 | |
| 686 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
|
687 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
|
688 (symbol, definition) |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
689 register Lisp_Object symbol, definition; |
| 298 | 690 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
691 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
692 if (NILP (symbol) || EQ (symbol, Qt)) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
693 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
694 if (!NILP (Vautoload_queue) && !EQ (XSYMBOL (symbol)->function, Qunbound)) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
695 Vautoload_queue = Fcons (Fcons (symbol, XSYMBOL (symbol)->function), |
| 298 | 696 Vautoload_queue); |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
697 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
|
698 /* Handle automatic advice activation */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
699 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
|
700 { |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
701 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
|
702 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
|
703 } |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
704 return definition; |
| 298 | 705 } |
| 706 | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
707 extern Lisp_Object Qfunction_documentation; |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
708 |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
709 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
|
710 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. |
| 46521 | 711 Associates the function with the current load file, if any. |
| 712 The optional third argument DOCSTRING specifies the documentation string | |
| 713 for SYMBOL; if it is omitted or nil, SYMBOL uses the documentation string | |
| 714 determined by DEFINITION. */) | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
715 (symbol, definition, docstring) |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
716 register Lisp_Object symbol, definition, docstring; |
|
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
717 { |
|
25132
07b44154638f
(Fdefalias): Call Ffset instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
23602
diff
changeset
|
718 definition = Ffset (symbol, definition); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
719 LOADHIST_ATTACH (symbol); |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
720 if (!NILP (docstring)) |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
721 Fput (symbol, Qfunction_documentation, docstring); |
|
16756
71113ba79b1b
(Fdefalias): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16754
diff
changeset
|
722 return definition; |
|
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
723 } |
|
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
724 |
| 298 | 725 DEFUN ("setplist", Fsetplist, Ssetplist, 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
|
726 doc: /* Set SYMBOL's property list 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
|
727 (symbol, newplist) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
728 register Lisp_Object symbol, newplist; |
| 298 | 729 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
730 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
731 XSYMBOL (symbol)->plist = newplist; |
| 298 | 732 return newplist; |
| 733 } | |
| 648 | 734 |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
735 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
|
736 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
|
737 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
|
738 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
|
739 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
|
740 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
|
741 (subr) |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
742 Lisp_Object subr; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
743 { |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
744 short minargs, maxargs; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
745 if (!SUBRP (subr)) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
746 wrong_type_argument (Qsubrp, subr); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
747 minargs = XSUBR (subr)->min_args; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
748 maxargs = XSUBR (subr)->max_args; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
749 if (maxargs == MANY) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
750 return Fcons (make_number (minargs), Qmany); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
751 else if (maxargs == UNEVALLED) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
752 return Fcons (make_number (minargs), Qunevalled); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
753 else |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
754 return Fcons (make_number (minargs), make_number (maxargs)); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
755 } |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
756 |
|
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
757 DEFUN ("subr-interactive-form", Fsubr_interactive_form, Ssubr_interactive_form, 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
|
758 doc: /* Return the interactive form of SUBR or nil if none. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
759 SUBR must be a built-in function. Value, if non-nil, is a list |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
760 \(interactive SPEC). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
761 (subr) |
|
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
762 Lisp_Object subr; |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
763 { |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
764 if (!SUBRP (subr)) |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
765 wrong_type_argument (Qsubrp, subr); |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
766 if (XSUBR (subr)->prompt) |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
767 return list2 (Qinteractive, build_string (XSUBR (subr)->prompt)); |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
768 return Qnil; |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
769 } |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
770 |
| 298 | 771 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
772 /*********************************************************************** |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
773 Getting and Setting Values of Symbols |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
774 ***********************************************************************/ |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
775 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
776 /* Return the symbol holding SYMBOL's value. Signal |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
777 `cyclic-variable-indirection' if SYMBOL's chain of variable |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
778 indirections contains a loop. */ |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
779 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
780 Lisp_Object |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
781 indirect_variable (symbol) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
782 Lisp_Object symbol; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
783 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
784 Lisp_Object tortoise, hare; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
785 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
786 hare = tortoise = symbol; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
787 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
788 while (XSYMBOL (hare)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
789 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
790 hare = XSYMBOL (hare)->value; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
791 if (!XSYMBOL (hare)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
792 break; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
793 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
794 hare = XSYMBOL (hare)->value; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
795 tortoise = XSYMBOL (tortoise)->value; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
796 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
797 if (EQ (hare, tortoise)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
798 Fsignal (Qcyclic_variable_indirection, Fcons (symbol, Qnil)); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
799 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
800 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
801 return hare; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
802 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
803 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
804 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
805 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
|
806 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
|
807 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
|
808 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
|
809 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
|
810 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
|
811 (object) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
812 Lisp_Object object; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
813 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
814 if (SYMBOLP (object)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
815 object = indirect_variable (object); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
816 return object; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
817 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
818 |
| 298 | 819 |
| 820 /* Given the raw contents of a symbol value cell, | |
| 821 return the Lisp value of the symbol. | |
| 822 This does not handle buffer-local variables; use | |
| 823 swap_in_symval_forwarding for that. */ | |
| 824 | |
| 825 Lisp_Object | |
| 826 do_symval_forwarding (valcontents) | |
| 827 register Lisp_Object valcontents; | |
| 828 { | |
| 829 register Lisp_Object val; | |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
830 int offset; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
831 if (MISCP (valcontents)) |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
832 switch (XMISCTYPE (valcontents)) |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
833 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
834 case Lisp_Misc_Intfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
835 XSETINT (val, *XINTFWD (valcontents)->intvar); |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
836 return val; |
| 298 | 837 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
838 case Lisp_Misc_Boolfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
839 return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil); |
| 298 | 840 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
841 case Lisp_Misc_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
842 return *XOBJFWD (valcontents)->objvar; |
| 298 | 843 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
844 case Lisp_Misc_Buffer_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
845 offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 846 return PER_BUFFER_VALUE (current_buffer, offset); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
847 |
|
11019
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
848 case Lisp_Misc_Kboard_Objfwd: |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
849 offset = XKBOARD_OBJFWD (valcontents)->offset; |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
850 return *(Lisp_Object *)(offset + (char *)current_kboard); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
851 } |
| 298 | 852 return valcontents; |
| 853 } | |
| 854 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
855 /* 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
|
856 of SYMBOL. If SYMBOL is buffer-local, VALCONTENTS should be the |
| 298 | 857 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
|
858 step past the buffer-localness. |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
859 |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
860 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
|
861 current buffer. This only plays a role for per-buffer variables. */ |
| 298 | 862 |
| 863 void | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
864 store_symval_forwarding (symbol, valcontents, newval, buf) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
865 Lisp_Object symbol; |
| 298 | 866 register Lisp_Object valcontents, newval; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
867 struct buffer *buf; |
| 298 | 868 { |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
869 switch (SWITCH_ENUM_CAST (XTYPE (valcontents))) |
| 298 | 870 { |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
871 case Lisp_Misc: |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
872 switch (XMISCTYPE (valcontents)) |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
873 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
874 case Lisp_Misc_Intfwd: |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
875 CHECK_NUMBER (newval); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
876 *XINTFWD (valcontents)->intvar = XINT (newval); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
877 if (*XINTFWD (valcontents)->intvar != XINT (newval)) |
|
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
878 error ("Value out of range for variable `%s'", |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
879 SDATA (SYMBOL_NAME (symbol))); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
880 break; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
881 |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
882 case Lisp_Misc_Boolfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
883 *XBOOLFWD (valcontents)->boolvar = NILP (newval) ? 0 : 1; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
884 break; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
885 |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
886 case Lisp_Misc_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
887 *XOBJFWD (valcontents)->objvar = newval; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
888 break; |
| 298 | 889 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
890 case Lisp_Misc_Buffer_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
891 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
892 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
893 Lisp_Object type; |
| 298 | 894 |
| 28351 | 895 type = PER_BUFFER_TYPE (offset); |
|
20996
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
896 if (XINT (type) == -1) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
897 error ("Variable %s is read-only", SDATA (SYMBOL_NAME (symbol))); |
|
20996
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
898 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
899 if (! NILP (type) && ! NILP (newval) |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
900 && XTYPE (newval) != XINT (type)) |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
901 buffer_slot_type_mismatch (offset); |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
902 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
903 if (buf == NULL) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
904 buf = current_buffer; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
905 PER_BUFFER_VALUE (buf, offset) = newval; |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
906 } |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
907 break; |
|
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
908 |
|
11019
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
909 case Lisp_Misc_Kboard_Objfwd: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
910 { |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
911 char *base = (char *) current_kboard; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
912 char *p = base + XKBOARD_OBJFWD (valcontents)->offset; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
913 *(Lisp_Object *) p = newval; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
914 } |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
915 break; |
|
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
916 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
917 default: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
918 goto def; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
919 } |
| 298 | 920 break; |
| 921 | |
| 922 default: | |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
923 def: |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
924 valcontents = SYMBOL_VALUE (symbol); |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
925 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
926 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
927 XBUFFER_LOCAL_VALUE (valcontents)->realvalue = newval; |
| 298 | 928 else |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
929 SET_SYMBOL_VALUE (symbol, newval); |
| 298 | 930 } |
| 931 } | |
| 932 | |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
933 /* 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
|
934 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
|
935 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
936 void |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
937 swap_in_global_binding (symbol) |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
938 Lisp_Object symbol; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
939 { |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
940 Lisp_Object valcontents, cdr; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
941 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
942 valcontents = SYMBOL_VALUE (symbol); |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
943 if (!BUFFER_LOCAL_VALUEP (valcontents) |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
944 && !SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
945 abort (); |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
946 cdr = XBUFFER_LOCAL_VALUE (valcontents)->cdr; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
947 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
948 /* Unload the previously loaded binding. */ |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
949 Fsetcdr (XCAR (cdr), |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
950 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue)); |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
951 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
952 /* Select the global binding in the symbol. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
953 XSETCAR (cdr, cdr); |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
954 store_symval_forwarding (symbol, valcontents, XCDR (cdr), NULL); |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
955 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
956 /* Indicate that the global binding is set up now. */ |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
957 XBUFFER_LOCAL_VALUE (valcontents)->frame = Qnil; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
958 XBUFFER_LOCAL_VALUE (valcontents)->buffer = Qnil; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
959 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
960 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
961 } |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
962 |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
963 /* 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
|
964 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
|
965 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
|
966 |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
967 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
|
968 This could be another forwarding pointer. */ |
| 298 | 969 |
| 970 static Lisp_Object | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
971 swap_in_symval_forwarding (symbol, valcontents) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
972 Lisp_Object symbol, valcontents; |
| 298 | 973 { |
| 974 register Lisp_Object tem1; | |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
975 |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
976 tem1 = XBUFFER_LOCAL_VALUE (valcontents)->buffer; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
977 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
978 if (NILP (tem1) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
979 || current_buffer != XBUFFER (tem1) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
980 || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
981 && ! EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame))) |
| 298 | 982 { |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
983 if (XSYMBOL (symbol)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
984 symbol = indirect_variable (symbol); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
985 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
986 /* Unload the previously loaded binding. */ |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
987 tem1 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
988 Fsetcdr (tem1, |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
989 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue)); |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
990 /* Choose the new binding. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
991 tem1 = assq_no_quit (symbol, current_buffer->local_var_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
992 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
993 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
| 490 | 994 if (NILP (tem1)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
995 { |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
996 if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame) |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
997 tem1 = assq_no_quit (symbol, XFRAME (selected_frame)->param_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
998 if (! NILP (tem1)) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
999 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1000 else |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1001 tem1 = XBUFFER_LOCAL_VALUE (valcontents)->cdr; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1002 } |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1003 else |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1004 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1005 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1006 /* Load the new binding. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1007 XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, tem1); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1008 XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, current_buffer); |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1009 XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1010 store_symval_forwarding (symbol, |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1011 XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1012 Fcdr (tem1), NULL); |
| 298 | 1013 } |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1014 return XBUFFER_LOCAL_VALUE (valcontents)->realvalue; |
| 298 | 1015 } |
| 1016 | |
| 514 | 1017 /* Find the value of a symbol, returning Qunbound if it's not bound. |
| 1018 This is helpful for code which just wants to get a variable's value | |
| 14036 | 1019 if it has one, without signaling an error. |
| 514 | 1020 Note that it must not be possible to quit |
| 1021 within this function. Great care is required for this. */ | |
| 298 | 1022 |
| 514 | 1023 Lisp_Object |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1024 find_symbol_value (symbol) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1025 Lisp_Object symbol; |
| 298 | 1026 { |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
1027 register Lisp_Object valcontents; |
| 298 | 1028 register Lisp_Object val; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1029 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1030 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1031 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 1032 |
| 9889 | 1033 if (BUFFER_LOCAL_VALUEP (valcontents) |
| 1034 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) | |
|
34964
f8c7b5b9fd2f
(find_symbol_value): Remove extra 3rd argument in the
Eli Zaretskii <eliz@gnu.org>
parents:
31829
diff
changeset
|
1035 valcontents = swap_in_symval_forwarding (symbol, valcontents); |
|
9878
8a68b5794c91
(Fboundp, find_symbol_value): Use type test macros instead of checking XTYPE
Karl Heuer <kwzh@gnu.org>
parents:
9465
diff
changeset
|
1036 |
|
8a68b5794c91
(Fboundp, find_symbol_value): Use type test macros instead of checking XTYPE
Karl Heuer <kwzh@gnu.org>
parents:
9465
diff
changeset
|
1037 if (MISCP (valcontents)) |
| 298 | 1038 { |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
1039 switch (XMISCTYPE (valcontents)) |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1040 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1041 case Lisp_Misc_Intfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1042 XSETINT (val, *XINTFWD (valcontents)->intvar); |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1043 return val; |
| 298 | 1044 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1045 case Lisp_Misc_Boolfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1046 return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil); |
| 298 | 1047 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1048 case Lisp_Misc_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1049 return *XOBJFWD (valcontents)->objvar; |
| 298 | 1050 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1051 case Lisp_Misc_Buffer_Objfwd: |
| 28351 | 1052 return PER_BUFFER_VALUE (current_buffer, |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1053 XBUFFER_OBJFWD (valcontents)->offset); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
1054 |
|
11019
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
1055 case Lisp_Misc_Kboard_Objfwd: |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
1056 return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
1057 + (char *)current_kboard); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1058 } |
| 298 | 1059 } |
| 1060 | |
| 1061 return valcontents; | |
| 1062 } | |
| 1063 | |
| 514 | 1064 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
|
1065 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
|
1066 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1067 Lisp_Object symbol; |
| 514 | 1068 { |
|
6497
89ff61b53cee
(store_symval_forwarding, Fsymbol_value): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6459
diff
changeset
|
1069 Lisp_Object val; |
| 514 | 1070 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1071 val = find_symbol_value (symbol); |
| 514 | 1072 if (EQ (val, Qunbound)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1073 return Fsignal (Qvoid_variable, Fcons (symbol, Qnil)); |
| 514 | 1074 else |
| 1075 return val; | |
| 1076 } | |
| 1077 | |
| 298 | 1078 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
|
1079 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
|
1080 (symbol, newval) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1081 register Lisp_Object symbol, newval; |
| 298 | 1082 { |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1083 return set_internal (symbol, newval, current_buffer, 0); |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1084 } |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1085 |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1086 /* 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
|
1087 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
|
1088 |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1089 static int |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1090 let_shadows_buffer_binding_p (symbol) |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1091 Lisp_Object symbol; |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1092 { |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1093 struct specbinding *p; |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1094 |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1095 for (p = specpdl_ptr - 1; p >= specpdl; p--) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1096 if (p->func == NULL |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1097 && CONSP (p->symbol)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1098 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1099 Lisp_Object let_bound_symbol = XCAR (p->symbol); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1100 if ((EQ (symbol, let_bound_symbol) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1101 || (XSYMBOL (let_bound_symbol)->indirect_variable |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1102 && EQ (symbol, indirect_variable (let_bound_symbol)))) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1103 && XBUFFER (XCDR (XCDR (p->symbol))) == current_buffer) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1104 break; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1105 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1106 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1107 return p >= specpdl; |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1108 } |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1109 |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1110 /* Store the value NEWVAL into SYMBOL. |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1111 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
|
1112 (0 stands for the current buffer.) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1113 |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1114 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
|
1115 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
|
1116 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
|
1117 |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1118 Lisp_Object |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1119 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
|
1120 register Lisp_Object symbol, newval; |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1121 struct buffer *buf; |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1122 int bindflag; |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1123 { |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1124 int voide = EQ (newval, Qunbound); |
| 298 | 1125 |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1126 register Lisp_Object valcontents, innercontents, tem1, current_alist_element; |
| 298 | 1127 |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1128 if (buf == 0) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1129 buf = current_buffer; |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1130 |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1131 /* If restoring in a dead buffer, do nothing. */ |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1132 if (NILP (buf->name)) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1133 return newval; |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1134 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1135 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1136 if (SYMBOL_CONSTANT_P (symbol) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1137 && (NILP (Fkeywordp (symbol)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1138 || !EQ (newval, SYMBOL_VALUE (symbol)))) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1139 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1140 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1141 innercontents = valcontents = SYMBOL_VALUE (symbol); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1142 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1143 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1144 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1145 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1146 int idx = PER_BUFFER_IDX (offset); |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1147 if (idx > 0 |
|
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1148 && !bindflag |
|
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1149 && !let_shadows_buffer_binding_p (symbol)) |
| 28351 | 1150 SET_PER_BUFFER_VALUE_P (buf, idx, 1); |
| 298 | 1151 } |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1152 else if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1153 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1154 { |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1155 /* valcontents is a struct Lisp_Buffer_Local_Value. */ |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1156 if (XSYMBOL (symbol)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1157 symbol = indirect_variable (symbol); |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1158 |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1159 /* What binding is loaded right now? */ |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1160 current_alist_element |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1161 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
| 298 | 1162 |
| 733 | 1163 /* If the current buffer is not the buffer whose binding is |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1164 loaded, or if there may be frame-local bindings and the frame |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1165 isn't the right one, or if it's a Lisp_Buffer_Local_Value and |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1166 the default binding is loaded, the loaded binding may be the |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1167 wrong one. */ |
|
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28351
diff
changeset
|
1168 if (!BUFFERP (XBUFFER_LOCAL_VALUE (valcontents)->buffer) |
|
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28351
diff
changeset
|
1169 || buf != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer) |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1170 || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1171 && !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame)) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1172 || (BUFFER_LOCAL_VALUEP (valcontents) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1173 && EQ (XCAR (current_alist_element), |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1174 current_alist_element))) |
| 298 | 1175 { |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1176 /* The currently loaded binding is not necessarily valid. |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1177 We need to unload it, and choose a new binding. */ |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1178 |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1179 /* Write out `realvalue' to the old loaded binding. */ |
| 733 | 1180 Fsetcdr (current_alist_element, |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1181 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue)); |
| 298 | 1182 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1183 /* Find the new binding. */ |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1184 tem1 = Fassq (symbol, buf->local_var_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1185 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1186 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1187 |
| 490 | 1188 if (NILP (tem1)) |
| 733 | 1189 { |
| 1190 /* This buffer still sees the default value. */ | |
| 1191 | |
| 1192 /* If the variable is a Lisp_Some_Buffer_Local_Value, | |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1193 or if this is `let' rather than `set', |
| 733 | 1194 make CURRENT-ALIST-ELEMENT point to itself, |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1195 indicating that we're seeing the default value. |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1196 Likewise if the variable has been let-bound |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1197 in the current buffer. */ |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1198 if (bindflag || SOME_BUFFER_LOCAL_VALUEP (valcontents) |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1199 || let_shadows_buffer_binding_p (symbol)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1200 { |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1201 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1202 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1203 if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame) |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1204 tem1 = Fassq (symbol, |
|
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1205 XFRAME (selected_frame)->param_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1206 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1207 if (! NILP (tem1)) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1208 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1209 else |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1210 tem1 = XBUFFER_LOCAL_VALUE (valcontents)->cdr; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1211 } |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1212 /* If it's a Lisp_Buffer_Local_Value, being set not bound, |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1213 and we're not within a let that was made for this buffer, |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1214 create a new buffer-local binding for the variable. |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1215 That means, give this buffer a new assoc for a local value |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1216 and load that binding. */ |
| 733 | 1217 else |
| 1218 { | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1219 tem1 = Fcons (symbol, XCDR (current_alist_element)); |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1220 buf->local_var_alist |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1221 = Fcons (tem1, buf->local_var_alist); |
| 733 | 1222 } |
| 1223 } | |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1224 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1225 /* Record which binding is now loaded. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1226 XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1227 tem1); |
| 733 | 1228 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1229 /* Set `buffer' and `frame' slots for thebinding now loaded. */ |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1230 XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf); |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1231 XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame; |
| 298 | 1232 } |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1233 innercontents = XBUFFER_LOCAL_VALUE (valcontents)->realvalue; |
| 298 | 1234 } |
| 733 | 1235 |
| 298 | 1236 /* If storing void (making the symbol void), forward only through |
| 1237 buffer-local indicator, not through Lisp_Objfwd, etc. */ | |
| 1238 if (voide) | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1239 store_symval_forwarding (symbol, Qnil, newval, buf); |
| 298 | 1240 else |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1241 store_symval_forwarding (symbol, innercontents, newval, buf); |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1242 |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1243 /* If we just set a variable whose current binding is frame-local, |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1244 store the new value in the frame parameter too. */ |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1245 |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1246 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1247 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1248 { |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1249 /* What binding is loaded right now? */ |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1250 current_alist_element |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1251 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1252 |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1253 /* If the current buffer is not the buffer whose binding is |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1254 loaded, or if there may be frame-local bindings and the frame |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1255 isn't the right one, or if it's a Lisp_Buffer_Local_Value and |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1256 the default binding is loaded, the loaded binding may be the |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1257 wrong one. */ |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1258 if (XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame) |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1259 XSETCDR (current_alist_element, newval); |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1260 } |
| 733 | 1261 |
| 298 | 1262 return newval; |
| 1263 } | |
| 1264 | |
| 1265 /* Access or set a buffer-local symbol's default value. */ | |
| 1266 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1267 /* 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
|
1268 Return Qunbound if it is void. */ |
| 298 | 1269 |
| 1270 Lisp_Object | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1271 default_value (symbol) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1272 Lisp_Object symbol; |
| 298 | 1273 { |
| 1274 register Lisp_Object valcontents; | |
| 1275 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1276 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1277 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 1278 |
| 1279 /* For a built-in buffer-local variable, get the default value | |
| 1280 rather than letting do_symval_forwarding get the current value. */ | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1281 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1282 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1283 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1284 if (PER_BUFFER_IDX (offset) != 0) |
| 1285 return PER_BUFFER_DEFAULT (offset); | |
| 298 | 1286 } |
| 1287 | |
| 1288 /* Handle user-created local variables. */ | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1289 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1290 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1291 { |
| 1292 /* If var is set up for a buffer that lacks a local value for it, | |
| 1293 the current value is nominally the default value. | |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1294 But the `realvalue' slot may be more up to date, since |
| 298 | 1295 ordinary setq stores just that slot. So use that. */ |
| 1296 Lisp_Object current_alist_element, alist_element_car; | |
| 1297 current_alist_element | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1298 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1299 alist_element_car = XCAR (current_alist_element); |
| 298 | 1300 if (EQ (alist_element_car, current_alist_element)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1301 return do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue); |
| 298 | 1302 else |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1303 return XCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
| 298 | 1304 } |
| 1305 /* For other variables, get the current value. */ | |
| 1306 return do_symval_forwarding (valcontents); | |
| 1307 } | |
| 1308 | |
| 1309 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
|
1310 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
|
1311 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
|
1312 for this variable. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1313 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1314 Lisp_Object symbol; |
| 298 | 1315 { |
| 1316 register Lisp_Object value; | |
| 1317 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1318 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
|
1319 return (EQ (value, Qunbound) ? Qnil : Qt); |
| 298 | 1320 } |
| 1321 | |
| 1322 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
|
1323 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
|
1324 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
|
1325 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
|
1326 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
|
1327 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1328 Lisp_Object symbol; |
| 298 | 1329 { |
| 1330 register Lisp_Object value; | |
| 1331 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1332 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
|
1333 if (EQ (value, Qunbound)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1334 return Fsignal (Qvoid_variable, Fcons (symbol, Qnil)); |
| 298 | 1335 return value; |
| 1336 } | |
| 1337 | |
| 1338 DEFUN ("set-default", Fset_default, Sset_default, 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
|
1339 doc: /* Set SYMBOL's default value to VAL. SYMBOL and VAL are evaluated. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1340 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
|
1341 for this variable. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1342 (symbol, value) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1343 Lisp_Object symbol, value; |
| 298 | 1344 { |
| 1345 register Lisp_Object valcontents, current_alist_element, alist_element_buffer; | |
| 1346 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1347 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1348 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 1349 |
| 1350 /* Handle variables like case-fold-search that have special slots | |
| 1351 in the buffer. Make them work apparently like Lisp_Buffer_Local_Value | |
| 1352 variables. */ | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1353 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1354 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1355 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1356 int idx = PER_BUFFER_IDX (offset); |
| 1357 | |
| 1358 PER_BUFFER_DEFAULT (offset) = value; | |
|
20996
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
1359 |
|
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
1360 /* If this variable is not always local in all buffers, |
|
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
1361 set it in the buffers that don't nominally have a local value. */ |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1362 if (idx > 0) |
| 298 | 1363 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1364 struct buffer *b; |
|
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1365 |
| 298 | 1366 for (b = all_buffers; b; b = b->next) |
| 28351 | 1367 if (!PER_BUFFER_VALUE_P (b, idx)) |
| 1368 PER_BUFFER_VALUE (b, offset) = value; | |
| 298 | 1369 } |
| 1370 return value; | |
| 1371 } | |
| 1372 | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1373 if (!BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1374 && !SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1375 return Fset (symbol, value); |
| 298 | 1376 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1377 /* Store new value into the DEFAULT-VALUE slot. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1378 XSETCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, value); |
| 298 | 1379 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1380 /* If the default binding is now loaded, set the REALVALUE slot too. */ |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1381 current_alist_element |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1382 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
| 298 | 1383 alist_element_buffer = Fcar (current_alist_element); |
| 1384 if (EQ (alist_element_buffer, current_alist_element)) | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1385 store_symval_forwarding (symbol, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1386 XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1387 value, NULL); |
| 298 | 1388 |
| 1389 return value; | |
| 1390 } | |
| 1391 | |
| 1392 DEFUN ("setq-default", Fsetq_default, Ssetq_default, 2, UNEVALLED, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1393 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
|
1394 VAR, the variable name, is literal (not evaluated); |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1395 VALUE is an expression and it is evaluated. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1396 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
|
1397 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
|
1398 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1399 More generally, you can use multiple variables and values, as in |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1400 (setq-default SYMBOL VALUE SYMBOL VALUE...) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1401 This sets each SYMBOL's default value to the corresponding VALUE. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1402 The VALUE for the Nth SYMBOL can refer to the new default values |
|
40642
208e240d599a
(Fsetq_default): Add usage to doc-string.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40628
diff
changeset
|
1403 of previous SYMs. |
|
208e240d599a
(Fsetq_default): Add usage to doc-string.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40628
diff
changeset
|
1404 usage: (setq-default SYMBOL VALUE [SYMBOL VALUE...]) */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1405 (args) |
| 298 | 1406 Lisp_Object args; |
| 1407 { | |
| 1408 register Lisp_Object args_left; | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1409 register Lisp_Object val, symbol; |
| 298 | 1410 struct gcpro gcpro1; |
| 1411 | |
| 490 | 1412 if (NILP (args)) |
| 298 | 1413 return Qnil; |
| 1414 | |
| 1415 args_left = args; | |
| 1416 GCPRO1 (args); | |
| 1417 | |
| 1418 do | |
| 1419 { | |
| 1420 val = Feval (Fcar (Fcdr (args_left))); | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1421 symbol = XCAR (args_left); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1422 Fset_default (symbol, val); |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1423 args_left = Fcdr (XCDR (args_left)); |
| 298 | 1424 } |
| 490 | 1425 while (!NILP (args_left)); |
| 298 | 1426 |
| 1427 UNGCPRO; | |
| 1428 return val; | |
| 1429 } | |
| 1430 | |
|
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1431 /* 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
|
1432 |
| 298 | 1433 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
|
1434 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
|
1435 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
|
1436 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
|
1437 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
|
1438 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
|
1439 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
|
1440 a `let'-style binding made in this 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
|
1441 does not make the variable buffer-local. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1442 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1443 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
|
1444 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1445 register Lisp_Object variable; |
| 298 | 1446 { |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1447 register Lisp_Object tem, valcontents, newval; |
| 298 | 1448 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1449 CHECK_SYMBOL (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1450 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1451 valcontents = SYMBOL_VALUE (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1452 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1453 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
| 298 | 1454 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1455 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1456 return variable; |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1457 if (SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1458 { |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1459 XMISCTYPE (SYMBOL_VALUE (variable)) = Lisp_Misc_Buffer_Local_Value; |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1460 return variable; |
| 298 | 1461 } |
| 1462 if (EQ (valcontents, Qunbound)) | |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1463 SET_SYMBOL_VALUE (variable, Qnil); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1464 tem = Fcons (Qnil, Fsymbol_value (variable)); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1465 XSETCAR (tem, tem); |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1466 newval = allocate_misc (); |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
1467 XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1468 XBUFFER_LOCAL_VALUE (newval)->realvalue = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1469 XBUFFER_LOCAL_VALUE (newval)->buffer = Fcurrent_buffer (); |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1470 XBUFFER_LOCAL_VALUE (newval)->frame = Qnil; |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1471 XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1472 XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1473 XBUFFER_LOCAL_VALUE (newval)->check_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1474 XBUFFER_LOCAL_VALUE (newval)->cdr = tem; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1475 SET_SYMBOL_VALUE (variable, newval); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1476 return variable; |
| 298 | 1477 } |
| 1478 | |
| 1479 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
|
1480 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
|
1481 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
|
1482 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
|
1483 \(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
|
1484 VARIABLE previously had. If VARIABLE was void, it remains void.\) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1485 See also `make-variable-buffer-local'. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1486 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1487 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
|
1488 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
|
1489 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
|
1490 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1491 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
|
1492 (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
|
1493 works. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1494 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1495 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
|
1496 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
|
1497 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1498 register Lisp_Object variable; |
| 298 | 1499 { |
| 1500 register Lisp_Object tem, valcontents; | |
| 1501 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1502 CHECK_SYMBOL (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1503 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1504 valcontents = SYMBOL_VALUE (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1505 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1506 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
| 298 | 1507 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1508 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents)) |
| 298 | 1509 { |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1510 tem = Fboundp (variable); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
1511 |
| 298 | 1512 /* Make sure the symbol has a local value in this particular buffer, |
| 1513 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
|
1514 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
|
1515 return variable; |
| 298 | 1516 } |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1517 /* Make sure symbol is set up to hold per-buffer values. */ |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1518 if (!SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1519 { |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1520 Lisp_Object newval; |
| 298 | 1521 tem = Fcons (Qnil, do_symval_forwarding (valcontents)); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1522 XSETCAR (tem, tem); |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1523 newval = allocate_misc (); |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
1524 XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1525 XBUFFER_LOCAL_VALUE (newval)->realvalue = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1526 XBUFFER_LOCAL_VALUE (newval)->buffer = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1527 XBUFFER_LOCAL_VALUE (newval)->frame = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1528 XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1529 XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1530 XBUFFER_LOCAL_VALUE (newval)->check_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1531 XBUFFER_LOCAL_VALUE (newval)->cdr = tem; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1532 SET_SYMBOL_VALUE (variable, newval);; |
| 298 | 1533 } |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1534 /* Make sure this buffer has its own value of symbol. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1535 tem = Fassq (variable, current_buffer->local_var_alist); |
| 490 | 1536 if (NILP (tem)) |
| 298 | 1537 { |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1538 /* 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
|
1539 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
|
1540 default value. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1541 find_symbol_value (variable); |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1542 |
| 298 | 1543 current_buffer->local_var_alist |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1544 = Fcons (Fcons (variable, XCDR (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (variable))->cdr)), |
| 298 | 1545 current_buffer->local_var_alist); |
| 1546 | |
| 1547 /* 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
|
1548 force it to look once again for this buffer's value. */ |
| 298 | 1549 { |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1550 Lisp_Object *pvalbuf; |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1551 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1552 valcontents = SYMBOL_VALUE (variable); |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1553 |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1554 pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer; |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1555 if (current_buffer == XBUFFER (*pvalbuf)) |
|
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1556 *pvalbuf = Qnil; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1557 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
| 298 | 1558 } |
|
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1559 } |
| 298 | 1560 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1561 /* 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
|
1562 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
|
1563 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
|
1564 binding the next time we unload it. */ |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1565 valcontents = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (variable))->realvalue; |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1566 if (INTFWDP (valcontents) || BOOLFWDP (valcontents) || OBJFWDP (valcontents)) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1567 swap_in_symval_forwarding (variable, SYMBOL_VALUE (variable)); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1568 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1569 return variable; |
| 298 | 1570 } |
| 1571 | |
| 1572 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
|
1573 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
|
1574 doc: /* Make VARIABLE no longer 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
|
1575 From now on the default value will apply in this buffer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1576 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1577 register Lisp_Object variable; |
| 298 | 1578 { |
| 1579 register Lisp_Object tem, valcontents; | |
| 1580 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1581 CHECK_SYMBOL (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1582 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1583 valcontents = SYMBOL_VALUE (variable); |
| 298 | 1584 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1585 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1586 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1587 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1588 int idx = PER_BUFFER_IDX (offset); |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1589 |
|
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1590 if (idx > 0) |
| 298 | 1591 { |
| 28351 | 1592 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0); |
| 1593 PER_BUFFER_VALUE (current_buffer, offset) | |
| 1594 = PER_BUFFER_DEFAULT (offset); | |
| 298 | 1595 } |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1596 return variable; |
| 298 | 1597 } |
| 1598 | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1599 if (!BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1600 && !SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1601 return variable; |
| 298 | 1602 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1603 /* Get rid of this buffer's alist element, if any. */ |
| 298 | 1604 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1605 tem = Fassq (variable, current_buffer->local_var_alist); |
| 490 | 1606 if (!NILP (tem)) |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1607 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
|
1608 = Fdelq (tem, current_buffer->local_var_alist); |
| 298 | 1609 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1610 /* 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
|
1611 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
|
1612 forwarded objects won't work right. */ |
| 298 | 1613 { |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1614 Lisp_Object *pvalbuf; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1615 valcontents = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1616 pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer; |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1617 if (current_buffer == XBUFFER (*pvalbuf)) |
|
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1618 { |
|
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1619 *pvalbuf = Qnil; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1620 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
|
14745
f78162b0fc6e
(Fkill_local_variable): Call find_symbol_value directly,
Richard M. Stallman <rms@gnu.org>
parents:
14302
diff
changeset
|
1621 find_symbol_value (variable); |
|
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1622 } |
| 298 | 1623 } |
| 1624 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1625 return variable; |
| 298 | 1626 } |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1627 |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1628 /* 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
|
1629 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1630 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
|
1631 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
|
1632 doc: /* Enable VARIABLE to have frame-local bindings. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1633 When a frame-local binding exists in the current frame, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1634 it is in effect whenever the current buffer has no buffer-local binding. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1635 A frame-local binding is actual a frame parameter value; |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1636 thus, any given frame has a local binding for VARIABLE |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1637 if it has a value for the frame parameter named VARIABLE. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1638 See `modify-frame-parameters'. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1639 (variable) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1640 register Lisp_Object variable; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1641 { |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1642 register Lisp_Object tem, valcontents, newval; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1643 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1644 CHECK_SYMBOL (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1645 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1646 valcontents = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1647 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1648 || BUFFER_OBJFWDP (valcontents)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1649 error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable))); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1650 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1651 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1652 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1653 { |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1654 XBUFFER_LOCAL_VALUE (valcontents)->check_frame = 1; |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1655 return variable; |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1656 } |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1657 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1658 if (EQ (valcontents, Qunbound)) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1659 SET_SYMBOL_VALUE (variable, Qnil); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1660 tem = Fcons (Qnil, Fsymbol_value (variable)); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1661 XSETCAR (tem, tem); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1662 newval = allocate_misc (); |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1663 XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1664 XBUFFER_LOCAL_VALUE (newval)->realvalue = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1665 XBUFFER_LOCAL_VALUE (newval)->buffer = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1666 XBUFFER_LOCAL_VALUE (newval)->frame = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1667 XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1668 XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1669 XBUFFER_LOCAL_VALUE (newval)->check_frame = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1670 XBUFFER_LOCAL_VALUE (newval)->cdr = tem; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1671 SET_SYMBOL_VALUE (variable, newval); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1672 return variable; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1673 } |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1674 |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1675 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
|
1676 1, 2, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1677 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
|
1678 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
|
1679 (variable, buffer) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1680 register Lisp_Object variable, buffer; |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1681 { |
|
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1682 Lisp_Object valcontents; |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1683 register struct buffer *buf; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1684 |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1685 if (NILP (buffer)) |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1686 buf = current_buffer; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1687 else |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1688 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1689 CHECK_BUFFER (buffer); |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1690 buf = XBUFFER (buffer); |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1691 } |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1692 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1693 CHECK_SYMBOL (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1694 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1695 valcontents = SYMBOL_VALUE (variable); |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1696 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
12225
a0067d2edef7
(Flocal_variable_p): Fix backwards logical operator.
Richard M. Stallman <rms@gnu.org>
parents:
12113
diff
changeset
|
1697 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1698 { |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1699 Lisp_Object tail, elt; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1700 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1701 variable = indirect_variable (variable); |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1702 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1703 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1704 elt = XCAR (tail); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1705 if (EQ (variable, XCAR (elt))) |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1706 return Qt; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1707 } |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1708 } |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1709 if (BUFFER_OBJFWDP (valcontents)) |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1710 { |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1711 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1712 int idx = PER_BUFFER_IDX (offset); |
| 1713 if (idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) | |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1714 return Qt; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1715 } |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1716 return Qnil; |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1717 } |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1718 |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1719 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
|
1720 1, 2, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1721 doc: /* Non-nil if VARIABLE will be local in buffer BUFFER if it is set there. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1722 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
|
1723 (variable, buffer) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1724 register Lisp_Object variable, buffer; |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1725 { |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1726 Lisp_Object valcontents; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1727 register struct buffer *buf; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1728 |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1729 if (NILP (buffer)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1730 buf = current_buffer; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1731 else |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1732 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1733 CHECK_BUFFER (buffer); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1734 buf = XBUFFER (buffer); |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1735 } |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1736 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1737 CHECK_SYMBOL (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1738 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1739 valcontents = SYMBOL_VALUE (variable); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1740 |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1741 /* This means that make-variable-buffer-local was done. */ |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1742 if (BUFFER_LOCAL_VALUEP (valcontents)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1743 return Qt; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1744 /* All these slots become local if they are set. */ |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1745 if (BUFFER_OBJFWDP (valcontents)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1746 return Qt; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1747 if (SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1748 { |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1749 Lisp_Object tail, elt; |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1750 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1751 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1752 elt = XCAR (tail); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1753 if (EQ (variable, XCAR (elt))) |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1754 return Qt; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1755 } |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1756 } |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1757 return Qnil; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1758 } |
| 298 | 1759 |
| 648 | 1760 /* Find the function at the end of a chain of symbol function indirections. */ |
| 1761 | |
| 1762 /* If OBJECT is a symbol, find the end of its function chain and | |
| 1763 return the value found there. If OBJECT is not a symbol, just | |
| 1764 return it. If there is a cycle in the function chain, signal a | |
| 1765 cyclic-function-indirection error. | |
| 1766 | |
| 1767 This is like Findirect_function, except that it doesn't signal an | |
| 1768 error if the chain ends up unbound. */ | |
| 1769 Lisp_Object | |
|
1648
27e9f99fe095
src/ * data.c (indirect_function): Delete unused argument ERROR.
Jim Blandy <jimb@redhat.com>
parents:
1508
diff
changeset
|
1770 indirect_function (object) |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1771 register Lisp_Object object; |
| 648 | 1772 { |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1773 Lisp_Object tortoise, hare; |
| 648 | 1774 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1775 hare = tortoise = object; |
| 648 | 1776 |
| 1777 for (;;) | |
| 1778 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1779 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
| 648 | 1780 break; |
| 1781 hare = XSYMBOL (hare)->function; | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1782 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
| 648 | 1783 break; |
| 1784 hare = XSYMBOL (hare)->function; | |
| 1785 | |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1786 tortoise = XSYMBOL (tortoise)->function; |
| 648 | 1787 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1788 if (EQ (hare, tortoise)) |
| 648 | 1789 Fsignal (Qcyclic_function_indirection, Fcons (object, Qnil)); |
| 1790 } | |
| 1791 | |
| 1792 return hare; | |
| 1793 } | |
| 1794 | |
| 1795 DEFUN ("indirect-function", Findirect_function, Sindirect_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
|
1796 doc: /* Return the function at the end of OBJECT's function chain. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1797 If OBJECT is a symbol, follow all function 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
|
1798 function binding. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1799 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
|
1800 Signal a void-function error if the final symbol is unbound. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1801 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
|
1802 function chain of symbols. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1803 (object) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1804 register Lisp_Object object; |
| 648 | 1805 { |
| 1806 Lisp_Object result; | |
| 1807 | |
| 1808 result = indirect_function (object); | |
| 1809 | |
| 1810 if (EQ (result, Qunbound)) | |
| 1811 return Fsignal (Qvoid_function, Fcons (object, Qnil)); | |
| 1812 return result; | |
| 1813 } | |
| 1814 | |
| 298 | 1815 /* Extract and set vector and string elements */ |
| 1816 | |
| 1817 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
|
1818 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
|
1819 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
|
1820 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
|
1821 (array, idx) |
| 298 | 1822 register Lisp_Object array; |
| 1823 Lisp_Object idx; | |
| 1824 { | |
| 1825 register int idxval; | |
| 1826 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1827 CHECK_NUMBER (idx); |
| 298 | 1828 idxval = XINT (idx); |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1829 if (STRINGP (array)) |
| 298 | 1830 { |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1831 int c, idxval_byte; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1832 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1833 if (idxval < 0 || idxval >= SCHARS (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1834 args_out_of_range (array, idx); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1835 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
|
1836 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
|
1837 idxval_byte = string_char_to_byte (array, idxval); |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1838 |
|
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
1839 c = STRING_CHAR (SDATA (array) + idxval_byte, |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1840 SBYTES (array) - idxval_byte); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1841 return make_number (c); |
| 298 | 1842 } |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1843 else if (BOOL_VECTOR_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1844 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1845 int val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1846 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1847 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1848 args_out_of_range (array, idx); |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1849 |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13296
diff
changeset
|
1850 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR]; |
|
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13296
diff
changeset
|
1851 return (val & (1 << (idxval % BITS_PER_CHAR)) ? Qt : Qnil); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1852 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1853 else if (CHAR_TABLE_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1854 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1855 Lisp_Object val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1856 |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
1857 val = Qnil; |
|
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
1858 |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1859 if (idxval < 0) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1860 args_out_of_range (array, idx); |
|
20827
4b85e02aae14
(Faref, Faset): Allow indexing a char-table
Richard M. Stallman <rms@gnu.org>
parents:
20793
diff
changeset
|
1861 if (idxval < CHAR_TABLE_ORDINARY_SLOTS) |
| 17027 | 1862 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1863 /* For ASCII and 8-bit European characters, the element is |
|
17184
caab9110ee07
(Faref, Faset): Adjusted for the change of CHAR_TABLE_ORDINARY_SLOTS.
Kenichi Handa <handa@m17n.org>
parents:
17117
diff
changeset
|
1864 stored in the top table. */ |
| 17027 | 1865 val = XCHAR_TABLE (array)->contents[idxval]; |
| 1866 if (NILP (val)) | |
| 1867 val = XCHAR_TABLE (array)->defalt; | |
| 1868 while (NILP (val)) /* Follow parents until we find some value. */ | |
| 1869 { | |
| 1870 array = XCHAR_TABLE (array)->parent; | |
| 1871 if (NILP (array)) | |
| 1872 return Qnil; | |
| 1873 val = XCHAR_TABLE (array)->contents[idxval]; | |
| 1874 if (NILP (val)) | |
| 1875 val = XCHAR_TABLE (array)->defalt; | |
| 1876 } | |
| 1877 return val; | |
| 1878 } | |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1879 else |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1880 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1881 int code[4], i; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1882 Lisp_Object sub_table; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1883 |
|
29007
180a8014aa14
(Faref): Use SPLIT_CHAR instead of SPLIT_NON_ASCII_CHAR.
Kenichi Handa <handa@m17n.org>
parents:
28417
diff
changeset
|
1884 SPLIT_CHAR (idxval, code[0], code[1], code[2]); |
|
26849
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
1885 if (code[1] < 32) code[1] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
1886 else if (code[2] < 32) code[2] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
1887 |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1888 /* Here, the possible range of CODE[0] (== charset ID) is |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1889 128..MAX_CHARSET. Since the top level char table contains |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1890 data for multibyte characters after 256th element, we must |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1891 increment CODE[0] by 128 to get a correct index. */ |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1892 code[0] += 128; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1893 code[3] = -1; /* anchor */ |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1894 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1895 try_parent_char_table: |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1896 sub_table = array; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1897 for (i = 0; code[i] >= 0; i++) |
| 17027 | 1898 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1899 val = XCHAR_TABLE (sub_table)->contents[code[i]]; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1900 if (SUB_CHAR_TABLE_P (val)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1901 sub_table = val; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1902 else |
| 17027 | 1903 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1904 if (NILP (val)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1905 val = XCHAR_TABLE (sub_table)->defalt; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1906 if (NILP (val)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1907 { |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1908 array = XCHAR_TABLE (array)->parent; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1909 if (!NILP (array)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1910 goto try_parent_char_table; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1911 } |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1912 return val; |
| 17027 | 1913 } |
| 1914 } | |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1915 /* Here, VAL is a sub char table. We try the default value |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1916 and parent. */ |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1917 val = XCHAR_TABLE (val)->defalt; |
| 17027 | 1918 if (NILP (val)) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1919 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1920 array = XCHAR_TABLE (array)->parent; |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1921 if (!NILP (array)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1922 goto try_parent_char_table; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1923 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1924 return val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1925 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1926 } |
| 298 | 1927 else |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1928 { |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
1929 int size = 0; |
|
10290
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1930 if (VECTORP (array)) |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1931 size = XVECTOR (array)->size; |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1932 else if (COMPILEDP (array)) |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1933 size = XVECTOR (array)->size & PSEUDOVECTOR_SIZE_MASK; |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1934 else |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1935 wrong_type_argument (Qarrayp, array); |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1936 |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
1937 if (idxval < 0 || idxval >= size) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1938 args_out_of_range (array, idx); |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1939 return XVECTOR (array)->contents[idxval]; |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1940 } |
| 298 | 1941 } |
| 1942 | |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
1943 /* Don't use alloca for relocating string data larger than this, lest |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
1944 we overflow their stack. The value is the same as what used in |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
1945 fns.c for base64 handling. */ |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
1946 #define MAX_ALLOCA 16*1024 |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
1947 |
| 298 | 1948 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
|
1949 doc: /* Store into the element of ARRAY at index IDX the value NEWELT. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1950 ARRAY may be a vector, a string, a char-table or a bool-vector. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1951 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
|
1952 (array, idx, newelt) |
| 298 | 1953 register Lisp_Object array; |
| 1954 Lisp_Object idx, newelt; | |
| 1955 { | |
| 1956 register int idxval; | |
| 1957 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1958 CHECK_NUMBER (idx); |
| 298 | 1959 idxval = XINT (idx); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1960 if (!VECTORP (array) && !STRINGP (array) && !BOOL_VECTOR_P (array) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1961 && ! CHAR_TABLE_P (array)) |
| 298 | 1962 array = wrong_type_argument (Qarrayp, array); |
| 1963 CHECK_IMPURE (array); | |
| 1964 | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1965 if (VECTORP (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1966 { |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1967 if (idxval < 0 || idxval >= XVECTOR (array)->size) |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1968 args_out_of_range (array, idx); |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1969 XVECTOR (array)->contents[idxval] = newelt; |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1970 } |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1971 else if (BOOL_VECTOR_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1972 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1973 int val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1974 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1975 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1976 args_out_of_range (array, idx); |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1977 |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13296
diff
changeset
|
1978 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR]; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1979 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1980 if (! NILP (newelt)) |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13296
diff
changeset
|
1981 val |= 1 << (idxval % BITS_PER_CHAR); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1982 else |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13296
diff
changeset
|
1983 val &= ~(1 << (idxval % BITS_PER_CHAR)); |
|
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13296
diff
changeset
|
1984 XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR] = val; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1985 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1986 else if (CHAR_TABLE_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1987 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1988 if (idxval < 0) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1989 args_out_of_range (array, idx); |
|
20827
4b85e02aae14
(Faref, Faset): Allow indexing a char-table
Richard M. Stallman <rms@gnu.org>
parents:
20793
diff
changeset
|
1990 if (idxval < CHAR_TABLE_ORDINARY_SLOTS) |
| 17027 | 1991 XCHAR_TABLE (array)->contents[idxval] = newelt; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1992 else |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1993 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
1994 int code[4], i; |
| 17027 | 1995 Lisp_Object val; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
1996 |
|
29007
180a8014aa14
(Faref): Use SPLIT_CHAR instead of SPLIT_NON_ASCII_CHAR.
Kenichi Handa <handa@m17n.org>
parents:
28417
diff
changeset
|
1997 SPLIT_CHAR (idxval, code[0], code[1], code[2]); |
|
26849
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
1998 if (code[1] < 32) code[1] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
1999 else if (code[2] < 32) code[2] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
2000 |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2001 /* See the comment of the corresponding part in Faref. */ |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2002 code[0] += 128; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2003 code[3] = -1; /* anchor */ |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2004 for (i = 0; code[i + 1] >= 0; i++) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2005 { |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2006 val = XCHAR_TABLE (array)->contents[code[i]]; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2007 if (SUB_CHAR_TABLE_P (val)) |
| 17027 | 2008 array = val; |
| 2009 else | |
|
19751
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2010 { |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2011 Lisp_Object temp; |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2012 |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2013 /* VAL is a leaf. Create a sub char table with the |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2014 default value VAL or XCHAR_TABLE (array)->defalt |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2015 and look into it. */ |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2016 |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2017 temp = make_sub_char_table (NILP (val) |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2018 ? XCHAR_TABLE (array)->defalt |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2019 : val); |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2020 XCHAR_TABLE (array)->contents[code[i]] = temp; |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2021 array = temp; |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2022 } |
| 17027 | 2023 } |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2024 XCHAR_TABLE (array)->contents[code[i]] = newelt; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2025 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2026 } |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2027 else if (STRING_MULTIBYTE (array)) |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2028 { |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2029 int idxval_byte, prev_bytes, new_bytes; |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2030 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
|
2031 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2032 if (idxval < 0 || idxval >= SCHARS (array)) |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2033 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
|
2034 CHECK_NUMBER (newelt); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2035 |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2036 idxval_byte = string_char_to_byte (array, idxval); |
|
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2037 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
|
2038 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
|
2039 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
|
2040 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
|
2041 { |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2042 /* 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
|
2043 int nchars = SCHARS (array); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2044 int nbytes = SBYTES (array); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2045 unsigned char *str; |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2046 |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2047 str = (nbytes <= MAX_ALLOCA |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2048 ? (unsigned char *) alloca (nbytes) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2049 : (unsigned char *) xmalloc (nbytes)); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2050 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
|
2051 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
|
2052 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
|
2053 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
|
2054 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
|
2055 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
|
2056 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
|
2057 if (nbytes > MAX_ALLOCA) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2058 xfree (str); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2059 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
|
2060 } |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2061 while (new_bytes--) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2062 *p1++ = *p0++; |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2063 } |
| 298 | 2064 else |
| 2065 { | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2066 if (idxval < 0 || idxval >= SCHARS (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2067 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
|
2068 CHECK_NUMBER (newelt); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2069 |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2070 if (XINT (newelt) < 0 || SINGLE_BYTE_CHAR_P (XINT (newelt))) |
|
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2071 SSET (array, idxval, XINT (newelt)); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2072 else |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2073 { |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2074 /* We must relocate the string data while converting it to |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2075 multibyte. */ |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2076 int idxval_byte, prev_bytes, new_bytes; |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2077 unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2078 unsigned char *origstr = SDATA (array), *str; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2079 int nchars, nbytes; |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2080 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2081 nchars = SCHARS (array); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2082 nbytes = idxval_byte = count_size_as_multibyte (origstr, idxval); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2083 nbytes += count_size_as_multibyte (origstr + idxval, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2084 nchars - idxval); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2085 str = (nbytes <= MAX_ALLOCA |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2086 ? (unsigned char *) alloca (nbytes) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2087 : (unsigned char *) xmalloc (nbytes)); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2088 copy_text (SDATA (array), str, nchars, 0, 1); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2089 PARSE_MULTIBYTE_SEQ (str + idxval_byte, nbytes - idxval_byte, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2090 prev_bytes); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2091 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
|
2092 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
|
2093 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
|
2094 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
|
2095 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
|
2096 while (new_bytes--) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2097 *p1++ = *p0++; |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2098 bcopy (str + idxval_byte + prev_bytes, p1, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2099 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
|
2100 if (nbytes > MAX_ALLOCA) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2101 xfree (str); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2102 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
|
2103 } |
| 298 | 2104 } |
| 2105 | |
| 2106 return newelt; | |
| 2107 } | |
| 2108 | |
| 2109 /* Arithmetic functions */ | |
| 2110 | |
| 2111 enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal }; | |
| 2112 | |
| 2113 Lisp_Object | |
| 2114 arithcompare (num1, num2, comparison) | |
| 2115 Lisp_Object num1, num2; | |
| 2116 enum comparison comparison; | |
| 2117 { | |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2118 double f1 = 0, f2 = 0; |
| 298 | 2119 int floatp = 0; |
| 2120 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2121 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
|
2122 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2); |
| 298 | 2123 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2124 if (FLOATP (num1) || FLOATP (num2)) |
| 298 | 2125 { |
| 2126 floatp = 1; | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2127 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
|
2128 f2 = (FLOATP (num2)) ? XFLOAT_DATA (num2) : XINT (num2); |
| 298 | 2129 } |
| 2130 | |
| 2131 switch (comparison) | |
| 2132 { | |
| 2133 case equal: | |
| 2134 if (floatp ? f1 == f2 : XINT (num1) == XINT (num2)) | |
| 2135 return Qt; | |
| 2136 return Qnil; | |
| 2137 | |
| 2138 case notequal: | |
| 2139 if (floatp ? f1 != f2 : XINT (num1) != XINT (num2)) | |
| 2140 return Qt; | |
| 2141 return Qnil; | |
| 2142 | |
| 2143 case less: | |
| 2144 if (floatp ? f1 < f2 : XINT (num1) < XINT (num2)) | |
| 2145 return Qt; | |
| 2146 return Qnil; | |
| 2147 | |
| 2148 case less_or_equal: | |
| 2149 if (floatp ? f1 <= f2 : XINT (num1) <= XINT (num2)) | |
| 2150 return Qt; | |
| 2151 return Qnil; | |
| 2152 | |
| 2153 case grtr: | |
| 2154 if (floatp ? f1 > f2 : XINT (num1) > XINT (num2)) | |
| 2155 return Qt; | |
| 2156 return Qnil; | |
| 2157 | |
| 2158 case grtr_or_equal: | |
| 2159 if (floatp ? f1 >= f2 : XINT (num1) >= XINT (num2)) | |
| 2160 return Qt; | |
| 2161 return Qnil; | |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2162 |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2163 default: |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2164 abort (); |
| 298 | 2165 } |
| 2166 } | |
| 2167 | |
| 2168 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
|
2169 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
|
2170 (num1, num2) |
| 298 | 2171 register Lisp_Object num1, num2; |
| 2172 { | |
| 2173 return arithcompare (num1, num2, equal); | |
| 2174 } | |
| 2175 | |
| 2176 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
|
2177 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
|
2178 (num1, num2) |
| 298 | 2179 register Lisp_Object num1, num2; |
| 2180 { | |
| 2181 return arithcompare (num1, num2, less); | |
| 2182 } | |
| 2183 | |
| 2184 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
|
2185 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
|
2186 (num1, num2) |
| 298 | 2187 register Lisp_Object num1, num2; |
| 2188 { | |
| 2189 return arithcompare (num1, num2, grtr); | |
| 2190 } | |
| 2191 | |
| 2192 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
|
2193 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
|
2194 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
|
2195 (num1, num2) |
| 298 | 2196 register Lisp_Object num1, num2; |
| 2197 { | |
| 2198 return arithcompare (num1, num2, less_or_equal); | |
| 2199 } | |
| 2200 | |
| 2201 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
|
2202 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
|
2203 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
|
2204 (num1, num2) |
| 298 | 2205 register Lisp_Object num1, num2; |
| 2206 { | |
| 2207 return arithcompare (num1, num2, grtr_or_equal); | |
| 2208 } | |
| 2209 | |
| 2210 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
|
2211 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
|
2212 (num1, num2) |
| 298 | 2213 register Lisp_Object num1, num2; |
| 2214 { | |
| 2215 return arithcompare (num1, num2, notequal); | |
| 2216 } | |
| 2217 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2218 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
|
2219 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
|
2220 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2221 register Lisp_Object number; |
| 298 | 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_OR_FLOAT (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2224 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2225 if (FLOATP (number)) |
| 298 | 2226 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2227 if (XFLOAT_DATA (number) == 0.0) |
| 298 | 2228 return Qt; |
| 2229 return Qnil; | |
| 2230 } | |
| 2231 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2232 if (!XINT (number)) |
| 298 | 2233 return Qt; |
| 2234 return Qnil; | |
| 2235 } | |
| 2236 | |
| 12043 | 2237 /* Convert between long values and pairs of Lisp integers. */ |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2238 |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2239 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
|
2240 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
|
2241 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
|
2242 { |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2243 unsigned int top = i >> 16; |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2244 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
|
2245 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
|
2246 return make_number (bot); |
|
11879
606889516975
(long_to_cons): Don't assume 32-bit longs.
Karl Heuer <kwzh@gnu.org>
parents:
11734
diff
changeset
|
2247 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
|
2248 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
|
2249 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
|
2250 } |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2251 |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2252 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
|
2253 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
|
2254 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
|
2255 { |
|
3675
f42eaf84478f
(cons_to_long): Declare top, bot as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
2256 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
|
2257 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
|
2258 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
|
2259 top = XCAR (c); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2260 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
|
2261 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
|
2262 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
|
2263 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
|
2264 } |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2265 |
|
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
2266 DEFUN ("number-to-string", Fnumber_to_string, Snumber_to_string, 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
|
2267 doc: /* Convert NUMBER to a string by printing it in decimal. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2268 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
|
2269 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
|
2270 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2271 Lisp_Object number; |
| 298 | 2272 { |
|
12528
ed5b91dd829a
(Fnumber_to_string): Make `buffer' long enough.
Karl Heuer <kwzh@gnu.org>
parents:
12295
diff
changeset
|
2273 char buffer[VALBITS]; |
| 298 | 2274 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2275 CHECK_NUMBER_OR_FLOAT (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2276 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2277 if (FLOATP (number)) |
| 298 | 2278 { |
| 2279 char pigbuf[350]; /* see comments in float_to_string */ | |
| 2280 | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2281 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
|
2282 return build_string (pigbuf); |
| 298 | 2283 } |
| 2284 | |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2285 if (sizeof (int) == sizeof (EMACS_INT)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2286 sprintf (buffer, "%d", XINT (number)); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2287 else if (sizeof (long) == sizeof (EMACS_INT)) |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
2288 sprintf (buffer, "%ld", (long) XINT (number)); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2289 else |
|
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2290 abort (); |
| 298 | 2291 return build_string (buffer); |
| 2292 } | |
| 2293 | |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2294 INLINE static int |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2295 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
|
2296 int character, base; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2297 { |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2298 int digit; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2299 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2300 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
|
2301 digit = character - '0'; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2302 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
|
2303 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
|
2304 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
|
2305 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
|
2306 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2307 return -1; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2308 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2309 if (digit >= base) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2310 return -1; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2311 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2312 return digit; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2313 } |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2314 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2315 DEFUN ("string-to-number", Fstring_to_number, Sstring_to_number, 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
|
2316 doc: /* Convert STRING to a number by parsing it as a decimal number. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2317 This parses both integers and floating point numbers. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2318 It ignores leading spaces and tabs. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2319 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2320 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
|
2321 present, base 10 is used. BASE must be between 2 and 16 (inclusive). |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2322 If the base used is not 10, floating point is not recognized. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2323 (string, base) |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2324 register Lisp_Object string, base; |
| 298 | 2325 { |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2326 register unsigned char *p; |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2327 register int b; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2328 int sign = 1; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2329 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
|
2330 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2331 CHECK_STRING (string); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2332 |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2333 if (NILP (base)) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2334 b = 10; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2335 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2336 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2337 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
|
2338 b = XINT (base); |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2339 if (b < 2 || b > 16) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2340 Fsignal (Qargs_out_of_range, Fcons (base, Qnil)); |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2341 } |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2342 |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2343 /* 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
|
2344 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
|
2345 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
|
2346 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
|
2347 p++; |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2348 |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2349 if (*p == '-') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2350 { |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2351 sign = -1; |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2352 p++; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2353 } |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2354 else if (*p == '+') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2355 p++; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2356 |
|
23420
460aba3ec682
(Fstring_to_number): Don't recognize floating point if base is not 10.
Kenichi Handa <handa@m17n.org>
parents:
23250
diff
changeset
|
2357 if (isfloat_string (p) && b == 10) |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2358 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
|
2359 else |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2360 { |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2361 double v = 0; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2362 |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2363 while (1) |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2364 { |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2365 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
|
2366 if (digit < 0) |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2367 break; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2368 v = v * b + digit; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2369 } |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2370 |
|
39775
280975f8c65e
(Fstring_to_number): Use make_fixnum_or_float.
Gerd Moellmann <gerd@gnu.org>
parents:
39767
diff
changeset
|
2371 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
|
2372 } |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2373 |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2374 return val; |
| 298 | 2375 } |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2376 |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2377 |
| 298 | 2378 enum arithop |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2379 { |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2380 Aadd, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2381 Asub, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2382 Amult, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2383 Adiv, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2384 Alogand, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2385 Alogior, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2386 Alogxor, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2387 Amax, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2388 Amin |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2389 }; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2390 |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2391 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
|
2392 int, Lisp_Object *)); |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2393 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
|
2394 |
| 298 | 2395 Lisp_Object |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2396 arith_driver (code, nargs, args) |
| 298 | 2397 enum arithop code; |
| 2398 int nargs; | |
| 2399 register Lisp_Object *args; | |
| 2400 { | |
| 2401 register Lisp_Object val; | |
| 2402 register int argnum; | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2403 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
|
2404 register EMACS_INT next; |
| 298 | 2405 |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2406 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2407 { |
| 2408 case Alogior: | |
| 2409 case Alogxor: | |
| 2410 case Aadd: | |
| 2411 case Asub: | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2412 accum = 0; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2413 break; |
| 298 | 2414 case Amult: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2415 accum = 1; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2416 break; |
| 298 | 2417 case Alogand: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2418 accum = -1; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2419 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2420 default: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2421 break; |
| 298 | 2422 } |
| 2423 | |
| 2424 for (argnum = 0; argnum < nargs; argnum++) | |
| 2425 { | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2426 /* 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
|
2427 val = args[argnum]; |
|
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_COERCE_MARKER (val); |
| 298 | 2429 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2430 if (FLOATP (val)) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2431 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
|
2432 nargs, args); |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2433 args[argnum] = val; |
| 298 | 2434 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
|
2435 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2436 { |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2437 case Aadd: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2438 accum += next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2439 break; |
| 298 | 2440 case Asub: |
|
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2441 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
| 298 | 2442 break; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2443 case Amult: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2444 accum *= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2445 break; |
| 298 | 2446 case Adiv: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2447 if (!argnum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2448 accum = next; |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2449 else |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2450 { |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2451 if (next == 0) |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2452 Fsignal (Qarith_error, Qnil); |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2453 accum /= next; |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2454 } |
| 298 | 2455 break; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2456 case Alogand: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2457 accum &= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2458 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2459 case Alogior: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2460 accum |= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2461 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2462 case Alogxor: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2463 accum ^= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2464 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2465 case Amax: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2466 if (!argnum || next > accum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2467 accum = next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2468 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2469 case Amin: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2470 if (!argnum || next < accum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2471 accum = next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2472 break; |
| 298 | 2473 } |
| 2474 } | |
| 2475 | |
|
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2476 XSETINT (val, accum); |
| 298 | 2477 return val; |
| 2478 } | |
| 2479 | |
| 6201 | 2480 #undef isnan |
| 2481 #define isnan(x) ((x) != (x)) | |
| 2482 | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2483 static Lisp_Object |
| 298 | 2484 float_arith_driver (accum, argnum, code, nargs, args) |
| 2485 double accum; | |
| 2486 register int argnum; | |
| 2487 enum arithop code; | |
| 2488 int nargs; | |
| 2489 register Lisp_Object *args; | |
| 2490 { | |
| 2491 register Lisp_Object val; | |
| 2492 double next; | |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2493 |
| 298 | 2494 for (; argnum < nargs; argnum++) |
| 2495 { | |
| 2496 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
|
2497 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
| 298 | 2498 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2499 if (FLOATP (val)) |
| 298 | 2500 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2501 next = XFLOAT_DATA (val); |
| 298 | 2502 } |
| 2503 else | |
| 2504 { | |
| 2505 args[argnum] = val; /* runs into a compiler bug. */ | |
| 2506 next = XINT (args[argnum]); | |
| 2507 } | |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2508 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2509 { |
| 2510 case Aadd: | |
| 2511 accum += next; | |
| 2512 break; | |
| 2513 case Asub: | |
|
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2514 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
| 298 | 2515 break; |
| 2516 case Amult: | |
| 2517 accum *= next; | |
| 2518 break; | |
| 2519 case Adiv: | |
| 2520 if (!argnum) | |
| 2521 accum = next; | |
| 2522 else | |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2523 { |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2524 if (! IEEE_FLOATING_POINT && next == 0) |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2525 Fsignal (Qarith_error, Qnil); |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2526 accum /= next; |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2527 } |
| 298 | 2528 break; |
| 2529 case Alogand: | |
| 2530 case Alogior: | |
| 2531 case Alogxor: | |
| 2532 return wrong_type_argument (Qinteger_or_marker_p, val); | |
| 2533 case Amax: | |
| 6201 | 2534 if (!argnum || isnan (next) || next > accum) |
| 298 | 2535 accum = next; |
| 2536 break; | |
| 2537 case Amin: | |
| 6201 | 2538 if (!argnum || isnan (next) || next < accum) |
| 298 | 2539 accum = next; |
| 2540 break; | |
| 2541 } | |
| 2542 } | |
| 2543 | |
| 2544 return make_float (accum); | |
| 2545 } | |
|
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
2546 |
| 298 | 2547 |
| 2548 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
|
2549 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
|
2550 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
|
2551 (nargs, args) |
| 298 | 2552 int nargs; |
| 2553 Lisp_Object *args; | |
| 2554 { | |
| 2555 return arith_driver (Aadd, nargs, args); | |
| 2556 } | |
| 2557 | |
| 2558 DEFUN ("-", Fminus, Sminus, 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
|
2559 doc: /* Negate number or subtract numbers or markers. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2560 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
|
2561 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
|
2562 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
|
2563 (nargs, args) |
| 298 | 2564 int nargs; |
| 2565 Lisp_Object *args; | |
| 2566 { | |
| 2567 return arith_driver (Asub, nargs, args); | |
| 2568 } | |
| 2569 | |
| 2570 DEFUN ("*", Ftimes, Stimes, 0, MANY, 0, | |
| 41153 | 2571 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
|
2572 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
|
2573 (nargs, args) |
| 298 | 2574 int nargs; |
| 2575 Lisp_Object *args; | |
| 2576 { | |
| 2577 return arith_driver (Amult, nargs, args); | |
| 2578 } | |
| 2579 | |
| 2580 DEFUN ("/", Fquo, Squo, 2, MANY, 0, | |
| 41153 | 2581 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
|
2582 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
|
2583 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
|
2584 (nargs, args) |
| 298 | 2585 int nargs; |
| 2586 Lisp_Object *args; | |
| 2587 { | |
| 2588 return arith_driver (Adiv, nargs, args); | |
| 2589 } | |
| 2590 | |
| 2591 DEFUN ("%", Frem, Srem, 2, 2, 0, | |
| 41153 | 2592 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
|
2593 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
|
2594 (x, y) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2595 register Lisp_Object x, y; |
| 298 | 2596 { |
| 2597 Lisp_Object val; | |
| 2598 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2599 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
|
2600 CHECK_NUMBER_COERCE_MARKER (y); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2601 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2602 if (XFASTINT (y) == 0) |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2603 Fsignal (Qarith_error, Qnil); |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2604 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2605 XSETINT (val, XINT (x) % XINT (y)); |
| 298 | 2606 return val; |
| 2607 } | |
| 2608 | |
|
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2609 #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
|
2610 double |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2611 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
|
2612 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
|
2613 { |
|
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2614 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
|
2615 |
|
13296
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2616 if (f2 < 0.0) |
|
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2617 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
|
2618 |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2619 /* 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
|
2620 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
|
2621 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
|
2622 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
|
2623 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
|
2624 do |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2625 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
|
2626 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
|
2627 |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2628 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
|
2629 } |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2630 #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
|
2631 |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2632 DEFUN ("mod", Fmod, Smod, 2, 2, 0, |
| 41153 | 2633 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
|
2634 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
|
2635 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
|
2636 (x, y) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2637 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
|
2638 { |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2639 Lisp_Object val; |
|
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2640 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
|
2641 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2642 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
|
2643 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
|
2644 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2645 if (FLOATP (x) || FLOATP (y)) |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2646 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
|
2647 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2648 i1 = XINT (x); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2649 i2 = XINT (y); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2650 |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2651 if (i2 == 0) |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2652 Fsignal (Qarith_error, Qnil); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2653 |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2654 i1 %= i2; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2655 |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2656 /* 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
|
2657 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
|
2658 i1 += i2; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2659 |
|
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2660 XSETINT (val, i1); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2661 return val; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2662 } |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2663 |
| 298 | 2664 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
|
2665 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
|
2666 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
|
2667 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
|
2668 (nargs, args) |
| 298 | 2669 int nargs; |
| 2670 Lisp_Object *args; | |
| 2671 { | |
| 2672 return arith_driver (Amax, nargs, args); | |
| 2673 } | |
| 2674 | |
| 2675 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
|
2676 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
|
2677 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
|
2678 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
|
2679 (nargs, args) |
| 298 | 2680 int nargs; |
| 2681 Lisp_Object *args; | |
| 2682 { | |
| 2683 return arith_driver (Amin, nargs, args); | |
| 2684 } | |
| 2685 | |
| 2686 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
|
2687 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
|
2688 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
|
2689 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
|
2690 (nargs, args) |
| 298 | 2691 int nargs; |
| 2692 Lisp_Object *args; | |
| 2693 { | |
| 2694 return arith_driver (Alogand, nargs, args); | |
| 2695 } | |
| 2696 | |
| 2697 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
|
2698 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
|
2699 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
|
2700 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
|
2701 (nargs, args) |
| 298 | 2702 int nargs; |
| 2703 Lisp_Object *args; | |
| 2704 { | |
| 2705 return arith_driver (Alogior, nargs, args); | |
| 2706 } | |
| 2707 | |
| 2708 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
|
2709 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
|
2710 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
|
2711 usage: (logxor &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
|
2712 (nargs, args) |
| 298 | 2713 int nargs; |
| 2714 Lisp_Object *args; | |
| 2715 { | |
| 2716 return arith_driver (Alogxor, nargs, args); | |
| 2717 } | |
| 2718 | |
| 2719 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
|
2720 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
|
2721 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
|
2722 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
|
2723 (value, count) |
|
11002
ff115809a39e
(Fash): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
10951
diff
changeset
|
2724 register Lisp_Object value, count; |
| 298 | 2725 { |
| 2726 register Lisp_Object val; | |
| 2727 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2728 CHECK_NUMBER (value); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2729 CHECK_NUMBER (count); |
| 298 | 2730 |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2731 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
|
2732 XSETINT (val, 0); |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2733 else if (XINT (count) > 0) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2734 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
|
2735 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
|
2736 XSETINT (val, XINT (value) < 0 ? -1 : 0); |
| 298 | 2737 else |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2738 XSETINT (val, XINT (value) >> -XINT (count)); |
| 298 | 2739 return val; |
| 2740 } | |
| 2741 | |
| 2742 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
|
2743 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
|
2744 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
|
2745 In this case, zeros are shifted in on the left. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2746 (value, count) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2747 register Lisp_Object value, count; |
| 298 | 2748 { |
| 2749 register Lisp_Object val; | |
| 2750 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2751 CHECK_NUMBER (value); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2752 CHECK_NUMBER (count); |
| 298 | 2753 |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2754 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
|
2755 XSETINT (val, 0); |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2756 else if (XINT (count) > 0) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2757 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
|
2758 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
|
2759 XSETINT (val, 0); |
| 298 | 2760 else |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2761 XSETINT (val, (EMACS_UINT) XUINT (value) >> -XINT (count)); |
| 298 | 2762 return val; |
| 2763 } | |
| 2764 | |
| 2765 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
|
2766 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
|
2767 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
|
2768 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2769 register Lisp_Object number; |
| 298 | 2770 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2771 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
|
2772 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2773 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
|
2774 return (make_float (1.0 + XFLOAT_DATA (number))); |
| 298 | 2775 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2776 XSETINT (number, XINT (number) + 1); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2777 return number; |
| 298 | 2778 } |
| 2779 | |
| 2780 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
|
2781 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
|
2782 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
|
2783 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2784 register Lisp_Object number; |
| 298 | 2785 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2786 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
|
2787 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2788 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
|
2789 return (make_float (-1.0 + XFLOAT_DATA (number))); |
| 298 | 2790 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2791 XSETINT (number, XINT (number) - 1); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2792 return number; |
| 298 | 2793 } |
| 2794 | |
| 2795 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
|
2796 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
|
2797 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2798 register Lisp_Object number; |
| 298 | 2799 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2800 CHECK_NUMBER (number); |
|
14096
f3766d691555
(Flognot): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14066
diff
changeset
|
2801 XSETINT (number, ~XINT (number)); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2802 return number; |
| 298 | 2803 } |
| 2804 | |
| 2805 void | |
| 2806 syms_of_data () | |
| 2807 { | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2808 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
|
2809 |
| 298 | 2810 Qquote = intern ("quote"); |
| 2811 Qlambda = intern ("lambda"); | |
| 2812 Qsubr = intern ("subr"); | |
| 2813 Qerror_conditions = intern ("error-conditions"); | |
| 2814 Qerror_message = intern ("error-message"); | |
| 2815 Qtop_level = intern ("top-level"); | |
| 2816 | |
| 2817 Qerror = intern ("error"); | |
| 2818 Qquit = intern ("quit"); | |
| 2819 Qwrong_type_argument = intern ("wrong-type-argument"); | |
| 2820 Qargs_out_of_range = intern ("args-out-of-range"); | |
| 2821 Qvoid_function = intern ("void-function"); | |
| 648 | 2822 Qcyclic_function_indirection = intern ("cyclic-function-indirection"); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2823 Qcyclic_variable_indirection = intern ("cyclic-variable-indirection"); |
| 298 | 2824 Qvoid_variable = intern ("void-variable"); |
| 2825 Qsetting_constant = intern ("setting-constant"); | |
| 2826 Qinvalid_read_syntax = intern ("invalid-read-syntax"); | |
| 2827 | |
| 2828 Qinvalid_function = intern ("invalid-function"); | |
| 2829 Qwrong_number_of_arguments = intern ("wrong-number-of-arguments"); | |
| 2830 Qno_catch = intern ("no-catch"); | |
| 2831 Qend_of_file = intern ("end-of-file"); | |
| 2832 Qarith_error = intern ("arith-error"); | |
| 2833 Qbeginning_of_buffer = intern ("beginning-of-buffer"); | |
| 2834 Qend_of_buffer = intern ("end-of-buffer"); | |
| 2835 Qbuffer_read_only = intern ("buffer-read-only"); | |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
2836 Qtext_read_only = intern ("text-read-only"); |
| 4036 | 2837 Qmark_inactive = intern ("mark-inactive"); |
| 298 | 2838 |
| 2839 Qlistp = intern ("listp"); | |
| 2840 Qconsp = intern ("consp"); | |
| 2841 Qsymbolp = intern ("symbolp"); | |
| 26931 | 2842 Qkeywordp = intern ("keywordp"); |
| 298 | 2843 Qintegerp = intern ("integerp"); |
| 2844 Qnatnump = intern ("natnump"); | |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
2845 Qwholenump = intern ("wholenump"); |
| 298 | 2846 Qstringp = intern ("stringp"); |
| 2847 Qarrayp = intern ("arrayp"); | |
| 2848 Qsequencep = intern ("sequencep"); | |
| 2849 Qbufferp = intern ("bufferp"); | |
| 2850 Qvectorp = intern ("vectorp"); | |
| 2851 Qchar_or_string_p = intern ("char-or-string-p"); | |
| 2852 Qmarkerp = intern ("markerp"); | |
| 1293 | 2853 Qbuffer_or_string_p = intern ("buffer-or-string-p"); |
| 298 | 2854 Qinteger_or_marker_p = intern ("integer-or-marker-p"); |
| 2855 Qboundp = intern ("boundp"); | |
| 2856 Qfboundp = intern ("fboundp"); | |
| 2857 | |
| 2858 Qfloatp = intern ("floatp"); | |
| 2859 Qnumberp = intern ("numberp"); | |
| 2860 Qnumber_or_marker_p = intern ("number-or-marker-p"); | |
| 2861 | |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2862 Qchar_table_p = intern ("char-table-p"); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
2863 Qvector_or_char_table_p = intern ("vector-or-char-table-p"); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2864 |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
2865 Qsubrp = intern ("subrp"); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
2866 Qunevalled = intern ("unevalled"); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
2867 Qmany = intern ("many"); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
2868 |
| 298 | 2869 Qcdr = intern ("cdr"); |
| 2870 | |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2871 /* Handle automatic advice activation */ |
|
8448
b6335ce87e16
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
Richard M. Stallman <rms@gnu.org>
parents:
8415
diff
changeset
|
2872 Qad_advice_info = intern ("ad-advice-info"); |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
2873 Qad_activate_internal = intern ("ad-activate-internal"); |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2874 |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2875 error_tail = Fcons (Qerror, Qnil); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2876 |
| 298 | 2877 /* ERROR is used as a signaler for random errors for which nothing else is right */ |
| 2878 | |
| 2879 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
|
2880 error_tail); |
| 298 | 2881 Fput (Qerror, Qerror_message, |
| 2882 build_string ("error")); | |
| 2883 | |
| 2884 Fput (Qquit, Qerror_conditions, | |
| 2885 Fcons (Qquit, Qnil)); | |
| 2886 Fput (Qquit, Qerror_message, | |
| 2887 build_string ("Quit")); | |
| 2888 | |
| 2889 Fput (Qwrong_type_argument, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2890 Fcons (Qwrong_type_argument, error_tail)); |
| 298 | 2891 Fput (Qwrong_type_argument, Qerror_message, |
| 2892 build_string ("Wrong type argument")); | |
| 2893 | |
| 2894 Fput (Qargs_out_of_range, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2895 Fcons (Qargs_out_of_range, error_tail)); |
| 298 | 2896 Fput (Qargs_out_of_range, Qerror_message, |
| 2897 build_string ("Args out of range")); | |
| 2898 | |
| 2899 Fput (Qvoid_function, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2900 Fcons (Qvoid_function, error_tail)); |
| 298 | 2901 Fput (Qvoid_function, Qerror_message, |
| 2902 build_string ("Symbol's function definition is void")); | |
| 2903 | |
| 648 | 2904 Fput (Qcyclic_function_indirection, Qerror_conditions, |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2905 Fcons (Qcyclic_function_indirection, error_tail)); |
| 648 | 2906 Fput (Qcyclic_function_indirection, Qerror_message, |
| 2907 build_string ("Symbol's chain of function indirections contains a loop")); | |
| 2908 | |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2909 Fput (Qcyclic_variable_indirection, Qerror_conditions, |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2910 Fcons (Qcyclic_variable_indirection, error_tail)); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2911 Fput (Qcyclic_variable_indirection, Qerror_message, |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2912 build_string ("Symbol's chain of variable indirections contains a loop")); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2913 |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2914 Qcircular_list = intern ("circular-list"); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2915 staticpro (&Qcircular_list); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2916 Fput (Qcircular_list, Qerror_conditions, |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2917 Fcons (Qcircular_list, error_tail)); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2918 Fput (Qcircular_list, Qerror_message, |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2919 build_string ("List contains a loop")); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2920 |
| 298 | 2921 Fput (Qvoid_variable, Qerror_conditions, |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2922 Fcons (Qvoid_variable, error_tail)); |
| 298 | 2923 Fput (Qvoid_variable, Qerror_message, |
| 2924 build_string ("Symbol's value as variable is void")); | |
| 2925 | |
| 2926 Fput (Qsetting_constant, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2927 Fcons (Qsetting_constant, error_tail)); |
| 298 | 2928 Fput (Qsetting_constant, Qerror_message, |
| 2929 build_string ("Attempt to set a constant symbol")); | |
| 2930 | |
| 2931 Fput (Qinvalid_read_syntax, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2932 Fcons (Qinvalid_read_syntax, error_tail)); |
| 298 | 2933 Fput (Qinvalid_read_syntax, Qerror_message, |
| 2934 build_string ("Invalid read syntax")); | |
| 2935 | |
| 2936 Fput (Qinvalid_function, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2937 Fcons (Qinvalid_function, error_tail)); |
| 298 | 2938 Fput (Qinvalid_function, Qerror_message, |
| 2939 build_string ("Invalid function")); | |
| 2940 | |
| 2941 Fput (Qwrong_number_of_arguments, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2942 Fcons (Qwrong_number_of_arguments, error_tail)); |
| 298 | 2943 Fput (Qwrong_number_of_arguments, Qerror_message, |
| 2944 build_string ("Wrong number of arguments")); | |
| 2945 | |
| 2946 Fput (Qno_catch, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2947 Fcons (Qno_catch, error_tail)); |
| 298 | 2948 Fput (Qno_catch, Qerror_message, |
| 2949 build_string ("No catch for tag")); | |
| 2950 | |
| 2951 Fput (Qend_of_file, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2952 Fcons (Qend_of_file, error_tail)); |
| 298 | 2953 Fput (Qend_of_file, Qerror_message, |
| 2954 build_string ("End of file during parsing")); | |
| 2955 | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2956 arith_tail = Fcons (Qarith_error, error_tail); |
| 298 | 2957 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
|
2958 arith_tail); |
| 298 | 2959 Fput (Qarith_error, Qerror_message, |
| 2960 build_string ("Arithmetic error")); | |
| 2961 | |
| 2962 Fput (Qbeginning_of_buffer, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2963 Fcons (Qbeginning_of_buffer, error_tail)); |
| 298 | 2964 Fput (Qbeginning_of_buffer, Qerror_message, |
| 2965 build_string ("Beginning of buffer")); | |
| 2966 | |
| 2967 Fput (Qend_of_buffer, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2968 Fcons (Qend_of_buffer, error_tail)); |
| 298 | 2969 Fput (Qend_of_buffer, Qerror_message, |
| 2970 build_string ("End of buffer")); | |
| 2971 | |
| 2972 Fput (Qbuffer_read_only, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2973 Fcons (Qbuffer_read_only, error_tail)); |
| 298 | 2974 Fput (Qbuffer_read_only, Qerror_message, |
| 2975 build_string ("Buffer is read-only")); | |
| 2976 | |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
2977 Fput (Qtext_read_only, Qerror_conditions, |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
2978 Fcons (Qtext_read_only, error_tail)); |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
2979 Fput (Qtext_read_only, Qerror_message, |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
2980 build_string ("Text is read-only")); |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
2981 |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2982 Qrange_error = intern ("range-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2983 Qdomain_error = intern ("domain-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2984 Qsingularity_error = intern ("singularity-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2985 Qoverflow_error = intern ("overflow-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2986 Qunderflow_error = intern ("underflow-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2987 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2988 Fput (Qdomain_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2989 Fcons (Qdomain_error, arith_tail)); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2990 Fput (Qdomain_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2991 build_string ("Arithmetic domain error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2992 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2993 Fput (Qrange_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2994 Fcons (Qrange_error, arith_tail)); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2995 Fput (Qrange_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2996 build_string ("Arithmetic range error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2997 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2998 Fput (Qsingularity_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2999 Fcons (Qsingularity_error, Fcons (Qdomain_error, arith_tail))); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3000 Fput (Qsingularity_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3001 build_string ("Arithmetic singularity error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3002 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3003 Fput (Qoverflow_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3004 Fcons (Qoverflow_error, Fcons (Qdomain_error, arith_tail))); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3005 Fput (Qoverflow_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3006 build_string ("Arithmetic overflow error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3007 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3008 Fput (Qunderflow_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3009 Fcons (Qunderflow_error, Fcons (Qdomain_error, arith_tail))); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3010 Fput (Qunderflow_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3011 build_string ("Arithmetic underflow error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3012 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3013 staticpro (&Qrange_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3014 staticpro (&Qdomain_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3015 staticpro (&Qsingularity_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3016 staticpro (&Qoverflow_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3017 staticpro (&Qunderflow_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3018 |
| 298 | 3019 staticpro (&Qnil); |
| 3020 staticpro (&Qt); | |
| 3021 staticpro (&Qquote); | |
| 3022 staticpro (&Qlambda); | |
| 3023 staticpro (&Qsubr); | |
| 3024 staticpro (&Qunbound); | |
| 3025 staticpro (&Qerror_conditions); | |
| 3026 staticpro (&Qerror_message); | |
| 3027 staticpro (&Qtop_level); | |
| 3028 | |
| 3029 staticpro (&Qerror); | |
| 3030 staticpro (&Qquit); | |
| 3031 staticpro (&Qwrong_type_argument); | |
| 3032 staticpro (&Qargs_out_of_range); | |
| 3033 staticpro (&Qvoid_function); | |
| 648 | 3034 staticpro (&Qcyclic_function_indirection); |
| 298 | 3035 staticpro (&Qvoid_variable); |
| 3036 staticpro (&Qsetting_constant); | |
| 3037 staticpro (&Qinvalid_read_syntax); | |
| 3038 staticpro (&Qwrong_number_of_arguments); | |
| 3039 staticpro (&Qinvalid_function); | |
| 3040 staticpro (&Qno_catch); | |
| 3041 staticpro (&Qend_of_file); | |
| 3042 staticpro (&Qarith_error); | |
| 3043 staticpro (&Qbeginning_of_buffer); | |
| 3044 staticpro (&Qend_of_buffer); | |
| 3045 staticpro (&Qbuffer_read_only); | |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3046 staticpro (&Qtext_read_only); |
|
4037
aecb99c65ab0
(syms_of_data): Staticpro Qmark_inactive.
Roland McGrath <roland@gnu.org>
parents:
4036
diff
changeset
|
3047 staticpro (&Qmark_inactive); |
| 298 | 3048 |
| 3049 staticpro (&Qlistp); | |
| 3050 staticpro (&Qconsp); | |
| 3051 staticpro (&Qsymbolp); | |
| 26931 | 3052 staticpro (&Qkeywordp); |
| 298 | 3053 staticpro (&Qintegerp); |
| 3054 staticpro (&Qnatnump); | |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3055 staticpro (&Qwholenump); |
| 298 | 3056 staticpro (&Qstringp); |
| 3057 staticpro (&Qarrayp); | |
| 3058 staticpro (&Qsequencep); | |
| 3059 staticpro (&Qbufferp); | |
| 3060 staticpro (&Qvectorp); | |
| 3061 staticpro (&Qchar_or_string_p); | |
| 3062 staticpro (&Qmarkerp); | |
| 1293 | 3063 staticpro (&Qbuffer_or_string_p); |
| 298 | 3064 staticpro (&Qinteger_or_marker_p); |
| 3065 staticpro (&Qfloatp); | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3066 staticpro (&Qnumberp); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3067 staticpro (&Qnumber_or_marker_p); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3068 staticpro (&Qchar_table_p); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3069 staticpro (&Qvector_or_char_table_p); |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3070 staticpro (&Qsubrp); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3071 staticpro (&Qmany); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3072 staticpro (&Qunevalled); |
| 298 | 3073 |
| 3074 staticpro (&Qboundp); | |
| 3075 staticpro (&Qfboundp); | |
| 3076 staticpro (&Qcdr); | |
|
8448
b6335ce87e16
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
Richard M. Stallman <rms@gnu.org>
parents:
8415
diff
changeset
|
3077 staticpro (&Qad_advice_info); |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
3078 staticpro (&Qad_activate_internal); |
| 298 | 3079 |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3080 /* Types that type-of returns. */ |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3081 Qinteger = intern ("integer"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3082 Qsymbol = intern ("symbol"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3083 Qstring = intern ("string"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3084 Qcons = intern ("cons"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3085 Qmarker = intern ("marker"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3086 Qoverlay = intern ("overlay"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3087 Qfloat = intern ("float"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3088 Qwindow_configuration = intern ("window-configuration"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3089 Qprocess = intern ("process"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3090 Qwindow = intern ("window"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3091 /* Qsubr = intern ("subr"); */ |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3092 Qcompiled_function = intern ("compiled-function"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3093 Qbuffer = intern ("buffer"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3094 Qframe = intern ("frame"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3095 Qvector = intern ("vector"); |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3096 Qchar_table = intern ("char-table"); |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3097 Qbool_vector = intern ("bool-vector"); |
| 26185 | 3098 Qhash_table = intern ("hash-table"); |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3099 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3100 staticpro (&Qinteger); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3101 staticpro (&Qsymbol); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3102 staticpro (&Qstring); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3103 staticpro (&Qcons); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3104 staticpro (&Qmarker); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3105 staticpro (&Qoverlay); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3106 staticpro (&Qfloat); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3107 staticpro (&Qwindow_configuration); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3108 staticpro (&Qprocess); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3109 staticpro (&Qwindow); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3110 /* staticpro (&Qsubr); */ |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3111 staticpro (&Qcompiled_function); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3112 staticpro (&Qbuffer); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3113 staticpro (&Qframe); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3114 staticpro (&Qvector); |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3115 staticpro (&Qchar_table); |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3116 staticpro (&Qbool_vector); |
| 26185 | 3117 staticpro (&Qhash_table); |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3118 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3119 defsubr (&Sindirect_variable); |
|
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
3120 defsubr (&Ssubr_interactive_form); |
| 298 | 3121 defsubr (&Seq); |
| 3122 defsubr (&Snull); | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3123 defsubr (&Stype_of); |
| 298 | 3124 defsubr (&Slistp); |
| 3125 defsubr (&Snlistp); | |
| 3126 defsubr (&Sconsp); | |
| 3127 defsubr (&Satom); | |
| 3128 defsubr (&Sintegerp); | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3129 defsubr (&Sinteger_or_marker_p); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3130 defsubr (&Snumberp); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3131 defsubr (&Snumber_or_marker_p); |
| 298 | 3132 defsubr (&Sfloatp); |
| 3133 defsubr (&Snatnump); | |
| 3134 defsubr (&Ssymbolp); | |
| 26931 | 3135 defsubr (&Skeywordp); |
| 298 | 3136 defsubr (&Sstringp); |
|
20793
b2af60896559
(syms_of_data): Register multibyte-string-p as a Lisp
Kenichi Handa <handa@m17n.org>
parents:
20716
diff
changeset
|
3137 defsubr (&Smultibyte_string_p); |
| 298 | 3138 defsubr (&Svectorp); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3139 defsubr (&Schar_table_p); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3140 defsubr (&Svector_or_char_table_p); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3141 defsubr (&Sbool_vector_p); |
| 298 | 3142 defsubr (&Sarrayp); |
| 3143 defsubr (&Ssequencep); | |
| 3144 defsubr (&Sbufferp); | |
| 3145 defsubr (&Smarkerp); | |
| 3146 defsubr (&Ssubrp); | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
3147 defsubr (&Sbyte_code_function_p); |
| 298 | 3148 defsubr (&Schar_or_string_p); |
| 3149 defsubr (&Scar); | |
| 3150 defsubr (&Scdr); | |
| 3151 defsubr (&Scar_safe); | |
| 3152 defsubr (&Scdr_safe); | |
| 3153 defsubr (&Ssetcar); | |
| 3154 defsubr (&Ssetcdr); | |
| 3155 defsubr (&Ssymbol_function); | |
| 648 | 3156 defsubr (&Sindirect_function); |
| 298 | 3157 defsubr (&Ssymbol_plist); |
| 3158 defsubr (&Ssymbol_name); | |
| 3159 defsubr (&Smakunbound); | |
| 3160 defsubr (&Sfmakunbound); | |
| 3161 defsubr (&Sboundp); | |
| 3162 defsubr (&Sfboundp); | |
| 3163 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
|
3164 defsubr (&Sdefalias); |
| 298 | 3165 defsubr (&Ssetplist); |
| 3166 defsubr (&Ssymbol_value); | |
| 3167 defsubr (&Sset); | |
| 3168 defsubr (&Sdefault_boundp); | |
| 3169 defsubr (&Sdefault_value); | |
| 3170 defsubr (&Sset_default); | |
| 3171 defsubr (&Ssetq_default); | |
| 3172 defsubr (&Smake_variable_buffer_local); | |
| 3173 defsubr (&Smake_local_variable); | |
| 3174 defsubr (&Skill_local_variable); | |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
3175 defsubr (&Smake_variable_frame_local); |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
3176 defsubr (&Slocal_variable_p); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
3177 defsubr (&Slocal_variable_if_set_p); |
| 298 | 3178 defsubr (&Saref); |
| 3179 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
|
3180 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
|
3181 defsubr (&Sstring_to_number); |
| 298 | 3182 defsubr (&Seqlsign); |
| 3183 defsubr (&Slss); | |
| 3184 defsubr (&Sgtr); | |
| 3185 defsubr (&Sleq); | |
| 3186 defsubr (&Sgeq); | |
| 3187 defsubr (&Sneq); | |
| 3188 defsubr (&Szerop); | |
| 3189 defsubr (&Splus); | |
| 3190 defsubr (&Sminus); | |
| 3191 defsubr (&Stimes); | |
| 3192 defsubr (&Squo); | |
| 3193 defsubr (&Srem); | |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
3194 defsubr (&Smod); |
| 298 | 3195 defsubr (&Smax); |
| 3196 defsubr (&Smin); | |
| 3197 defsubr (&Slogand); | |
| 3198 defsubr (&Slogior); | |
| 3199 defsubr (&Slogxor); | |
| 3200 defsubr (&Slsh); | |
| 3201 defsubr (&Sash); | |
| 3202 defsubr (&Sadd1); | |
| 3203 defsubr (&Ssub1); | |
| 3204 defsubr (&Slognot); | |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3205 defsubr (&Ssubr_arity); |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3206 |
|
9954
18b408b05189
(syms_of_data): Set Qwholenump as function, not variable.
Karl Heuer <kwzh@gnu.org>
parents:
9895
diff
changeset
|
3207 XSYMBOL (Qwholenump)->function = XSYMBOL (Qnatnump)->function; |
|
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
39575
diff
changeset
|
3208 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3209 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
|
3210 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
|
3211 Vmost_positive_fixnum = make_number (MOST_POSITIVE_FIXNUM); |
|
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
39575
diff
changeset
|
3212 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3213 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
|
3214 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
|
3215 Vmost_negative_fixnum = make_number (MOST_NEGATIVE_FIXNUM); |
| 298 | 3216 } |
| 3217 | |
| 490 | 3218 SIGTYPE |
| 298 | 3219 arith_error (signo) |
| 3220 int signo; | |
| 3221 { | |
|
16150
f388360fb59a
(arith_error) [POSIX_SIGNALS]: Don't reestablish handler.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3222 #if defined(USG) && !defined(POSIX_SIGNALS) |
| 298 | 3223 /* USG systems forget handlers when they are used; |
| 3224 must reestablish each time */ | |
| 3225 signal (signo, arith_error); | |
| 3226 #endif /* USG */ | |
| 3227 #ifdef VMS | |
| 3228 /* VMS systems are like USG. */ | |
| 3229 signal (signo, arith_error); | |
| 3230 #endif /* VMS */ | |
| 3231 #ifdef BSD4_1 | |
| 3232 sigrelse (SIGFPE); | |
| 3233 #else /* not BSD4_1 */ | |
| 638 | 3234 sigsetmask (SIGEMPTYMASK); |
| 298 | 3235 #endif /* not BSD4_1 */ |
| 3236 | |
| 3237 Fsignal (Qarith_error, Qnil); | |
| 3238 } | |
| 3239 | |
| 21514 | 3240 void |
| 298 | 3241 init_data () |
| 3242 { | |
| 3243 /* Don't do this if just dumping out. | |
| 3244 We don't want to call `signal' in this case | |
| 3245 so that we don't have trouble with dumping | |
| 3246 signal-delivering routines in an inconsistent state. */ | |
| 3247 #ifndef CANNOT_DUMP | |
| 3248 if (!initialized) | |
| 3249 return; | |
| 3250 #endif /* CANNOT_DUMP */ | |
| 3251 signal (SIGFPE, arith_error); | |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
3252 |
| 298 | 3253 #ifdef uts |
| 3254 signal (SIGEMT, arith_error); | |
| 3255 #endif /* uts */ | |
| 3256 } |
