mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 14:50:19 +02:00
Code Activity

Removed configuration option --enable-lang which was recently added.

Browse source
This commit is contained in:
Mikael Djurfeldt 1999-07-28 20:39:34 +00:00
parent 6ca345f321
commit 4725c2983f
13 changed files with 247 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,9 +1,3 @@
1999-07-27 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
* acconfig.h (GUILE_LANG): New configuration variable.
* configure.in: Added option --enable-lang.
1999-07-24 Mikael Djurfeldt <mdj@thalamus.nada.kth.se> 1999-07-24 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
* README, config.guess, config.sub, liconfig, ltmain.sh: Switched * README, config.guess, config.sub, liconfig, ltmain.sh: Switched

2
INSTALL
View file

@ -88,8 +88,6 @@ not support dynamic linking.
This option has no effect on systems that do not support shared This option has no effect on systems that do not support shared
libraries. libraries.
--enable-lang --- Include experimental multilanguage support in libguile.
--disable-shared --- Do not build shared libraries. Normally, Guile --disable-shared --- Do not build shared libraries. Normally, Guile
will build shared libraries if your system supports them. Guile will build shared libraries if your system supports them. Guile
always builds static libraries. always builds static libraries.

3
acconfig.h
View file

@ -95,9 +95,6 @@
the Guile library itself. */ the Guile library itself. */
#undef GUILE_DEBUG #undef GUILE_DEBUG
/* Define this to include experimental multilanguage support. */
#undef GUILE_LANG
/* Define to implement scm_internal_select */ /* Define to implement scm_internal_select */
#undef GUILE_ISELECT #undef GUILE_ISELECT

461
configure vendored
View file

File diff suppressed because it is too large Load diff

7
configure.in
View file

@ -50,13 +50,6 @@ AC_ARG_ENABLE(guile-debug,
AC_DEFINE(GUILE_DEBUG) AC_DEFINE(GUILE_DEBUG)
fi) fi)
AC_ARG_ENABLE(lang,
[ --enable-lang Include multilanguage support (experimental)],
if test "$enable_lang" = y || test "$enable_lang" = yes; then
AC_DEFINE(GUILE_LANG)
LIBOBJS="$LIBOBJS lang.o"
fi)
dnl The --disable-debug used to control these two. But now they are dnl The --disable-debug used to control these two. But now they are
dnl a required part of the distribution. dnl a required part of the distribution.
AC_DEFINE(DEBUG_EXTENSIONS) AC_DEFINE(DEBUG_EXTENSIONS)

6
libguile/Makefile.am
View file

@ -40,7 +40,7 @@ libguile_la_SOURCES = \
evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c \ evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c \
gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c \ gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c \
gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c \ gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c \
ioext.c keywords.c list.c load.c macros.c mallocs.c \ ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c \
modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c \ modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c \
ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c \ ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c \
root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c \ root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c \
@ -65,7 +65,7 @@ BUILT_SOURCES = \
EXTRA_libguile_la_SOURCES = _scm.h \ EXTRA_libguile_la_SOURCES = _scm.h \
strerror.c inet_aton.c putenv.c \ strerror.c inet_aton.c putenv.c \
threads.c alloca.c lang.c \ threads.c alloca.c \
regex-posix.c iselect.c regex-posix.c iselect.c
## This is kind of nasty... there are ".c" files that we don't want to ## This is kind of nasty... there are ".c" files that we don't want to
@ -98,7 +98,7 @@ modinclude_HEADERS = \
strorder.h strports.h struct.h symbols.h tag.h tags.h throw.h \ strorder.h strports.h struct.h symbols.h tag.h tags.h throw.h \
unif.h variable.h vectors.h version.h vports.h weaks.h snarf.h \ unif.h variable.h vectors.h version.h vports.h weaks.h snarf.h \
threads.h coop-defs.h fluids.h iselect.h threads.h coop-defs.h fluids.h iselect.h
## This file is generated at configure time. That is why it is DATA ## This file is generated at configure time. That is why it is DATA
## and not a header -- headers are included in the distribution. ## and not a header -- headers are included in the distribution.
modinclude_DATA = scmconfig.h modinclude_DATA = scmconfig.h

18
libguile/Makefile.in
View file

