EXT package created containing the original set of symbols (not yet filtered) and re-exported from SYS

contrib/asdf/asdf-ecl.lisp

@@ -442,7 +442,7 @@
                        (and (first l) (register-pre-built-system name))
                        (values-list l)))))
 #+win32 (push '("asd" . si::load-source) si::*load-hooks*)
-(pushnew 'module-provide-asdf ext:*module-provider-functions*)
+(pushnew 'module-provide-asdf si:*module-provider-functions*)
 (pushnew (translate-logical-pathname "SYS:") *central-registry*)
 
 (provide 'asdf)

contrib/asdf/asdf.lisp

@@ -569,7 +569,7 @@ pathnames."
   #+allegro (sys:getenv x)
   #+clozure (ccl:getenv x)
   #+(or cmu scl) (cdr (assoc x ext:*environment-list* :test #'string=))
-  #+ecl (si:getenv x)
+  #+ecl (ext:getenv x)
   #+gcl (system:getenv x)
   #+genera nil
   #+lispworks (lispworks:environment-variable x)
@@ -2454,7 +2454,7 @@ output to *VERBOSE-OUT*.  Returns the shell's exit code."
                                  :wait t)))
 
     #+ecl ;; courtesy of Juan Jose Garcia Ripoll
-    (si:system command)
+    (ext:system command)
 
     #+gcl
     (lisp:system command)

contrib/bytecmp/bytecmp.lsp

@@ -68,7 +68,7 @@
          and ext:*bytecodes-compiler* = t
          for form = (read sin nil :EOF)
          until (eq form :EOF)
