Mercurial > emacs
view lib-src/b2m.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 # b2m.pl - Script to convert a Babyl file to an mbox file # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. # Maintainer: Jonathan Kamens <jik@kamens.brookline.ma.us> # This program 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. # This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # Requires CPAN modules: MailTools (for Mail::Address), TimeDate (for # Date::Parse). use warnings; use strict; use File::Basename; use Getopt::Long; use Mail::Address; use Date::Parse; my($whoami) = basename $0; my($version) = '$Revision$'; my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file] \tBy default, full headers are printed.\n"; my($opt_help, $opt_version); my($opt_full_headers) = 1; die $usage if (! GetOptions( 'help' => \$opt_help, 'version' => \$opt_version, 'full-headers!' => \$opt_full_headers, )); if ($opt_help) { print $usage; exit; } elsif ($opt_version) { print "$whoami version: $version\n"; exit; } die $usage if (@ARGV > 1); $/ = "\n\037"; if (<> !~ /^BABYL OPTIONS:/) { die "$whoami: $ARGV is not a Babyl file\n$usage"; } while (<>) { my($msg_num) = $. - 1; my($labels, $pruned, $full_header, $header); my($from_line, $from_addr); my($time); # This will strip the initial form feed, any whitespace that may # be following it, and then a newline s/^\s+//; # This will strip the ^_ off of the end of the message s/\037$//; if (! s/(.*)\n//) { malformatted: warn "$whoami: message $msg_num in $ARGV is malformatted\n"; next; } $labels = $1; # Strip the integer indicating whether the header is pruned $labels =~ s/^(\d+)[,\s]*//; $pruned = $1; s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted; $full_header = $1; if (s/((?:.+\n)+)\n+//) { $header = $1; } else { # Message has no body $header = $_; $_ = ''; } # "$pruned eq '0'" is different from "! $pruned". We want to make # sure that we found a valid label line which explicitly indicated # that the header was not pruned. if ((! $full_header) || ($pruned eq '0')) { $full_header = $header; } # End message with two newlines (some mbox parsers require a blank # line before the next "From " line). s/\s+$/\n\n/; # Quote "^From " s/(^|\n)From /$1>From /g; # Strip extra commas and whitespace from the end $labels =~ s/[,\s]+$//; # Now collapse extra commas and whitespace in the remaining label string $labels =~ s/[,\s]+/, /g; foreach my $rmail_header qw(summary-line x-coding-system) { $full_header =~ s/(^|\n)$rmail_header:.*\n/$1/i; } if ($full_header =~ s/(^|\n)mail-from:\s*(From .*)\n/$1/i) { ($from_line = $2) =~ s/\s*$/\n/; } else { foreach my $addr_header qw(return-path from really-from sender) { if ($full_header =~ /(?:^|\n)$addr_header:\s*(.*\n(?:\B.*\n)*)/i) { my($addr) = Mail::Address->parse($1); $from_addr = $addr->address($addr); last; } } if (! $from_addr) { $from_addr = "Babyl_to_mail_by_$whoami\@localhost"; } if ($full_header =~ /(?:^|\n)date:\s*(\S.*\S)/i) { $time = str2time($1); } if (! $time) { # No Date header or we failed to parse it $time = time; } $from_line = "From " . $from_addr . " " . localtime($time) . "\n"; } print($from_line, ($opt_full_headers ? $full_header : $header), ($labels ? "X-Babyl-Labels: $labels\n" : ""), "\n", $_) || die "$whoami: error writing to stdout: $!\n"; } close(STDOUT) || die "$whoami: Error closing stdout: $!\n"; # arch-tag: 8c7c8ab0-721c-46d7-ba3e-139801240aa8