@ -103,13 +103,13 @@ bin_PROGRAMS = guile
guile_SOURCES = guile.c guile_SOURCES = guile.c
guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c ioext.c keywords.c list.c load.c macros.c mallocs.c modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c srcprop.c stackchk.c stacks.c stime.c strings.c strop.c strorder.c strports.c struct.c symbols.c tag.c throw.c unif.c variable.c vectors.c version.c vports.c weaks.c libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c srcprop.c stackchk.c stacks.c stime.c strings.c strop.c strorder.c strports.c struct.c symbols.c tag.c throw.c unif.c variable.c vectors.c version.c vports.c weaks.c
BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h alist.x arbiters.x async.x backtrace.x boolean.x chars.x continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x evalext.x feature.x filesys.x fluids.x fports.x gc.x gdbint.x gh_data.x gh_eval.x gh_funcs.x gh_init.x gh_io.x gh_list.x gh_predicates.x gsubr.x guardians.x hash.x hashtab.x init.x ioext.x iselect.x keywords.x lang.x list.x load.x macros.x mallocs.x modules.x net_db.x numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x print.x procprop.x procs.x random.x ramap.x read.x regex-posix.x root.x scmsigs.x script.x simpos.x smob.x socket.x sort.x srcprop.x stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x struct.x symbols.x tag.x threads.x throw.x unif.x variable.x vectors.x version.x vports.x weaks.x BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h alist.x arbiters.x async.x backtrace.x boolean.x chars.x continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x evalext.x feature.x filesys.x fluids.x fports.x gc.x gdbint.x gh_data.x gh_eval.x gh_funcs.x gh_init.x gh_io.x gh_list.x gh_predicates.x gsubr.x guardians.x hash.x hashtab.x init.x ioext.x iselect.x keywords.x lang.x list.x load.x macros.x mallocs.x modules.x net_db.x numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x print.x procprop.x procs.x random.x ramap.x read.x regex-posix.x root.x scmsigs.x script.x simpos.x smob.x socket.x sort.x srcprop.x stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x struct.x symbols.x tag.x threads.x throw.x unif.x variable.x vectors.x version.x vports.x weaks.x
EXTRA_libguile_la_SOURCES = _scm.h strerror.c inet_aton.c putenv.c threads.c alloca.c lang.c regex-posix.c iselect.c EXTRA_libguile_la_SOURCES = _scm.h strerror.c inet_aton.c putenv.c threads.c alloca.c regex-posix.c iselect.c
noinst_HEADERS = coop-threads.c coop-threads.h coop.c noinst_HEADERS = coop-threads.c coop-threads.h coop.c
@ -167,13 +167,13 @@ boolean.lo chars.lo continuations.lo debug.lo dynl.lo dynwind.lo eq.lo \
error.lo eval.lo evalext.lo feature.lo filesys.lo fluids.lo fports.lo \ error.lo eval.lo evalext.lo feature.lo filesys.lo fluids.lo fports.lo \
gc.lo gdbint.lo gh_data.lo gh_eval.lo gh_funcs.lo gh_init.lo gh_io.lo \ gc.lo gdbint.lo gh_data.lo gh_eval.lo gh_funcs.lo gh_init.lo gh_io.lo \
gh_list.lo gh_predicates.lo gsubr.lo guardians.lo hash.lo hashtab.lo \ gh_list.lo gh_predicates.lo gsubr.lo guardians.lo hash.lo hashtab.lo \
init.lo ioext.lo keywords.lo list.lo load.lo macros.lo mallocs.lo \ init.lo ioext.lo keywords.lo lang.lo list.lo load.lo macros.lo \
modules.lo net_db.lo numbers.lo objects.lo objprop.lo options.lo \ mallocs.lo modules.lo net_db.lo numbers.lo objects.lo objprop.lo \
pairs.lo ports.lo posix.lo print.lo procprop.lo procs.lo ramap.lo \ options.lo pairs.lo ports.lo posix.lo print.lo procprop.lo procs.lo \
random.lo read.lo root.lo scmsigs.lo script.lo simpos.lo smob.lo \ ramap.lo random.lo read.lo root.lo scmsigs.lo script.lo simpos.lo \
socket.lo sort.lo srcprop.lo stackchk.lo stacks.lo stime.lo strings.lo \ smob.lo socket.lo sort.lo srcprop.lo stackchk.lo stacks.lo stime.lo \
strop.lo strorder.lo strports.lo struct.lo symbols.lo tag.lo throw.lo \ strings.lo strop.lo strorder.lo strports.lo struct.lo symbols.lo tag.lo \
unif.lo variable.lo vectors.lo version.lo vports.lo weaks.lo throw.lo unif.lo variable.lo vectors.lo version.lo vports.lo weaks.lo
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
guile_OBJECTS = guile.o guile_OBJECTS = guile.o

32
libguile/dynwind.c
View file