-         do (let ((bytecodes (ext:eval-with-env form nil nil nil)))
+         do (let ((bytecodes (si:eval-with-env form nil nil nil)))
               (with-standard-io-syntax
                 (write `(FUNCALL ,bytecodes) :stream sout :circle t
                        :escape t :readably t :pretty nil)

src/c/all_symbols.d

@@ -6,7 +6,7 @@
 
 #define CL_PACKAGE 0
 #define SI_PACKAGE 4
-#define EXT_PACKAGE SI_PACKAGE
+#define EXT_PACKAGE 64
 #define GRAY_PACKAGE 32
 #define KEYWORD_PACKAGE 8
 #define MP_PACKAGE 12
@@ -126,6 +126,8 @@ mangle_name(cl_object output, unsigned char *source, int l)
 		package = make_constant_base_string("cl");
 	else if (package == cl_core.system_package)
 		package = make_constant_base_string("si");
+	else if (package == cl_core.ext_package)
+		package = make_constant_base_string("si");
 	else if (package == cl_core.keyword_package)
 		package = Cnil;
 	else
@@ -180,6 +182,7 @@ make_this_symbol(int i, cl_object s, int code, const char *name,
 	switch (code & ~(int)3) {
 	case CL_PACKAGE: package = cl_core.lisp_package; break;
 	case SI_PACKAGE: package = cl_core.system_package; break;
+	case EXT_PACKAGE: package = cl_core.ext_package; break;
 	case KEYWORD_PACKAGE: package = cl_core.keyword_package; break;
 	case MP_PACKAGE: package = cl_core.mp_package; break;
 #ifdef CLOS
@@ -216,6 +219,8 @@ make_this_symbol(int i, cl_object s, int code, const char *name,
 			cl_import2(s, package);
 		}
 		cl_export2(s, package);
+                if (package == cl_core.ext_package)
+                        cl_export2(s, cl_core.system_package);
 	}
 	if (form) {
 		s->symbol.stype |= stp_special_form;

src/c/cinit.d

@@ -41,9 +41,9 @@ si_safe_eval(cl_narg narg, cl_object form, cl_object env, ...)
                 cl_object err_value;
                 va_list args; va_start(args, env);
                 err_value = va_arg(args, cl_object);
-                return cl_funcall(4, @'si::safe-eval', form, env, err_value);
+                return cl_funcall(4, @'ext::safe-eval', form, env, err_value);
         }
-        return cl_funcall(3, @'si::safe-eval', form, env);
+        return cl_funcall(3, @'ext::safe-eval', form, env);
 }
 
 extern cl_object

src/c/main.d

@@ -332,6 +332,7 @@ struct cl_core_struct cl_core = {
 	Cnil, /* user_package */
 	Cnil, /* keyword_package */
 	Cnil, /* system_package */
+        Cnil, /* ext_package */
 #ifdef CLOS
 	Cnil, /* clos_package */
 # ifdef ECL_CLOS_STREAMS
@@ -503,10 +504,14 @@ cl_boot(int argc, char **argv)
 				 ecl_list1(cl_core.lisp_package));
 	cl_core.keyword_package =
 		ecl_make_package(str_keyword, Cnil, Cnil);
+	cl_core.ext_package =
+		ecl_make_package(str_ext, Cnil,
+				 ecl_list1(cl_core.lisp_package));
 	cl_core.system_package =
 		ecl_make_package(str_si,
-                                 cl_list(3,str_system,str_sys,str_ext),
+                                 cl_list(2,str_system,str_sys),
-				 ecl_list1(cl_core.lisp_package));
+				 cl_list(2,cl_core.ext_package,
+                                         cl_core.lisp_package));
 	cl_core.c_package =
 		ecl_make_package(str_c,
                                  ecl_list1(str_compiler),

src/c/symbols_list.h

@@ -1114,8 +1114,8 @@ cl_symbols[] = {
 {SYS_ "UNQUOTE-NSPLICE", SI_ORDINARY, NULL, -1, OBJNULL},
 {SYS_ "UNQUOTE-SPLICE", SI_ORDINARY, NULL, -1, OBJNULL},
 {SYS_ "ALLOCATE-RAW-INSTANCE", SI_ORDINARY, si_allocate_raw_instance, 3, OBJNULL},
-{SYS_ "ARGC", SI_ORDINARY, si_argc, 0, OBJNULL},
+{EXT_ "ARGC", EXT_ORDINARY, si_argc, 0, OBJNULL},
-{SYS_ "ARGV", SI_ORDINARY, si_argv, 1, OBJNULL},
+{EXT_ "ARGV", EXT_ORDINARY, si_argv, 1, OBJNULL},
 {SYS_ "ASET", SI_ORDINARY, si_aset, -1, OBJNULL},
 {SYS_ "BASE-CHAR-P", SI_ORDINARY, si_base_char_p, 1, OBJNULL},
 {SYS_ "BASE-STRING-P", SI_ORDINARY, si_base_string_p, 1, OBJNULL},
@@ -1128,7 +1128,7 @@ cl_symbols[] = {
 {SYS_ "BIT-ARRAY-OP", SI_ORDINARY, si_bit_array_op, 4, OBJNULL},
 {SYS_ "C-ARGUMENTS-LIMIT", SI_ORDINARY, NULL, -1, MAKE_FIXNUM(C_ARGUMENTS_LIMIT)},
 {SYS_ "CHAR-SET", SI_ORDINARY, si_char_set, 3, OBJNULL},
-{EXT_ "CHDIR", SI_ORDINARY, si_chdir, -1, OBJNULL},
+{EXT_ "CHDIR", EXT_ORDINARY, si_chdir, -1, OBJNULL},
 {SYS_ "CLEAR-COMPILER-PROPERTIES", SI_ORDINARY, cl_identity, 1, OBJNULL},
 {SYS_ "COERCE-TO-BASE-STRING", SI_ORDINARY, si_coerce_to_base_string, 1, OBJNULL},
 {SYS_ "COERCE-TO-EXTENDED-STRING", SI_ORDINARY, si_coerce_to_extended_string, 1, OBJNULL},
@@ -1137,7 +1137,7 @@ cl_symbols[] = {
 {SYS_ "COERCE-TO-PACKAGE", SI_ORDINARY, si_coerce_to_package, 1, OBJNULL},
 {SYS_ "COPY-TO-SIMPLE-BASE-STRING", SI_ORDINARY, si_copy_to_simple_base_string, 1, OBJNULL},
 {SYS_ "COMPILED-FUNCTION-BLOCK", SI_ORDINARY, si_compiled_function_block, 1, OBJNULL},
-{SYS_ "COMPILED-FUNCTION-NAME", SI_ORDINARY, si_compiled_function_name, 1, OBJNULL},
+{EXT_ "COMPILED-FUNCTION-NAME", EXT_ORDINARY, si_compiled_function_name, 1, OBJNULL},
 {SYS_ "COPY-STREAM", SI_ORDINARY, si_copy_stream, 1, OBJNULL},
 {SYS_ "DO-READ-SEQUENCE", SI_ORDINARY, si_do_read_sequence, 4, OBJNULL},
 {SYS_ "DO-WRITE-SEQUENCE", SI_ORDINARY, si_do_write_sequence, 4, OBJNULL},
@@ -1145,10 +1145,10 @@ cl_symbols[] = {
 {SYS_ "EVAL-WITH-ENV", SI_ORDINARY, si_eval_with_env, -1, OBJNULL},
 {SYS_ "EXPAND-DEFMACRO", SI_ORDINARY, NULL, -1, OBJNULL},
 {SYS_ "FILE-COLUMN", SI_ORDINARY, si_file_column, 1, OBJNULL},
-{SYS_ "FILE-KIND", SI_ORDINARY, si_file_kind, 2, OBJNULL},
+{EXT_ "FILE-KIND", EXT_ORDINARY, si_file_kind, 2, OBJNULL},
 {SYS_ "FILL-POINTER-SET", SI_ORDINARY, si_fill_pointer_set, 2, OBJNULL},
 {SYS_ "FILE-STREAM-FD", SI_ORDINARY, si_file_stream_fd, 1, OBJNULL},
-{SYS_ "FIXNUMP", SI_ORDINARY, si_fixnump, 1, OBJNULL},
+{EXT_ "FIXNUMP", EXT_ORDINARY, si_fixnump, 1, OBJNULL},
 {SYS_ "FORMAT-ERROR", SI_ORDINARY, NULL, -1, OBJNULL},
 #ifdef ECL_CMU_FORMAT
 {SYS_ "FORMATTER-AUX", SI_ORDINARY, NULL, -1, OBJNULL},
@@ -1163,10 +1163,10 @@ cl_symbols[] = {
 {SYS_ "FUNCTION-BLOCK-NAME", SI_ORDINARY, si_function_block_name, 1, OBJNULL},
 {SYS_ "GET-LIBRARY-PATHNAME", SI_ORDINARY, si_get_library_pathname, 0, OBJNULL},
 {SYS_ "GET-SYSPROP", SI_ORDINARY, si_get_sysprop, 2, OBJNULL},
-{EXT_ "GETENV", SI_ORDINARY, si_getenv, 1, OBJNULL},
+{EXT_ "GETENV", EXT_ORDINARY, si_getenv, 1, OBJNULL},
-{EXT_ "GETCWD", SI_ORDINARY, si_getcwd, -1, OBJNULL},
+{EXT_ "GETCWD", EXT_ORDINARY, si_getcwd, -1, OBJNULL},
-{SYS_ "GETPID", SI_ORDINARY, si_getpid, 0, OBJNULL},
+{EXT_ "GETPID", EXT_ORDINARY, si_getpid, 0, OBJNULL},
-{SYS_ "GETUID", SI_ORDINARY, si_getuid, 0, OBJNULL},
+{EXT_ "GETUID", EXT_ORDINARY, si_getuid, 0, OBJNULL},
 {SYS_ "HASH-SET", SI_ORDINARY, si_hash_set, 3, OBJNULL},
 {SYS_ "HASH-TABLE-ITERATOR", SI_ORDINARY, si_hash_table_iterator, 1, OBJNULL},
 {SYS_ "IHS-BDS", SI_ORDINARY, si_ihs_bds, 1, OBJNULL},
@@ -1190,10 +1190,10 @@ cl_symbols[] = {
 {SYS_ "MEMBER1", SI_ORDINARY, si_member1, 5, OBJNULL},
 {SYS_ "MEMQ", SI_ORDINARY, si_memq, 2, OBJNULL},
 {SYS_ "MKDIR", SI_ORDINARY, si_mkdir, 2, OBJNULL},
-{SYS_ "MKSTEMP", SI_ORDINARY, si_mkstemp, 1, OBJNULL},
+{EXT_ "MKSTEMP", EXT_ORDINARY, si_mkstemp, 1, OBJNULL},
 {SYS_ "RMDIR", SI_ORDINARY, si_rmdir, 1, OBJNULL},
-{EXT_ "MAKE-PIPE", SI_ORDINARY, si_make_pipe, 0, OBJNULL},
+{EXT_ "MAKE-PIPE", EXT_ORDINARY, si_make_pipe, 0, OBJNULL},
-{SYS_ "PACKAGE-LOCK", SI_ORDINARY, si_package_lock, 2, OBJNULL},
+{EXT_ "PACKAGE-LOCK", EXT_ORDINARY, si_package_lock, 2, OBJNULL},
 {SYS_ "PACKAGE-HASH-TABLES", SI_ORDINARY, si_package_hash_tables, 1, OBJNULL},
 {SYS_ "PATHNAME-TRANSLATIONS", SI_ORDINARY, si_pathname_translations, -1, OBJNULL},
 {SYS_ "POINTER", SI_ORDINARY, si_pointer, 1, OBJNULL},
@@ -1210,8 +1210,8 @@ cl_symbols[] = {
 {SYS_ "REM-SYSPROP", SI_ORDINARY, si_rem_sysprop, 2, OBJNULL},
 {SYS_ "REPLACE-ARRAY", SI_ORDINARY, si_replace_array, 2, OBJNULL},
 {SYS_ "ROW-MAJOR-ASET", SI_ORDINARY, si_row_major_aset, 3, OBJNULL},
-{EXT_ "RUN-PROGRAM", SI_ORDINARY, si_run_program, -1, OBJNULL},
+{EXT_ "RUN-PROGRAM", EXT_ORDINARY, si_run_program, -1, OBJNULL},
-{SYS_ "SAFE-EVAL", SI_ORDINARY, si_safe_eval, -1, OBJNULL},
+{EXT_ "SAFE-EVAL", EXT_ORDINARY, si_safe_eval, -1, OBJNULL},
 {SYS_ "SCH-FRS-BASE", SI_ORDINARY, si_sch_frs_base, 2, OBJNULL},
 {SYS_ "SCHAR-SET", SI_ORDINARY, si_char_set, 3, OBJNULL},
 {SYS_ "SHARP-A-READER", SI_ORDINARY, NULL, -1, OBJNULL},
@@ -1219,9 +1219,9 @@ cl_symbols[] = {
 {SYS_ "SELECT-PACKAGE", SI_ORDINARY, si_select_package, 1, OBJNULL},
 {SYS_ "SET-SYMBOL-PLIST", SI_ORDINARY, si_set_symbol_plist, 2, OBJNULL},
 #if defined(HAVE_PUTENV) || defined(HAVE_SETENV)
-{EXT_ "SETENV", SI_ORDINARY, si_setenv, 2, OBJNULL},
+{EXT_ "SETENV", EXT_ORDINARY, si_setenv, 2, OBJNULL},
 #else
-{EXT_ "SETENV", SI_ORDINARY, NULL, -1, OBJNULL},
+{EXT_ "SETENV", EXT_ORDINARY, NULL, -1, OBJNULL},
 #endif
 {SYS_ "SETF-LAMBDA", SI_ORDINARY, NULL, -1, OBJNULL},
 {SYS_ "SETF-METHOD", SI_ORDINARY, NULL, -1, OBJNULL},
@@ -1245,7 +1245,7 @@ cl_symbols[] = {
 {SYS_ "STRUCTUREP", SI_ORDINARY, si_structurep, 1, OBJNULL},
 {SYS_ "SVSET", SI_ORDINARY, si_svset, 3, OBJNULL},
 {SYS_ "SYMBOL-MACRO", SI_ORDINARY, NULL, -1, OBJNULL},
-{SYS_ "SYSTEM", SI_ORDINARY, si_system, 1, OBJNULL},
+{EXT_ "SYSTEM", EXT_ORDINARY, si_system, 1, OBJNULL},
 {SYS_ "TERMINAL-INTERRUPT", SI_ORDINARY, NULL, -1, OBJNULL},
 {SYS_ "TOP-LEVEL", SI_ORDINARY, NULL, -1, OBJNULL},
 {SYS_ "UNIVERSAL-ERROR-HANDLER", SI_ORDINARY, NULL, -1, OBJNULL},
@@ -1291,7 +1291,7 @@ cl_symbols[] = {
 {SYS_ "LOOKUP-HOST-ENTRY", SI_ORDINARY, IF_TCP(si_lookup_host_entry), 1, OBJNULL},
 /* #endif TCP */
 
-{SYS_ "CATCH-SIGNAL", SI_ORDINARY, si_catch_signal, 2, OBJNULL},
+{EXT_ "CATCH-SIGNAL", EXT_ORDINARY, si_catch_signal, 2, OBJNULL},
 
 /* KEYWORD PACKAGE */
 {KEY_ "ADJUSTABLE", KEYWORD, NULL, -1, OBJNULL},
@@ -1512,11 +1512,11 @@ cl_symbols[] = {
 #endif
 
 #ifdef GBC_BOEHM
-{SYS_ "GC", SI_ORDINARY, si_gc, -1, OBJNULL},
+{EXT_ "GC", EXT_ORDINARY, si_gc, -1, OBJNULL},
 {SYS_ "GC-DUMP", SI_ORDINARY, si_gc_dump, 0, OBJNULL},
 {SYS_ "GC-STATS", SI_ORDINARY, si_gc_stats, 1, OBJNULL},
 #else
-{SYS_ "GC", SI_ORDINARY, si_gc, 1, OBJNULL},
+{EXT_ "GC", EXT_ORDINARY, si_gc, 1, OBJNULL},
 {SYS_ "ALLOCATE", SI_ORDINARY, si_allocate, -1, OBJNULL},
 {SYS_ "ALLOCATED-PAGES", SI_ORDINARY, si_allocated_pages, -1, OBJNULL},
 {SYS_ "MAXIMUM-ALLOCATABLE-PAGES", SI_ORDINARY, si_maximum_allocatable_pages, -1, OBJNULL},
@@ -1692,8 +1692,8 @@ cl_symbols[] = {
 #endif
 
 {SYS_ "CL-FIXNUM-BITS", SI_CONSTANT, NULL, -1, MAKE_FIXNUM(FIXNUM_BITS)},
-{EXT_ "CL-FIXNUM", SI_ORDINARY, NULL, -1, NULL},
+{EXT_ "CL-FIXNUM", EXT_ORDINARY, NULL, -1, NULL},
-{EXT_ "CL-INDEX", SI_ORDINARY, NULL, -1, NULL},
+{EXT_ "CL-INDEX", EXT_ORDINARY, NULL, -1, NULL},
 
 {SYS_ "DO-DEFTYPE", SI_ORDINARY, ECL_NAME(si_do_deftype), -1, OBJNULL},
 {SYS_ "CREATE-TYPE-NAME", SI_ORDINARY, NULL, -1, OBJNULL},
@@ -1852,7 +1852,7 @@ cl_symbols[] = {
 
 {SYS_ "+UNICODE-DATABASE+", SI_CONSTANT, NULL, -1, Cnil},
 
-{SYS_ "COPY-FILE", SI_ORDINARY, si_copy_file, 2, OBJNULL},
+{EXT_ "COPY-FILE", EXT_ORDINARY, si_copy_file, 2, OBJNULL},
 
 {EXT_ "FILL-ARRAY-WITH-ELT", EXT_ORDINARY, si_fill_array_with_elt, 4, OBJNULL},
 

src/c/symbols_list2.h

@@ -1114,8 +1114,8 @@ cl_symbols[] = {
 {SYS_ "UNQUOTE-NSPLICE",NULL},
 {SYS_ "UNQUOTE-SPLICE",NULL},
 {SYS_ "ALLOCATE-RAW-INSTANCE","si_allocate_raw_instance"},
-{SYS_ "ARGC","si_argc"},
+{EXT_ "ARGC","si_argc"},
-{SYS_ "ARGV","si_argv"},
+{EXT_ "ARGV","si_argv"},
 {SYS_ "ASET","si_aset"},
 {SYS_ "BASE-CHAR-P","si_base_char_p"},
 {SYS_ "BASE-STRING-P","si_base_string_p"},
@@ -1137,7 +1137,7 @@ cl_symbols[] = {
 {SYS_ "COERCE-TO-PACKAGE","si_coerce_to_package"},
 {SYS_ "COPY-TO-SIMPLE-BASE-STRING","si_copy_to_simple_base_string"},
 {SYS_ "COMPILED-FUNCTION-BLOCK","si_compiled_function_block"},
-{SYS_ "COMPILED-FUNCTION-NAME","si_compiled_function_name"},
+{EXT_ "COMPILED-FUNCTION-NAME","si_compiled_function_name"},
 {SYS_ "COPY-STREAM","si_copy_stream"},
 {SYS_ "DO-READ-SEQUENCE","si_do_read_sequence"},
 {SYS_ "DO-WRITE-SEQUENCE","si_do_write_sequence"},
@@ -1145,10 +1145,10 @@ cl_symbols[] = {
 {SYS_ "EVAL-WITH-ENV","si_eval_with_env"},
 {SYS_ "EXPAND-DEFMACRO",NULL},
 {SYS_ "FILE-COLUMN","si_file_column"},
-{SYS_ "FILE-KIND","si_file_kind"},
+{EXT_ "FILE-KIND","si_file_kind"},
 {SYS_ "FILL-POINTER-SET","si_fill_pointer_set"},
 {SYS_ "FILE-STREAM-FD","si_file_stream_fd"},
-{SYS_ "FIXNUMP","si_fixnump"},
+{EXT_ "FIXNUMP","si_fixnump"},
 {SYS_ "FORMAT-ERROR",NULL},
 #ifdef ECL_CMU_FORMAT
 {SYS_ "FORMATTER-AUX",NULL},
@@ -1165,8 +1165,8 @@ cl_symbols[] = {
 {SYS_ "GET-SYSPROP","si_get_sysprop"},
 {EXT_ "GETENV","si_getenv"},
 {EXT_ "GETCWD","si_getcwd"},
-{SYS_ "GETPID","si_getpid"},
+{EXT_ "GETPID","si_getpid"},
-{SYS_ "GETUID","si_getuid"},
+{EXT_ "GETUID","si_getuid"},
 {SYS_ "HASH-SET","si_hash_set"},
 {SYS_ "HASH-TABLE-ITERATOR","si_hash_table_iterator"},
 {SYS_ "IHS-BDS","si_ihs_bds"},
@@ -1190,10 +1190,10 @@ cl_symbols[] = {
 {SYS_ "MEMBER1","si_member1"},
 {SYS_ "MEMQ","si_memq"},
 {SYS_ "MKDIR","si_mkdir"},
-{SYS_ "MKSTEMP","si_mkstemp"},
+{EXT_ "MKSTEMP","si_mkstemp"},
 {SYS_ "RMDIR","si_rmdir"},
 {EXT_ "MAKE-PIPE","si_make_pipe"},
-{SYS_ "PACKAGE-LOCK","si_package_lock"},
+{EXT_ "PACKAGE-LOCK","si_package_lock"},
 {SYS_ "PACKAGE-HASH-TABLES","si_package_hash_tables"},
 {SYS_ "PATHNAME-TRANSLATIONS","si_pathname_translations"},
 {SYS_ "POINTER","si_pointer"},
@@ -1211,7 +1211,7 @@ cl_symbols[] = {
 {SYS_ "REPLACE-ARRAY","si_replace_array"},
 {SYS_ "ROW-MAJOR-ASET","si_row_major_aset"},
 {EXT_ "RUN-PROGRAM","si_run_program"},
-{SYS_ "SAFE-EVAL","si_safe_eval"},
+{EXT_ "SAFE-EVAL","si_safe_eval"},
 {SYS_ "SCH-FRS-BASE","si_sch_frs_base"},
 {SYS_ "SCHAR-SET","si_char_set"},
 {SYS_ "SHARP-A-READER",NULL},
@@ -1245,7 +1245,7 @@ cl_symbols[] = {
 {SYS_ "STRUCTUREP","si_structurep"},
 {SYS_ "SVSET","si_svset"},
 {SYS_ "SYMBOL-MACRO",NULL},
-{SYS_ "SYSTEM","si_system"},
+{EXT_ "SYSTEM","si_system"},
 {SYS_ "TERMINAL-INTERRUPT",NULL},
 {SYS_ "TOP-LEVEL",NULL},
 {SYS_ "UNIVERSAL-ERROR-HANDLER",NULL},
@@ -1291,7 +1291,7 @@ cl_symbols[] = {
 {SYS_ "LOOKUP-HOST-ENTRY",IF_TCP("si_lookup_host_entry")},
 /* #endif TCP */
 
-{SYS_ "CATCH-SIGNAL","si_catch_signal"},
+{EXT_ "CATCH-SIGNAL","si_catch_signal"},
 
 /* KEYWORD PACKAGE */
 {KEY_ "ADJUSTABLE",NULL},
@@ -1512,11 +1512,11 @@ cl_symbols[] = {
 #endif
 
 #ifdef GBC_BOEHM
-{SYS_ "GC","si_gc"},
+{EXT_ "GC","si_gc"},
 {SYS_ "GC-DUMP","si_gc_dump"},
 {SYS_ "GC-STATS","si_gc_stats"},
 #else
-{SYS_ "GC","si_gc"},
+{EXT_ "GC","si_gc"},
 {SYS_ "ALLOCATE","si_allocate"},
 {SYS_ "ALLOCATED-PAGES","si_allocated_pages"},
 {SYS_ "MAXIMUM-ALLOCATABLE-PAGES","si_maximum_allocatable_pages"},
@@ -1852,7 +1852,7 @@ cl_symbols[] = {
 
 {SYS_ "+UNICODE-DATABASE+",NULL},
 
-{SYS_ "COPY-FILE","si_copy_file"},
+{EXT_ "COPY-FILE","si_copy_file"},
 
 {EXT_ "FILL-ARRAY-WITH-ELT","si_fill_array_with_elt"},
 

src/c/threads/process.d

@@ -653,6 +653,6 @@ init_threads(cl_env_ptr env)
 
         cl_core.global_lock = ecl_make_lock(@'mp::global-lock', 1);
         cl_core.error_lock = ecl_make_lock(@'mp::error-lock', 1);
-        cl_core.package_lock = ecl_make_rwlock(@'si::package-lock');
+        cl_core.package_lock = ecl_make_rwlock(@'ext::package-lock');
 	cl_core.processes = ecl_list1(process);
 }

src/clos/boot.lsp

@@ -186,7 +186,7 @@
   (ensure-up-to-date-instance instance)
   (let* ((class (si:instance-class instance))
 	 (location (slot-definition-location slotd)))
-    (cond ((si:fixnump location)
+    (cond ((ext:fixnump location)
 	   ;; local slot
 	   (si:instance-ref instance (the fixnum location)))
 	  ((consp location)
@@ -200,7 +200,7 @@
   (ensure-up-to-date-instance instance)
   (let* ((class (si:instance-class instance))
 	 (location (slot-definition-location slotd)))
-    (cond ((si:fixnump location)
+    (cond ((ext:fixnump location)
 	   ;; local slot
 	   (si:instance-set instance (the fixnum location) val))
 	  ((consp location)
@@ -226,7 +226,7 @@
 (defmethod slot-makunbound-using-class ((class class) instance slotd)
   (ensure-up-to-date-instance instance)
   (let* ((location (slot-definition-location slotd)))
-    (cond ((si:fixnump location)
+    (cond ((ext:fixnump location)
 	   ;; local slot
 	   (si:sl-makunbound instance (the fixnum location)))
 	  ((consp location)

src/clos/standard.lsp

@@ -450,7 +450,7 @@ because it contains a reference to the undefined class~%  ~A"
 	 (error "~a is not a valid class specifier." class-or-symbol))
 	((find-class class-or-symbol fail))
 	(t
-	 (warn 'ext::simple-style-warning
+	 (warn 'si::simple-style-warning
 	       :format-control "Class ~A has been forward referenced."
 	       :format-arguments (list class-or-symbol))
 	 (ensure-class class-or-symbol

src/clos/streams.lsp

@@ -264,7 +264,7 @@
 ;;;
 
 (defun bug-or-error (stream fun)
-  (declare (ext::c-local))
+  (declare (si::c-local))
   (if (typep stream 'stream)
       (error "The stream ~S has no suitable method for ~S." stream fun)
       (error 'type-error :datum stream :expected-type 'stream)))

src/cmp/cmpbind.lsp

@@ -26,7 +26,7 @@
   (case (var-kind var)
     (CLOSURE
      (let ((var-loc (var-loc var)))
-       (unless (sys:fixnump var-loc)
+       (unless (typep var-loc 'fixnum)
 	 ;; first binding: assign location
 	 (setq var-loc (next-env))
 	 (setf (var-loc var) var-loc))

src/cmp/cmpform.lsp

@@ -93,7 +93,7 @@
        finally (return hash)))
 
 (defun print-c1form (form stream)
-  (format stream "#<form ~A ~X>" (c1form-name form) (ext::pointer form)))
+  (format stream "#<form ~A ~X>" (c1form-name form) (si:pointer form)))
 
 (defun make-c1form (name subform &rest args)
   (let ((form (do-make-c1form :name name :args args

src/cmp/cmpmain.lsp

@@ -905,6 +905,6 @@ from the C language code.  NIL means \"do not create the file\"."
 (defmacro with-compilation-unit (options &rest body)
   `(progn ,@body))
 
-(si::package-lock "CL" t)
+(ext:package-lock "CL" t)
 
 (provide 'cmp)

src/cmp/cmpopt-sequence.lsp

@@ -102,7 +102,7 @@
                          test))))))
 
 #+(or)
