Mercurial > emacs
view oldXMenu/Makefile.in @ 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 | 3879f5eab4e9 |
children | 7a80cd5e5722 |
line wrap: on
line source
## Makefile for oldXMenu ## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology ## Permission to use, copy, modify, and distribute this ## software and its documentation for any purpose and without ## fee is hereby granted, provided that the above copyright ## notice appear in all copies and that both that copyright ## notice and this permission notice appear in supporting ## documentation, and that the name of M.I.T. not be used in ## advertising or publicity pertaining to distribution of the ## software without specific, written prior permission. ## M.I.T. makes no representations about the suitability of ## this software for any purpose. It is provided "as is" ## without express or implied warranty. ## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ## Free Software Foundation, Inc. ## 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/>. ### Commentary: ## To the best of our knowledge, this code was originally based on the ## X11 oldXMenu Makefile, which was automatically generated from the ## X11 oldXMenu Imakefile. There was no explicit copyright information ## in the Imakefile, therefore we have added the same MIT license as ## used by the rest of the oldXMenu code. ### Code: srcdir=@srcdir@ VPATH=@srcdir@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ C_SWITCH_SYSTEM=@c_switch_system@ C_SWITCH_MACHINE=@c_switch_machine@ EXTRA=insque.o CC=@CC@ CFLAGS=@CFLAGS@ CPP=@CPP@ LN_S=@LN_S@ AS = as LD = ld TAGS = etags RM = rm -f MV = mv RANLIB = ranlib # Solaris 2.1 ar doesn't accept the 'l' option. AR = ar cq LS = ls LINTOPTS = -axz LINTLIBFLAG = -C MAKE = make STD_DEFINES = CDEBUGFLAGS = -O RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ tags TAGS make.log OBJS = Activate.o \ AddPane.o \ AddSel.o \ ChgPane.o \ ChgSel.o \ Create.o \ DelPane.o \ DelSel.o \ Destroy.o \ Error.o \ EvHand.o \ FindPane.o \ FindSel.o \ InsPane.o \ InsSel.o \ Internal.o \ Locate.o \ Post.o \ Recomp.o \ SetAEQ.o \ SetFrz.o \ SetPane.o \ SetSel.o \ XDelAssoc.o XLookAssoc.o XCrAssoc.o XDestAssoc.o XMakeAssoc.o all:: libXMenu11.a ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) $(C_SWITCH_X_MACHINE) \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I${srcdir} -I${srcdir}/../src .c.o: $(CC) -c ${ALL_CFLAGS} $< libXMenu11.a: $(OBJS) $(EXTRA) $(RM) $@ $(AR) $@ $(OBJS) $(EXTRA) @echo Do not be alarmed if the following ranlib command @echo fails due to the absence of a ranlib program on your system. -$(RANLIB) $@ || true #If running ranlib fails, probably there is none. #That's ok. So don't stop the build. Activate.o: Activate.c XMenuInt.h XMenu.h X10.h AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h AddSel.o: AddSel.c XMenuInt.h XMenu.h X10.h ChgPane.o: ChgPane.c XMenuInt.h XMenu.h X10.h ChgSel.o: ChgSel.c XMenuInt.h XMenu.h X10.h Create.o: Create.c XMenuInt.h XMenu.h X10.h DelPane.o: DelPane.c XMenuInt.h XMenu.h X10.h DelSel.o: DelSel.c XMenuInt.h XMenu.h X10.h Destroy.o: Destroy.c XMenuInt.h XMenu.h X10.h Error.o: Error.c XMenuInt.h XMenu.h X10.h EvHand.o: EvHand.c XMenuInt.h XMenu.h X10.h FindPane.o: FindPane.c XMenuInt.h XMenu.h X10.h FindSel.o: FindSel.c XMenuInt.h XMenu.h X10.h InsPane.o: InsPane.c XMenuInt.h XMenu.h X10.h InsSel.o: InsSel.c XMenuInt.h XMenu.h X10.h Internal.o: Internal.c XMenuInt.h XMenu.h X10.h Locate.o: Locate.c XMenuInt.h XMenu.h X10.h Post.o: Post.c XMenuInt.h XMenu.h X10.h Recomp.o: Recomp.c XMenuInt.h XMenu.h X10.h SetAEQ.o: SetAEQ.c XMenuInt.h XMenu.h X10.h SetFrz.o: SetFrz.c XMenuInt.h XMenu.h X10.h SetPane.o: SetPane.c XMenuInt.h XMenu.h X10.h SetSel.o: SetSel.c XMenuInt.h XMenu.h X10.h XDelAssoc.o: XDelAssoc.c X10.h XLookAssoc.o: XLookAssoc.c X10.h XCrAssoc.o: XCrAssoc.c X10.h XDestAssoc.o: XDestAssoc.c X10.h XMakeAssoc.o: XMakeAssoc.c X10.h insque.o: insque.c FRC.mostlyclean: mostlyclean: FRC.mostlyclean rm -f libXMenu11.a ${OBJS} ${EXTRA} clean: mostlyclean distclean: clean rm -f Makefile maintainer-clean: distclean tags:: $(TAGS) -t *.[ch]