annotate lisp/cdl.el @ 107984:bef5d1738c0b

Make variable forwarding explicit rather the using special values. Basically, this makes the structure of buffer-local values and object forwarding explicit in the type of Lisp_Symbols rather than use special Lisp_Objects for that. This tends to lead to slightly more verbose code, but is more C-like, simpler, and makes it easier to make sure we handled all cases, among other things by letting the compiler help us check it. * lisp.h (enum Lisp_Misc_Type, union Lisp_Misc): Removing forwarding objects. (enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types. (struct Lisp_Symbol): Make the various forms of variable-forwarding explicit rather than hiding them inside Lisp_Object "values". (XFWDTYPE): New macro. (XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine. (XBUFFER_LOCAL_VALUE): Remove. (SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL) (SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros. (SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove. (struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd) (struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd): Remove the Lisp_Misc_* header. (struct Lisp_Buffer_Local_Value): Redefine. (BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros. (struct Lisp_Misc_Any): Add filler to get the right size. (struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct Lisp_Intfwd. (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT) (DEFVAR_KBOARD): Allocate a forwarding object. * data.c (do_blv_forwarding, store_blv_forwarding): New macros. (let_shadows_global_binding_p): New function. (union Lisp_Val_Fwd): New type. (make_blv): New function. (swap_in_symval_forwarding, indirect_variable, do_symval_forwarding) (store_symval_forwarding, swap_in_global_binding, Fboundp) (swap_in_symval_forwarding, find_symbol_value, Fset) (let_shadows_buffer_binding_p, set_internal, default_value) (Fset_default, Fmake_variable_buffer_local, Fmake_local_variable) (Fkill_local_variable, Fmake_variable_frame_local) (Flocal_variable_p, Flocal_variable_if_set_p) (Fvariable_binding_locus): * xdisp.c (select_frame_for_redisplay): * lread.c (Fintern, Funintern, init_obarray, defvar_int) (defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard): * frame.c (store_frame_param): * eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to): * bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol value structure. * buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h. (clone_per_buffer_values): Only adjust markers into the current buffer. (reset_buffer_local_variables): PER_BUFFER_IDX is never -2. (Fbuffer_local_value, set_buffer_internal_1) (swap_out_buffer_local_variables): Adapt to the new symbol value structure. (DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object. (defvar_per_buffer): Take a new arg for the fwd object. (buffer_lisp_local_variables): Return a proper alist (different fix for bug#4138). * alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL. (Fgarbage_collect): Don't handle buffer_defaults specially. (mark_object): Handle new symbol value structure rather than the old special Lisp_Misc_* objects. (gc_sweep) <symbols>: Free also the buffer-local-value objects. * term.c (set_tty_color_mode): * bidi.c (bidi_initialize): Don't access the ->value field directly. * buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with a buffer_local_flags. * print.c (print_object): Get rid of impossible forwarding objects.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 19 Apr 2010 21:50:52 -0400
parents 1d1d5d9bd884
children 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38409
153f1b1f2efd Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 30294
diff changeset
1 ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs
4865
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
74439
ddcbd2c1b70d Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 68651
diff changeset
3 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
4 ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
4865
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
4866
56713fbab9ad entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 4865
diff changeset
6 ;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi)
30294
130f960764fd Fix `Maintainer' keyword.
Gerd Moellmann <gerd@gnu.org>
parents: 21057
diff changeset
7 ;; Maintainer: FSF
4866
56713fbab9ad entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 4865
diff changeset
8 ;; Keywords: data
56713fbab9ad entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 4865
diff changeset
9
4865
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
4865
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
15 ;; (at your option) any later version.
4865
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; GNU General Public License for more details.
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
4865
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24
38412
253f761ad37b Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents: 38409
diff changeset
25 ;;; Commentary:
253f761ad37b Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents: 38409
diff changeset
26
4865
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27 ;;; Code:
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29 (defun cdl-get-file (filename)
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30 "Run file through ncdump and insert result into buffer after point."
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31 (interactive "fCDF file: ")
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32 (message "ncdump in progress...")
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33 (let ((start (point)))
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 (call-process "ncdump" nil t nil (expand-file-name filename))
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35 (goto-char start))
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
36 (message "ncdump in progress...done"))
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 (defun cdl-put-region (filename start end)
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
39 "Run region through ncgen and write results into a file."
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
40 (interactive "FNew CDF file: \nr")
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41 (message "ncgen in progress...")
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 (call-process-region start end "ncgen"
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43 nil nil nil "-o" (expand-file-name filename))
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 (message "ncgen in progress...done"))
4baa7107909b Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
46 (provide 'cdl)
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
47
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79721
diff changeset
48 ;; arch-tag: b8e95a6e-2387-4077-ad9a-af54b09b8615
38409
153f1b1f2efd Emacs lisp coding convention fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 30294
diff changeset
49 ;;; cdl.el ends here