-(define-compiler-macro ext::make-seq-iterator (seq &optional (start 0))
+(define-compiler-macro si::make-seq-iterator (seq &optional (start 0))
   (with-clean-symbols (%seq %start)
     `(let ((%seq (optional-type-check ,seq sequence))
            (%start ,start))
@@ -114,7 +114,7 @@
               nil)))))
 
 #+(or)
-(define-compiler-macro ext::seq-iterator-ref (seq iterator)
+(define-compiler-macro si::seq-iterator-ref (seq iterator)
   (with-clean-symbols (%seq %iterator)
     `(let* ((%seq ,seq)
             (%iterator ,iterator))
@@ -126,7 +126,7 @@
            (cons-car (assert-type-if-known %iterator cons))))))
 
 #+(or)
-(define-compiler-macro ext::seq-iterator-next (seq iterator)
+(define-compiler-macro si::seq-iterator-next (seq iterator)
   (with-clean-symbols (%seq %iterator)
     `(let* ((%seq ,seq)
             (%iterator ,iterator))
@@ -148,16 +148,16 @@
                      %iterator)))
       `(let* ((,%sequence ,sequence)
               (,%start ,start)
-              (,%iterator (ext::make-seq-iterator ,%sequence ,%start))
+              (,%iterator (si::make-seq-iterator ,%sequence ,%start))
               (,%counter ,counter))
          (declare (:read-only ,%sequence ,%start ,%counter)
                   (ignorable ,%counter)
                   (fixnum ,%counter))
          (loop
             (unless ,test (return ,output))
-            (let ((,%elt (ext::seq-iterator-ref ,%sequence ,%iterator)))
+            (let ((,%elt (si::seq-iterator-ref ,%sequence ,%iterator)))
               ,@body)
-            (setf ,%iterator (ext::seq-iterator-next ,%sequence ,%iterator)))))))
+            (setf ,%iterator (si::seq-iterator-next ,%sequence ,%iterator)))))))
 
 ;;;
 ;;; MEMBER