@ -153,7 +153,6 @@ scm_wind_chain ()
} }
#endif #endif
#ifdef GUILE_LANG
static void static void
scm_swap_bindings (SCM glocs, SCM vals) scm_swap_bindings (SCM glocs, SCM vals)
{ {
@ -167,7 +166,6 @@ scm_swap_bindings (SCM glocs, SCM vals)
vals = SCM_CDR (vals); vals = SCM_CDR (vals);
} }
} }
#endif
void void
scm_dowinds (to, delta) scm_dowinds (to, delta)
@ -195,17 +193,14 @@ scm_dowinds (to, delta)
/* key = #t | symbol | thunk | list of glocs | list of fluids */ /* key = #t | symbol | thunk | list of glocs | list of fluids */
if (SCM_NIMP (wind_key)) if (SCM_NIMP (wind_key))
{ {
#ifdef GUILE_LANG
if (SCM_TYP3 (wind_key) == scm_tc3_cons_gloc) if (SCM_TYP3 (wind_key) == scm_tc3_cons_gloc)
scm_swap_bindings (wind_key, SCM_CDR (wind_elt)); scm_swap_bindings (wind_key, SCM_CDR (wind_elt));
else else if (SCM_TYP3 (wind_key) == scm_tc3_cons)
#endif scm_swap_fluids (wind_key, SCM_CDR (wind_elt));
if (SCM_TYP3 (wind_key) == scm_tc3_cons) else if (SCM_GUARDSP (wind_key))
scm_swap_fluids (wind_key, SCM_CDR (wind_elt)); SCM_BEFORE_GUARD (wind_key) (SCM_GUARD_DATA (wind_key));
else if (SCM_GUARDSP (wind_key)) else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
SCM_BEFORE_GUARD (wind_key) (SCM_GUARD_DATA (wind_key)); scm_apply (wind_key, SCM_EOL, SCM_EOL);
else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
scm_apply (wind_key, SCM_EOL, SCM_EOL);
} }
} }
scm_dynwinds = to; scm_dynwinds = to;
@ -230,17 +225,14 @@ scm_dowinds (to, delta)
wind_key = SCM_CAR (wind_elt); wind_key = SCM_CAR (wind_elt);
if (SCM_NIMP (wind_key)) if (SCM_NIMP (wind_key))
{ {
#ifdef GUILE_LANG
if (SCM_TYP3 (wind_key) == scm_tc3_cons_gloc) if (SCM_TYP3 (wind_key) == scm_tc3_cons_gloc)
scm_swap_bindings (wind_key, from); scm_swap_bindings (wind_key, from);
else else if (SCM_TYP3 (wind_key) == scm_tc3_cons)
#endif scm_swap_fluids_reverse (wind_key, from);
if (SCM_TYP3 (wind_key) == scm_tc3_cons) else if (SCM_GUARDSP (wind_key))
scm_swap_fluids_reverse (wind_key, from); SCM_AFTER_GUARD (wind_key) (SCM_GUARD_DATA (wind_key));
else if (SCM_GUARDSP (wind_key)) else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
SCM_AFTER_GUARD (wind_key) (SCM_GUARD_DATA (wind_key)); scm_apply (from, SCM_EOL, SCM_EOL);
else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
scm_apply (from, SCM_EOL, SCM_EOL);
} }
} }
delta--; delta--;

6
libguile/eval.c
View file

