Mercurial > hg > xemacs-beta
annotate src/frameslots.h @ 5908:6174848f3e6c
Use parse_integer() in read_atom(); support bases with ratios like integers
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (init_errors_once_early):
Move the Qunsupported_type here from numbers.c, so it's available
when the majority of our types are not supported.
* general-slots.h: Add it here, too.
* number.c: Remove the definition of Qunsupported_type from here.
* lread.c (read_atom):
Check if the first character could reflect a rational, if so, call
parse_integer(), don't check the syntax of the other
characters. This allows us to accept the non-ASCII digit
characters too.
If that worked partially, but not completely, and the next char is
a slash, try to parse as a ratio.
If that fails, try isfloat_string(), but only if the first
character could plausibly be part of a float.
Otherwise, treat as a symbol.
* lread.c (read_rational):
Rename from read_integer. Handle ratios with the same radix
specification as was used for integers.
* lread.c (read1):
Rename read_integer in this function. Support the Common Lisp
#NNNrMMM syntax for parsing a number MMM of arbitrary radix NNN.
man/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Numbers):
Describe the newly-supported arbitrary-base syntax for rationals
(integers and ratios). Describe that ratios can take the same base
specification as integers, something also new.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
Check the arbitrary-base integer reader syntax support, just
added. Check the reader base support for ratios, just added.
Check the non-ASCII-digit support in the reader, just added.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 09 May 2015 00:40:57 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Definitions of marked slots in frames |
| 2 Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 1346 | 3 Copyright (C) 1996, 2002, 2003 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1346
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 8 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1346
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1346
diff
changeset
|
10 option) any later version. |
| 428 | 11 |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1346
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 19 |
| 20 /* Synched up with: FSF 19.30. Split out of frame.h. */ | |
| 21 | |
| 617 | 22 /* We define the Lisp_Objects in the frame structure in a separate file |
| 23 because there are numerous places we want to iterate over them, such | |
| 24 as when defining them in the structure, initializing them, or marking | |
| 25 them. | |
| 26 | |
| 27 To use, define MARKED_SLOT before including this file. In the structure | |
| 28 definition, you also need to define FRAME_SLOT_DECLARATION. No need to | |
| 29 undefine either value; that happens automatically. */ | |
| 30 | |
| 1204 | 31 #ifndef MARKED_SLOT_ARRAY |
| 428 | 32 #ifdef FRAME_SLOT_DECLARATION |
| 33 #define MARKED_SLOT_ARRAY(slot, size) MARKED_SLOT(slot[size]) | |
| 34 #else | |
| 35 #define MARKED_SLOT_ARRAY(slot, size) do { \ | |
| 36 int mslotidx; \ | |
| 37 for (mslotidx = 0; mslotidx < size; mslotidx++) \ | |
| 38 { \ | |
| 1204 | 39 MARKED_SLOT (slot[mslotidx]) \ |
| 428 | 40 } \ |
| 41 } while (0); | |
| 42 #endif | |
| 1204 | 43 #endif /* not MARKED_SLOT_ARRAY */ |
| 428 | 44 |
| 45 /* device frame belongs to. */ | |
| 1204 | 46 MARKED_SLOT (device) |
| 428 | 47 |
| 48 /* Name of this frame: a Lisp string. | |
| 49 NOT the same as the frame's title, even though FSF bogusly | |
| 50 confuses the two. The frame's name is used for resourcing | |
| 51 and lookup purposes and is something you can count on having | |
| 52 a specific value, while the frame's title may vary depending | |
| 53 on the user's choice of `frame-title-format'. */ | |
| 1204 | 54 MARKED_SLOT (name) |
| 428 | 55 |
| 56 /* The frame which should receive keystrokes that occur in this | |
| 57 frame, or nil if they should go to the frame itself. This is | |
| 58 usually nil, but if the frame is minibufferless, we can use this | |
| 59 to redirect keystrokes to a surrogate minibuffer frame when | |
| 60 needed. | |
| 61 | |
| 62 Note that a value of nil is different than having the field point | |
| 63 to the frame itself. Whenever the Fselect_frame function is used | |
| 64 to shift from one frame to the other, any redirections to the | |
| 65 original frame are shifted to the newly selected frame; if | |
| 66 focus_frame is nil, Fselect_frame will leave it alone. */ | |
| 1204 | 67 MARKED_SLOT (focus_frame) |
| 428 | 68 |
| 69 /* This frame's root window. Every frame has one. | |
| 70 If the frame has only a minibuffer window, this is it. | |
| 71 Otherwise, if the frame has a minibuffer window, this is its sibling. */ | |
| 1204 | 72 MARKED_SLOT (root_window) |
| 428 | 73 |
| 74 /* This frame's selected window. | |
| 75 Each frame has its own window hierarchy | |
| 76 and one of the windows in it is selected within the frame. | |
| 77 The selected window of the selected frame is Emacs's selected window. */ | |
| 1204 | 78 MARKED_SLOT (selected_window) |
| 428 | 79 |
| 80 /* This frame's minibuffer window. | |
| 81 Most frames have their own minibuffer windows, | |
| 82 but only the selected frame's minibuffer window | |
| 83 can actually appear to exist. */ | |
| 1204 | 84 MARKED_SLOT (minibuffer_window) |
| 428 | 85 |
| 86 /* The most recently selected nonminibuf window. | |
| 87 This is used by things like the toolbar code, which doesn't | |
| 88 want the toolbar to change when moving to the minibuffer. | |
| 89 This will only be a minibuf window if we are a minibuf-only | |
| 90 frame. */ | |
| 1204 | 91 MARKED_SLOT (last_nonminibuf_window) |
| 428 | 92 |
| 617 | 93 /* This frame's root window mirror. This structure exactly mirrors |
| 94 the frame's window structure but contains only pointers to the | |
| 95 display structures. */ | |
| 1204 | 96 MARKED_SLOT (root_mirror) |
| 617 | 97 |
| 428 | 98 /* frame property list */ |
| 1204 | 99 MARKED_SLOT (plist) |
| 428 | 100 |
| 442 | 101 /* buffer_alist at last redisplay. */ |
| 1204 | 102 MARKED_SLOT (old_buffer_alist) |
| 442 | 103 |
| 428 | 104 /* A copy of the global Vbuffer_list, to maintain a per-frame buffer |
| 105 ordering. The Vbuffer_list variable and the buffer_list slot of each | |
| 106 frame contain exactly the same data, just in different orders. */ | |
| 1204 | 107 MARKED_SLOT (buffer_alist) |
| 428 | 108 |
| 109 /* Predicate for selecting buffers for other-buffer. */ | |
| 1204 | 110 MARKED_SLOT (buffer_predicate) |
| 428 | 111 |
| 112 /* The current mouse pointer for the frame. This is set by calling | |
| 113 `set-frame-pointer'. */ | |
| 1204 | 114 MARKED_SLOT (pointer) |
| 428 | 115 |
| 116 /* The current icon for the frame. */ | |
| 1204 | 117 MARKED_SLOT (icon) |
| 428 | 118 |
| 119 /* specifier values cached in the struct frame: */ | |
| 120 | |
| 121 #ifdef HAVE_MENUBARS | |
| 1204 | 122 MARKED_SLOT (menubar_visible_p) |
| 428 | 123 #endif |
| 124 | |
| 125 #ifdef HAVE_SCROLLBARS | |
| 126 /* Width and height of the scrollbars. */ | |
| 1204 | 127 MARKED_SLOT (scrollbar_width) |
| 128 MARKED_SLOT (scrollbar_height) | |
| 428 | 129 /* Whether the scrollbars are visible */ |
| 1204 | 130 MARKED_SLOT (horizontal_scrollbar_visible_p) |
| 131 MARKED_SLOT (vertical_scrollbar_visible_p) | |
| 428 | 132 /* Scrollbars location */ |
| 1204 | 133 MARKED_SLOT (scrollbar_on_left_p) |
| 134 MARKED_SLOT (scrollbar_on_top_p) | |
| 428 | 135 #endif |
| 136 | |
| 137 #ifdef HAVE_TOOLBARS | |
| 138 /* The following three don't really need to be cached except | |
| 139 that we need to know when they've changed. */ | |
| 1204 | 140 MARKED_SLOT (default_toolbar_width) |
| 141 MARKED_SLOT (default_toolbar_height) | |
| 142 MARKED_SLOT (default_toolbar_visible_p) | |
| 143 MARKED_SLOT (default_toolbar_border_width) | |
| 144 MARKED_SLOT (toolbar_shadow_thickness) | |
| 428 | 145 |
| 146 /* List of toolbar buttons of current toolbars */ | |
| 1204 | 147 MARKED_SLOT_ARRAY (toolbar_buttons, 4) |
| 428 | 148 /* Size of the toolbars. The frame-local toolbar space is |
| 149 subtracted before the windows are arranged. Window and buffer | |
| 150 local toolbars overlay their windows. */ | |
| 1204 | 151 MARKED_SLOT_ARRAY (toolbar_size, 4) |
| 428 | 152 /* Visibility of the toolbars. This acts as a valve for toolbar_size. */ |
| 1204 | 153 MARKED_SLOT_ARRAY (toolbar_visible_p, 4) |
| 428 | 154 /* Thickness of the border around the toolbar. */ |
| 1204 | 155 MARKED_SLOT_ARRAY (toolbar_border_width, 4) |
| 428 | 156 #endif |
| 157 | |
| 442 | 158 /* Cache of subwindow instances for this frame */ |
| 1204 | 159 MARKED_SLOT (subwindow_instance_cache) |
| 442 | 160 |
| 428 | 161 /* Possible frame-local default for outside margin widths. */ |
| 1204 | 162 MARKED_SLOT (left_margin_width) |
| 163 MARKED_SLOT (right_margin_width) | |
| 428 | 164 |
| 165 #undef MARKED_SLOT | |
| 166 #undef MARKED_SLOT_ARRAY | |
| 167 #undef FRAME_SLOT_DECLARATION |