Mercurial > emacs
view leim/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 | 4e4e25c1fae4 |
children | 438f784b2966 |
line wrap: on
line source
# Makefile for leim subdirectory in GNU Emacs. # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # 2006, 2007, 2008, 2009, 2010 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H14PRO021 # 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/>. # Avoid trouble on systems where the `SHELL' variable might be # inherited from the environment. SHELL = /bin/sh # Here are the things that we expect ../configure to edit. version=@version@ prefix=@prefix@ datarootdir=@datarootdir@ datadir=@datadir@ srcdir=@srcdir@ ns_appresdir=@ns_appresdir@ # Where to install LEIM files. INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim GZIP_PROG = @GZIP_PROG@ # Which Emacs to use to convert TIT files to Emacs Lisp files, # byte-compile Emacs Lisp files, and generate the file leim-list.el. BUILT-EMACS = ../src/emacs buildlisppath=${srcdir}/../lisp # How to run Emacs. RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte # Subdirectories to be made if ${srcdir} is different from the current # directory. SUBDIRS=quail # Files generated from TIT dictionaries for Chinese GB character set. TIT-GB=\ quail/CCDOSPY.elc \ quail/Punct.elc \ quail/QJ.elc \ quail/SW.elc \ quail/TONEPY.elc # Files generated from TIT dictionaries for Chinese BIG5 character set. TIT-BIG5=\ quail/4Corner.elc \ quail/ARRAY30.elc \ quail/ECDICT.elc \ quail/ETZY.elc \ quail/Punct-b5.elc \ quail/PY-b5.elc \ quail/QJ-b5.elc \ quail/ZOZY.elc CHINESE-TIT=${TIT-GB} ${TIT-BIG5} NON-TIT-GB=${srcdir}/quail/py-punct.elc NON-TIT-BIG5=${srcdir}/quail/pypunct-b5.elc CHINESE-NON-TIT=${NON-TIT-GB} ${NON-TIT-BIG5} CHINESE-GB=${TIT-GB} ${NON-TIT-GB} CHINESE-BIG5=${TIT-BIG5} ${NON-TIT-BIG5} JAPANESE=${srcdir}/quail/japanese.elc ${srcdir}/ja-dic/ja-dic.elc KOREAN= ${srcdir}/quail/hangul.elc \ ${srcdir}/quail/hanja.elc \ ${srcdir}/quail/hanja3.elc \ ${srcdir}/quail/hanja-jis.elc \ ${srcdir}/quail/symbol-ksc.elc THAI=${srcdir}/quail/thai.elc VIETNAMESE=${srcdir}/quail/viqr.elc ${srcdir}/quail/vntelex.elc LAO=${srcdir}/quail/lao.elc ${srcdir}/quail/lrt.elc INDIAN=${srcdir}/quail/indian.elc TIBETAN=${srcdir}/quail/tibetan.elc LATIN= ${srcdir}/quail/latin-pre.elc \ ${srcdir}/quail/latin-post.elc \ ${srcdir}/quail/latin-alt.elc \ ${srcdir}/quail/latin-ltx.elc \ ${srcdir}/quail/welsh.elc UNICODE=${srcdir}/quail/sgml-input.elc ${srcdir}/quail/rfc1345.elc \ ${srcdir}/quail/uni-input.elc SLAVIC= \ ${srcdir}/quail/czech.elc \ ${srcdir}/quail/croatian.elc \ ${srcdir}/quail/slovak.elc GREEK=${srcdir}/quail/greek.elc RUSSIAN=${srcdir}/quail/cyrillic.elc ${srcdir}/quail/cyril-jis.elc OTHERS= \ ${srcdir}/quail/arabic.elc \ ${srcdir}/quail/ethiopic.elc \ ${srcdir}/quail/ipa.elc \ ${srcdir}/quail/hebrew.elc \ ${srcdir}/quail/georgian.elc \ ${srcdir}/quail/sisheng.elc MISC= \ quail/tsang-b5.elc \ quail/quick-b5.elc \ quail/tsang-cns.elc \ quail/quick-cns.elc \ quail/PY.elc \ quail/ZIRANMA.elc \ quail/CTLau.elc \ quail/CTLau-b5.elc CHINESE=${CHINESE-GB} ${CHINESE-BIG5} EASTASIA=${CHINESE} ${JAPANESE} ${KOREAN} ASIA=${EASTASIA} ${THAI} ${VIETNAMESE} ${LAO} ${INDIAN} ${TIBETAN} EUROPEAN=${LATIN} ${SLAVIC} ${GREEK} ${RUSSIAN} WORLD=${ASIA} ${EUROPEAN} ${OTHERS} ${MISC} ${UNICODE} TIT-MISC=${CHINESE-TIT} ${MISC} NON-TIT-MISC=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS} .SUFFIXES: .elc .el .el.elc: @echo Compiling $< @${RUN-EMACS} -f batch-byte-compile $< all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD} # To ensure that we can run Emacs. This target is ignored (never # being hit) if a user changes default value of EMACS. ../src/emacs: cd ../src; ${MAKE} ${MFLAGS} emacs ${SUBDIRS}: mkdir $@ touch stamp-subdir TIT-SOURCES= \ ${srcdir}/CXTERM-DIC/4Corner.tit \ ${srcdir}/CXTERM-DIC/ARRAY30.tit \ ${srcdir}/CXTERM-DIC/CCDOSPY.tit \ ${srcdir}/CXTERM-DIC/ECDICT.tit \ ${srcdir}/CXTERM-DIC/ETZY.tit \ ${srcdir}/CXTERM-DIC/PY-b5.tit \ ${srcdir}/CXTERM-DIC/Punct-b5.tit \ ${srcdir}/CXTERM-DIC/Punct.tit \ ${srcdir}/CXTERM-DIC/QJ-b5.tit \ ${srcdir}/CXTERM-DIC/QJ.tit \ ${srcdir}/CXTERM-DIC/SW.tit \ ${srcdir}/CXTERM-DIC/TONEPY.tit \ ${srcdir}/CXTERM-DIC/ZOZY.tit ${CHINESE-TIT:.elc=.el}: changed.tit @true changed.tit: ${TIT-SOURCES} ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ echo "changed" > $@ MISC-SOURCES= \ ${srcdir}/MISC-DIC/CTLau-b5.html \ ${srcdir}/MISC-DIC/CTLau.html \ ${srcdir}/MISC-DIC/cangjie-table.b5 \ ${srcdir}/MISC-DIC/cangjie-table.cns \ ${srcdir}/MISC-DIC/pinyin.map \ ${srcdir}/MISC-DIC/ziranma.cin ${MISC:.elc=.el}: changed.misc @true changed.misc: ${MISC-SOURCES} ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \ echo "changed" > $@ leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el rm -f leim-list.el ${RUN-EMACS} -l ${buildlisppath}/international/quail \ -f batch-byte-compile-if-not-done ${TIT-MISC:.elc=.el} if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ ${RUN-EMACS} -l ${buildlisppath}/international/quail \ --eval "(update-leim-list-file \".\")" ; \ else \ ${RUN-EMACS} -l ${buildlisppath}/international/quail \ --eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \ fi sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done install: all if [ ! -d ${INSTALLDIR} ] ; then \ umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \ else true; fi if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \ rm -f ${INSTALLDIR}/leim-list.el; \ rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/ja-dic ; \ echo "Copying leim files to ${INSTALLDIR} ..." ; \ if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ tar -chf - leim-list.el quail ja-dic \ | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ else \ tar -chf - leim-list.el quail \ | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ cd ${srcdir}; \ tar -chf - quail/* ja-dic \ | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ fi; \ rm -rf ${INSTALLDIR}/CVS ${INSTALLDIR}/*/CVS; \ rm -f ${INSTALLDIR}/.cvsignore ${INSTALLDIR}/*/.cvsignore; \ rm -f ${INSTALLDIR}/.gitignore ${INSTALLDIR}/*/.gitignore; \ rm -f ${INSTALLDIR}/.arch-inventory ${INSTALLDIR}/*/.arch-inventory; \ rm -f ${INSTALLDIR}/\#* ${INSTALLDIR}/*/\#* ; \ rm -f ${INSTALLDIR}/.\#* ${INSTALLDIR}/*/.\#* ; \ rm -f ${INSTALLDIR}/*~ ${INSTALLDIR}/*/*~ ; \ rm -f ${INSTALLDIR}/*.orig ${INSTALLDIR}/*/*.orig ; \ else true; fi -unset CDPATH; \ if [ -n "${GZIP_PROG}" ]; \ then \ echo "Compressing *.el ..." ; \ (cd ${INSTALLDIR}; for f in `find . -name "*.elc" -print`; do \ ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ done) \ else true; fi -chmod -R a+r ${INSTALLDIR} for installuser in $${LOGNAME} $${USERNAME} $${USER} \ `id -un 2> /dev/null`; do \ [ -n "$${installuser}" ] && break ; \ done ; \ find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' if [ "${ns_appresdir}" != "" ]; then \ ( cd ${ns_appresdir} ; \ if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ rm -fr share ) ; \ else true ; fi clean mostlyclean: rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \ leim-list.el changed.tit changed.misc # The following target is needed because the `clean' target only removes # TIT-generated files and doesn't touch compiled Quail packages. But # bootstrapping should not leave non-fresh .elc files behind. bootstrap-clean: clean rm -f ${WORLD} ## FIXME some compiled files go to srcdir, some don't? # cd ${srcdir}; rm -f *.elc */*.elc distclean: clean if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi rm -f Makefile maintainer-clean: distclean bootstrap-clean extraclean: maintainer-clean -rm -f *~ \#* */*~ */\#* .PHONY: check-declare check-declare: $(RUN-EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \ --eval '(check-declare-directory "$(srcdir)")'