author | Camm Maguire <camm@debian.org> | 2014年10月23日 17:20:50 -0400 |
---|---|---|
committer | Camm Maguire <camm@debian.org> | 2014年10月23日 17:20:50 -0400 |
commit | 2b9a8ba5d6446e1ed325d560010ba31044bb1626 (patch) | |
tree | 65e5e785d0025a502a1b645737b33f6be87a40dd | |
parent | 3845085600866ddf12e58441eb51e10981aeefa5 (diff) | |
download | gcl-2b9a8ba5d6446e1ed325d560010ba31044bb1626.tar.gz |
-rwxr-xr-x | gcl/configure | 3 | ||||
-rw-r--r-- | gcl/configure.in | 1 | ||||
-rwxr-xr-x | gcl/h/att_ext.h | 6 | ||||
-rwxr-xr-x | gcl/h/notcomp.h | 3 | ||||
-rwxr-xr-x | gcl/o/array.c | 2 | ||||
-rwxr-xr-x | gcl/o/package.d | 5 | ||||
-rwxr-xr-x | gcl/o/typespec.c | 3 |
diff --git a/gcl/configure b/gcl/configure index 6ea12fb8c..00a24b696 100755 --- a/gcl/configure +++ b/gcl/configure @@ -7569,9 +7569,6 @@ fi if test "$enable_ansi" = "yes" ; then SYSTEM=ansi_gcl - -$as_echo "#define ANSI_COMMON_LISP 1" >>confdefs.h - CLSTANDARD=ANSI else SYSTEM=gcl diff --git a/gcl/configure.in b/gcl/configure.in index 855ae25f0..3c2a2b363 100644 --- a/gcl/configure.in +++ b/gcl/configure.in @@ -2112,7 +2112,6 @@ AC_ARG_ENABLE(ansi,[--enable-ansi builds a large gcl aiming for ansi compliance, if test "$enable_ansi" = "yes" ; then SYSTEM=ansi_gcl - AC_DEFINE(ANSI_COMMON_LISP,1,[compile ansi compliant image]) CLSTANDARD=ANSI else SYSTEM=gcl diff --git a/gcl/h/att_ext.h b/gcl/h/att_ext.h index 6f194eda7..f87bd9be7 100755 --- a/gcl/h/att_ext.h +++ b/gcl/h/att_ext.h @@ -359,9 +359,6 @@ object shift_integer(); /* package.d */ EXTER object lisp_package; EXTER object user_package; -#ifdef ANSI_COMMON_LISP -EXTER object common_lisp_package; -#endif EXTER object keyword_package; EXTER object system_package; EXTER object sLApackageA; @@ -572,8 +569,6 @@ EXTER object sLlong_float,sLhash_table,sLstructure,sLboolean; EXTER object sLdivision_by_zero,sLfloating_point_inexact,sLfloating_point_invalid_operation; EXTER object sLfloating_point_overflow,sLfloating_point_underflow; -/* #ifdef ANSI_COMMON_LISP */ -/* new ansi types */ EXTER object sLarithmetic_error,sLbase_char,sLbase_string,sLbroadcast_stream,sLbuilt_in_class; EXTER object sLcell_error,sLclass,sLconcatenated_stream,sLcondition,sLcontrol_error; EXTER object sLecho_stream,sLend_of_file,sLerror,sLextended_char,sLfile_error,sLfile_stream; @@ -584,7 +579,6 @@ EXTER object sLstandard_generic_function,sLstandard_method,sLstandard_object,sLs EXTER object sLstream_error,sLstring_stream,sLstructure_class,sLstyle_warning,sLsynonym_stream; EXTER object sLtwo_way_stream,sLtype_error,sLunbound_slot,sLunbound_variable,sLundefined_function,sLwarning; EXTER object sLmethod_combination,sLstructure_object; -/* #endif */ EXTER object sLsatisfies; EXTER object sLmember; diff --git a/gcl/h/notcomp.h b/gcl/h/notcomp.h index 50cdc2a6d..de5697146 100755 --- a/gcl/h/notcomp.h +++ b/gcl/h/notcomp.h @@ -22,9 +22,6 @@ void segmentation_catcher(); EXTER int gc_enabled, saving_system; EXTER object lisp_package,user_package; -#ifdef ANSI_COMMON_LISP -EXTER object common_lisp_package; -#endif EXTER char *core_end; EXTER int catch_fatal; EXTER long real_maxpage; diff --git a/gcl/o/array.c b/gcl/o/array.c index b6fc1bf9f..bc44f9d7c 100755 --- a/gcl/o/array.c +++ b/gcl/o/array.c @@ -463,7 +463,7 @@ static struct { char * dflt; object *namep;} aet_types[] = {(char *) &DFLT_aet_sf, &sLshort_float,}, /* short-float */ {(char *) &DFLT_aet_lf, &sLlong_float,}, /* long-float */ {(char *) &DFLT_aet_char,&sSsigned_char,}, /* signed char */ - {(char *) &DFLT_aet_char,&sSunsigned_char,}, /* unsigned char */ + {(char *) &DFLT_aet_char,&sSunsigned_char,}, /* unsigned char */ {(char *) &DFLT_aet_short,&sSsigned_short,}, /* signed short */ {(char *) &DFLT_aet_short, &sSunsigned_short}, /* unsigned short */ }; diff --git a/gcl/o/package.d b/gcl/o/package.d index 2533aee14..80b502b02 100755 --- a/gcl/o/package.d +++ b/gcl/o/package.d @@ -1165,11 +1165,6 @@ gcl_init_package() = make_package(make_simple_string("COMMON-LISP-USER"), list(2,make_simple_string("CL-USER"),make_simple_string("USER")), make_cons(lisp_package, Cnil),509,97); -/* #ifdef ANSI_COMMON_LISP */ -/* common_lisp_package */ -/* = make_package(make_simple_string("COMMON-LISP"), */ -/* Cnil, Cnil,47,509); */ -/* #endif */ keyword_package = make_package(make_simple_string("KEYWORD"), Cnil, Cnil,11,509); diff --git a/gcl/o/typespec.c b/gcl/o/typespec.c index 5ca72acd4..1fadadbd4 100755 --- a/gcl/o/typespec.c +++ b/gcl/o/typespec.c @@ -241,8 +241,6 @@ DEF_ORDINARY("UNDEFINED-FUNCTION",sLundefined_function,LISP,""); DEF_ORDINARY("UNBOUND-VARIABLE",sLunbound_variable,LISP,""); DEF_ORDINARY("PACKAGE-ERROR",sLpackage_error,LISP,""); -/* #ifdef ANSI_COMMON_LISP */ -/* New ansi types */ DEF_ORDINARY("METHOD-COMBINATION",sLmethod_combination,LISP,""); DEF_ORDINARY("ARITHMETIC-ERROR",sLarithmetic_error,LISP,""); DEF_ORDINARY("BASE-CHAR",sLbase_char,LISP,""); @@ -287,7 +285,6 @@ DEF_ORDINARY("TWO-WAY-STREAM",sLtwo_way_stream,LISP,""); DEF_ORDINARY("TYPE-ERROR",sLtype_error,LISP,""); DEF_ORDINARY("UNBOUND-SLOT",sLunbound_slot,LISP,""); DEF_ORDINARY("WARNING",sLwarning,LISP,""); -/* #endif */ DEFCONST("CHAR-SIZE",sSchar_size,SI,small_fixnum(CHAR_SIZE),"Size in bits of a character"); DEFCONST("SHORT-SIZE",sSshort_size,SI,small_fixnum(CHAR_SIZE*sizeof(short)),"Size in bits of a short integer"); |