Mercurial > emacs
view doc/lispref/tindex.pl @ 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 |
line wrap: on
line source
#! /usr/bin/perl # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, # 2008, 2009, 2010 Free Software Foundation, Inc. # This file is part of GNU Emacs. # GNU Emacs is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. require 5; use Getopt::Long; my $USAGE = <<ENDUSAGE; Remove \@tindex lines from files that were already present in previous versions. Usage: $0 [--old=EXT] FILE... $0 --help $0 --version --help display this help and exit --version print version and exit --old=DIR find old files in DIR The script performs two passes. In the first pass, Texinfo files from DIR are scanned for \@tindex lines, and identifiers in them are recorded. In a second pass, Texinfo files in the current directory are scanned, and \@tindex lines for identifiers that were recorded in the first pass are removed. Old file contents are saved in files with extension ".orig". A list of modified files and removed \@tindex identifiers is printed to stdout at the end. ENDUSAGE sub fatal { print STDERR "$0: ", @_, ".\n"; exit 1; } my $help = 0; my $version = 0; my $old; my $rc = GetOptions ('help' => \$help, 'version' => \$version, 'old=s' => \$old); if ($version) { print "0.1\n"; exit 0; } elsif (!$rc || !$old || @ARGV) { print $USAGE; exit 1; } elsif ($help) { print $USAGE; exit 0; } # Fill the hash %tindex with associations VAR -> COUNT where # the keys VAR are identifiers mentioned in @tindex lines in the older # files to process and COUNT is the number of times they are seen in # the files. my %tindex; my %removed; my @old_files = glob "$old/*.texi"; my @new_files = glob "*.texi"; fatal ("No Texinfo files found in `$old'") unless @old_files; fatal ("No Texinfo files found in current directory") unless @new_files; print "Scanning old files for \@tindex lines\n"; foreach $file (@old_files) { open (IN, "<$file") or fatal "Cannot open $file: $!"; while (<IN>) { ++$tindex{$1} if /^\s*\@tindex\s+(\S+)/; } close IN; } # Process current files and remove those @tindex lines which we # know were already present in the files scanned above. print "Removing old \@tindex lines\n"; foreach $file (@new_files) { my $modified = 0; my $contents = ""; open (IN, "< $file") or fatal "Cannot open $file.orig for reading: $!"; while (<IN>) { if (/^\s*\@tindex\s+(\S+)/ && $tindex{$1}) { ++$removed{$1}; $modified = 1; } else { $contents = $contents . $_; } } close IN; if ($modified) { print " $file\n"; system ("cp $file $file.orig") == 0 or fatal "Cannot backup $file: $!"; open (OUT, ">$file") or fatal "Cannot open $file for writing: $!"; print OUT $contents; close OUT; } } # Print a list of identifiers removed. print "Removed \@tindex commands for:\n"; my $key; foreach $key (keys %removed) { print " $key\n"; } # arch-tag: f8460df6-6bef-4c98-8555-e2c63a88b0fa