src/cmp/cmpos-run.lsp

@@ -15,7 +15,7 @@
 
 (defun safe-system (string)
   (cmpnote "Invoking external command:~%  ~A~%" string)
-  (let ((result (si:system string)))
+  (let ((result (ext:system string)))
     (unless (zerop result)
       (cerror "Continues anyway."
 	      "(SYSTEM ~S) returned non-zero value ~D"

src/cmp/cmppackage.lsp

@@ -12,7 +12,7 @@
 ;;;;  CMPPACKAGE -- Package definitions and exported symbols
 ;;;;
 
-(si::package-lock "CL" nil)
+(ext:package-lock "CL" nil)
 
 (defpackage "C"
   (:nicknames "COMPILER")

src/cmp/cmpwt.lsp

@@ -257,15 +257,15 @@
     (ratio (and (static-constant-expression (numerator object))
 		(static-constant-expression (denominator object))
 		#'static-rational-builder))
-    (single-float (and (not (si:float-nan-p object))
+    (single-float (and (not (ext:float-nan-p object))
-		       (not (si:float-infinity-p object))
+		       (not (ext:float-infinity-p object))
 		       #'static-single-float-builder))
-    (double-float (and (not (si:float-nan-p object))
+    (double-float (and (not (ext:float-nan-p object))
-		       (not (si:float-infinity-p object))
+		       (not (ext:float-infinity-p object))
 		       #'static-double-float-builder))
     #+long-float
-    (long-float (and (not (si:float-nan-p object))
+    (long-float (and (not (ext:float-nan-p object))
-		     (not (si:float-infinity-p object))
+		     (not (ext:float-infinity-p object))
 		     #'static-long-float-builder))
     (complex (and (static-constant-expression (realpart object))
 		  (static-constant-expression (imagpart object))
@@ -314,6 +314,6 @@
 
 (defun vv-type (loc)
   (let ((value (vv-value loc)))
-    (if (and value (not (si::fixnump value)))
+    (if (and value (not (ext:fixnump value)))
         (type-of value)
         t)))

src/cmp/proclamations.lsp

@@ -158,7 +158,7 @@
   'unsigned-byte)
 (deftype time-zone ()
   t)
-(deftype si::instance ()
+(deftype ext:instance ()
   'standard-object)
 
 
@@ -237,9 +237,9 @@
 ;; ECL extensions
 
 (proclamation si:fset (function-name function &optional gen-bool t) function)
-(proclamation si:compiled-function-name (function) (or null function-name))
+(proclamation ext:compiled-function-name (function) (or null function-name))
 (proclamation si:compiled-function-block (function) (or null si::codeblock))
-(proclamation si:compiled-function-file (function) (values t t))
+(proclamation ext:compiled-function-file (function) (values t t))
 
 (proclamation si:ihs-top () si::index)
 (proclamation si:ihs-fun (si::index) (or null function-designator))
@@ -404,7 +404,7 @@
 (proclamation si:select-package (package-designator) package)
 (proclamation si:package-hash-tables (package-designator)
                    (values hash-table hash-table list) :reader)
-(proclamation si:package-lock (package-designator gen-bool) package)
+(proclamation ext:package-lock (package-designator gen-bool) package)
 
 ;;;
 ;;; 12. NUMBERS
@@ -534,7 +534,7 @@
 
 ;; ECL extensions
 (proclamation si:bit-array-op (t t t t) (array bit))
-(proclamation si:fixnump (t) gen-bool :pure)
+(proclamation ext:fixnump (t) gen-bool :pure)
 
 ;; Virtual functions added by the compiler
 (proclamation shift>> (*) nil :pure)
@@ -1015,11 +1015,12 @@
 (proclamation ext:file-kind (pathname-designator gen-bool) symbol)
 (proclamation ext:chdir (pathname-designator &optional gen-bool) pathname)
 (proclamation ext:getcwd (&optional gen-bool) pathname)
-(proclamation ext:mkdir (pathname-designator unsigned-byte) string)
 (proclamation ext:mkstemp (pathname-designator) (or null pathname))
-(proclamation ext:rmdir (pathname-designator) null)
 (proclamation ext:copy-file (pathname-designator pathname-designator) gen-bool)
 
+(proclamation si:mkdir (pathname-designator unsigned-byte) string)
+(proclamation si:rmdir (pathname-designator) null)
+
 
 ;;;
 ;;; 21. STREAMS
@@ -1294,7 +1295,7 @@
 (proclamation si:traced-old-definition (t) t :no-side-effects)
 
 #+clos
-(proclamation si:allocate-raw-instance (t t fixnum) si:instance)
+(proclamation si:allocate-raw-instance (t t fixnum) ext:instance)
 #+clos
 (proclamation si:instance-ref-safe (t fixnum) t)
 #+clos

src/cmp/sysfun.lsp

@@ -794,8 +794,8 @@
 #+long-float
 (def-inline long-float-p :always (t) :bool "@0;ECL_LONG_FLOAT_P(#0)")
 
-(def-inline si:fixnump :always (t) :bool "FIXNUMP(#0)")
+(def-inline ext:fixnump :always (t) :bool "FIXNUMP(#0)")
-(def-inline si:fixnump :always (fixnum) :bool "1")
+(def-inline ext:fixnump :always (fixnum) :bool "1")
 
 (def-inline c::ldb1 :always (fixnum fixnum fixnum) :fixnum
  "((((~((cl_fixnum)-1 << (#0))) << (#1)) & (cl_fixnum)(#2)) >> (#1))")

src/h/external.h

@@ -164,6 +164,7 @@ struct cl_core_struct {
 	cl_object user_package;
 	cl_object keyword_package;
 	cl_object system_package;
+        cl_object ext_package;
 #ifdef CLOS
 	cl_object clos_package;
 # ifdef ECL_CLOS_STREAMS

src/lsp/autoload.lsp

@@ -48,7 +48,7 @@ Gives a global declaration.  See DECLARE for possible DECL-SPECs."
   "Args: (&optional filename)
 Invokes the editor.  The action depends on the version of ECL.  See the ECL
 Report for details."
-  (si:system (format nil "~S ~A" (or (si::getenv "EDITOR") "vi") filename)))
+  (ext:system (format nil "~S ~A" (or (si::getenv "EDITOR") "vi") filename)))
 
 
 ;;; Allocator.

src/lsp/predlib.lsp

@@ -35,8 +35,8 @@ Builds a new function which accepts any number of arguments but always outputs N
 (defvar *upgraded-array-element-type-cache* (si:make-vector t 128 nil nil nil 0))
 
 (defun subtypep-clear-cache ()
-  (si:fill-array-with-elt *subtypep-cache* nil 0 nil)
+  (ext:fill-array-with-elt *subtypep-cache* nil 0 nil)
-  (si:fill-array-with-elt *upgraded-array-element-type-cache* nil 0 nil))
+  (ext:fill-array-with-elt *upgraded-array-element-type-cache* nil 0 nil))
 
 (defun create-type-name (name)
   (when (member name *alien-declarations*)