@ -1028,7 +1028,6 @@ scm_m_cont (xorig, env)
return scm_cons (SCM_IM_CONT, SCM_CDR (xorig)); return scm_cons (SCM_IM_CONT, SCM_CDR (xorig));
} }
#ifdef GUILE_LANG
/* Multi-language support */ /* Multi-language support */
SCM scm_nil; SCM scm_nil;
@ -1137,7 +1136,6 @@ scm_m_atbind (SCM xorig, SCM env)
} }
return scm_cons (SCM_IM_BIND, SCM_CDR (xorig)); return scm_cons (SCM_IM_BIND, SCM_CDR (xorig));
} }
#endif /* GUILE_LANG */
/* scm_unmemocopy takes a memoized expression together with its /* scm_unmemocopy takes a memoized expression together with its
@ -2122,7 +2120,6 @@ dispatch:
} }
goto find_method; goto find_method;
} }
#ifdef GUILE_LANG
case (SCM_ISYMNUM (SCM_IM_NIL_COND)): case (SCM_ISYMNUM (SCM_IM_NIL_COND)):
proc = SCM_CDR (x); proc = SCM_CDR (x);
@ -2217,7 +2214,6 @@ dispatch:
RETURN (proc) RETURN (proc)
#endif /* GUILE_LANG */
default: default:
goto badfun; goto badfun;
} }
@ -3637,14 +3633,12 @@ scm_init_eval ()
scm_i_unquote = SCM_CAR (scm_sysintern ("unquote", SCM_UNDEFINED)); scm_i_unquote = SCM_CAR (scm_sysintern ("unquote", SCM_UNDEFINED));
scm_i_uq_splicing = SCM_CAR (scm_sysintern ("unquote-splicing", SCM_UNDEFINED)); scm_i_uq_splicing = SCM_CAR (scm_sysintern ("unquote-splicing", SCM_UNDEFINED));
#ifdef GUILE_LANG
scm_nil = scm_sysintern ("nil", SCM_UNDEFINED); scm_nil = scm_sysintern ("nil", SCM_UNDEFINED);
SCM_SETCDR (scm_nil, SCM_CAR (scm_nil)); SCM_SETCDR (scm_nil, SCM_CAR (scm_nil));
scm_nil = SCM_CAR (scm_nil); scm_nil = SCM_CAR (scm_nil);
scm_t = scm_sysintern ("t", SCM_UNDEFINED); scm_t = scm_sysintern ("t", SCM_UNDEFINED);
SCM_SETCDR (scm_t, SCM_CAR (scm_t)); SCM_SETCDR (scm_t, SCM_CAR (scm_t));
scm_t = SCM_CAR (scm_t); scm_t = SCM_CAR (scm_t);
#endif /* GUILE_LANG */
/* acros */ /* acros */
/* end of acros */ /* end of acros */

4
libguile/init.c
View file

@ -76,9 +76,7 @@
#endif #endif
#include "ioext.h" #include "ioext.h"
#include "keywords.h" #include "keywords.h"
#ifdef GUILE_LANG
#include "lang.h" #include "lang.h"
#endif
#include "list.h" #include "list.h"
#include "load.h" #include "load.h"
#include "macros.h" #include "macros.h"
@ -527,9 +525,7 @@ scm_boot_guile_1 (base, closure)
scm_init_load_path (); scm_init_load_path ();
scm_init_standard_ports (); scm_init_standard_ports ();
scm_init_dynamic_linking (); scm_init_dynamic_linking ();
#ifdef GUILE_LANG
scm_init_lang (); scm_init_lang ();
#endif
scm_init_script (); scm_init_script ();
initialized = 1; initialized = 1;
} }

2
libguile/print.c
View file

@ -99,7 +99,6 @@ char *scm_isymnames[] =
"#@dispatch", "#@dispatch",
"#@hash-dispatch", "#@hash-dispatch",
#ifdef GUILE_LANG
/* Multi-language support */ /* Multi-language support */
"#@nil-cond", "#@nil-cond",
@ -109,7 +108,6 @@ char *scm_isymnames[] =
"#@0-ify", "#@0-ify",
"#@1-ify", "#@1-ify",
"#@bind" "#@bind"
#endif /* GUILE_LANG */
}; };
scm_option scm_print_opts[] = { scm_option scm_print_opts[] = {

3
libguile/scmconfig.h.in
View file

@ -119,9 +119,6 @@
the Guile library itself. */ the Guile library itself. */
#undef GUILE_DEBUG #undef GUILE_DEBUG
/* Define this to include experimental multilanguage support. */
#undef GUILE_LANG
/* Define to implement scm_internal_select */ /* Define to implement scm_internal_select */
#undef GUILE_ISELECT #undef GUILE_ISELECT

2
libguile/tags.h
View file

@ -472,7 +472,6 @@ enum scm_tags
#define SCM_IM_DISPATCH SCM_MAKISYM(22) #define SCM_IM_DISPATCH SCM_MAKISYM(22)
#define SCM_IM_HASH_DISPATCH SCM_MAKISYM(23) #define SCM_IM_HASH_DISPATCH SCM_MAKISYM(23)
#ifdef GUILE_LANG
/* Multi-language support */ /* Multi-language support */
#define SCM_IM_NIL_COND SCM_MAKISYM(24) #define SCM_IM_NIL_COND SCM_MAKISYM(24)
@ -482,7 +481,6 @@ enum scm_tags
#define SCM_IM_0_IFY SCM_MAKISYM(28) #define SCM_IM_0_IFY SCM_MAKISYM(28)
#define SCM_IM_1_IFY SCM_MAKISYM(29) #define SCM_IM_1_IFY SCM_MAKISYM(29)
#define SCM_IM_BIND SCM_MAKISYM(30) #define SCM_IM_BIND SCM_MAKISYM(30)
#endif
#define SCM_UNBNDP(x) (SCM_UNDEFINED==(x)) #define SCM_UNBNDP(x) (SCM_UNDEFINED==(x))