Eliminate use of 'all arg to cref/generate-constructors.

diff --git a/src/6001/6001.sf b/src/6001/6001.sf
index 1e8e7b3897d08531c98ff9d0a5a6e114b1fc9e44..6c181f0d48304ac9602023d25de426bb7ee1d6dc 100644 (file)
--- a/src/6001/6001.sf
+++ b/src/6001/6001.sf
@@ -32,12 +32,12 @@ USA.
 (sf-conditionally "pic-read")
 (sf-conditionally "pic-ops")
 
-(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME))))
+(fluid-let ((sf/default-syntax-table (->environment '(runtime))))
   (sf-conditionally "arith"))
 
-(fluid-let ((sf/default-syntax-table (->environment '(EDWIN))))
+(fluid-let ((sf/default-syntax-table (->environment '(edwin))))
   (sf-conditionally "edextra")
   (sf-conditionally "floppy"))
 
-(load-option 'CREF)
-(cref/generate-constructors "6001" 'ALL)
\ No newline at end of file
+(load-option 'cref)
+(cref/generate-constructors "6001")
\ No newline at end of file

diff --git a/src/compiler/machines/C/compiler.sf b/src/compiler/machines/C/compiler.sf
index 48e962269ce79ddcf80c539758ce81d8185d81d2..5503a4e107f1efe595103d448f0379f3d9fb5311 100644 (file)
--- a/src/compiler/machines/C/compiler.sf
+++ b/src/compiler/machines/C/compiler.sf
@@ -69,4 +69,4 @@ USA.
 ((access syntax-files! (->environment '(compiler))))
 
 ;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler" 'all)
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file

diff --git a/src/compiler/machines/i386/compiler.sf b/src/compiler/machines/i386/compiler.sf
index cf046b4e5cc76f01aa246bf362c5d2cee43e2de7..8d73e4d0f82e7c8eedbe328a0c84e05b3ddfce1c 100644 (file)
--- a/src/compiler/machines/i386/compiler.sf
+++ b/src/compiler/machines/i386/compiler.sf
@@ -78,4 +78,4 @@ USA.
 ((access syntax-files! (->environment '(compiler))))
 
 ;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler" 'all)
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file

diff --git a/src/compiler/machines/svm/compiler.sf b/src/compiler/machines/svm/compiler.sf
index 1406434633ec3ae1e32df1b4ea2a3a2696fbee7a..0dc3d58e62f129048f30b63619f129e8202d414d 100644 (file)
--- a/src/compiler/machines/svm/compiler.sf
+++ b/src/compiler/machines/svm/compiler.sf
@@ -86,4 +86,4 @@ USA.
 (sf-conditionally "machine/make")
 
 ;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler" 'all)
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file

diff --git a/src/compiler/machines/x86-64/compiler.sf b/src/compiler/machines/x86-64/compiler.sf
index f718dbd6d6d72811fe09ae86773de45167ede825..9cadbd49f83fd832474e9ea6a352028f6d3443d9 100644 (file)
--- a/src/compiler/machines/x86-64/compiler.sf
+++ b/src/compiler/machines/x86-64/compiler.sf
@@ -78,4 +78,4 @@ USA.
 ((access syntax-files! (->environment '(compiler))))
 
 ;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler" 'all)
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file

diff --git a/src/cref/cref.sf b/src/cref/cref.sf
index abd67e6859b4aef083921cf4757da432ef831e02..653143b99ab6aaef8c1ee89054ee3db17645bebc 100644 (file)
--- a/src/cref/cref.sf
+++ b/src/cref/cref.sf
@@ -29,4 +29,4 @@ USA.
   (sf-directory "."))
 
 (load-option 'cref)
-(cref/generate-constructors "cref" 'all)
\ No newline at end of file
+(cref/generate-constructors "cref")
\ No newline at end of file

diff --git a/src/ffi/compile.scm b/src/ffi/compile.scm
index 7e6f1aa4723fe06197e099f446c7a7691b71eacb..5888afd0b7f4e43b4f307170f5149def83b50805 100644 (file)
--- a/src/ffi/compile.scm
+++ b/src/ffi/compile.scm
@@ -2,10 +2,10 @@
 
 ;;;; Compile the C/FFI.
 
-(load-option 'CREF)
+(load-option 'cref)
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
     (for-each (lambda (file)
-               (compile-file file '() (->environment '(RUNTIME))))
+               (compile-file file '() (->environment '(runtime))))
              '("ctypes" "cdecls" "syntax" "generator" "build"))
-    (cref/generate-constructors "ffi" 'ALL)))
\ No newline at end of file
+    (cref/generate-constructors "ffi")))
\ No newline at end of file

diff --git a/src/runtime/infutl.scm b/src/runtime/infutl.scm
index 9161e4fe4e30208aaf85176a6d34fed66b664368..6b0ca155bf6f055d2ed37ecaa8bdeb568f0fc286 100644 (file)
--- a/src/runtime/infutl.scm
+++ b/src/runtime/infutl.scm
@@ -27,8 +27,7 @@ USA.
 ;;;; Compiled Code Information: Utilities
 ;;; package: (runtime compiler-info)
 
-(declare (usual-integrations)
-        (integrate-external "infstr"))
+(declare (usual-integrations))
 \f
 (define (compiled-code-block/dbg-info block demand-load?)
   (let ((wrapper (compiled-code-block/debugging-wrapper block)))

diff --git a/src/runtime/runtime.sf b/src/runtime/runtime.sf
index cafe8e5e83a424d4739256e5f3f12957166b20dd..4c569b2d7c3685bbdccd890108068a4962ef4888 100644 (file)
--- a/src/runtime/runtime.sf
+++ b/src/runtime/runtime.sf
@@ -26,12 +26,10 @@ USA.
 
 (load-option '*parser)                 ;for url.scm
 (fluid-let ((sf/default-syntax-table (->environment '(runtime))))
-  (sf-conditionally "graphics")
-  (sf-conditionally "infstr")
   (sf-directory "."))
 
 ;; Guarantee that the package modeller is loaded.  load-option ensures
 ;; that when cross-syntaxing the cref `native' to the running system
 ;; is loaded.
 (load-option 'cref)
-(cref/generate-constructors "runtime" 'all)
\ No newline at end of file
+(cref/generate-constructors "runtime")
\ No newline at end of file

diff --git a/src/sf/sf.sf b/src/sf/sf.sf
index bc8157d74dabc489398f3245f2651c22771f2bbf..5bb44d62f24dc8c0b63a9b0ee28e9f4ea252912d 100644 (file)
--- a/src/sf/sf.sf
+++ b/src/sf/sf.sf
@@ -43,4 +43,4 @@ USA.
   (sf-directory "."))
 
 (load-option 'cref)
-(cref/generate-constructors "sf" 'all)
\ No newline at end of file
+(cref/generate-constructors "sf")
\ No newline at end of file

diff --git a/src/sos/compile.scm b/src/sos/compile.scm
index 8f922c7f2e3db0872d8fc18e629dd3c91eb9f0a7..1ebc7858544773c0a5a89e4f7e086d52bb638abd 100644 (file)
--- a/src/sos/compile.scm
+++ b/src/sos/compile.scm
@@ -38,4 +38,4 @@ USA.
     (compile-file "recslot")
     (compile-file "slot")
     (compile-file "tvector")
-    (cref/generate-constructors "sos" 'all)))
\ No newline at end of file
+    (cref/generate-constructors "sos")))
\ No newline at end of file

diff --git a/src/ssp/compile.scm b/src/ssp/compile.scm
index ab01123799c4905d68ce7e9196bc1e6e901716fe..552d788b9fc18dd3c3748cefc0d049cdcd7320a5 100644 (file)
--- a/src/ssp/compile.scm
+++ b/src/ssp/compile.scm
@@ -34,4 +34,4 @@ USA.
                "mod-lisp"
                "xhtml-expander"
                "xmlrpc"))
-    (cref/generate-constructors "ssp" 'all)))
\ No newline at end of file
+    (cref/generate-constructors "ssp")))
\ No newline at end of file

diff --git a/src/star-parser/compile.scm b/src/star-parser/compile.scm
index 81f96a914b4164371a4c207f96dde01c28210698..c894d763d6affc204bc41c6a04e8dd1699b715da 100644 (file)
--- a/src/star-parser/compile.scm
+++ b/src/star-parser/compile.scm
@@ -33,4 +33,4 @@ USA.
              '("matcher"
                "parser"
                "shared"))
-    (cref/generate-constructors "parser" 'all)))
\ No newline at end of file
+    (cref/generate-constructors "parser")))
\ No newline at end of file

diff --git a/src/win32/win32.sf b/src/win32/win32.sf
index dad2f89f89476f4a917b5908853bd7aac86a9bdb..46cac8dd429e51f03bc9552646441487a7976055 100644 (file)
--- a/src/win32/win32.sf
+++ b/src/win32/win32.sf
@@ -24,32 +24,32 @@ USA.
 
 |#
 
-(load-option 'CREF)
+(load-option 'cref)
 
-(if (not (name->package '(WIN32)))
+(if (not (name->package '(win32)))
     (let ((package-set (package-set-pathname "win32")))
       (if (not (file-exists? package-set))
          (cref/generate-trivial-constructor "win32"))
       (construct-packages-from-file (fasload package-set))))
 
-(fluid-let ((sf/default-syntax-table (->environment '(WIN32))))
+(fluid-let ((sf/default-syntax-table (->environment '(win32))))
   (sf-conditionally "ffimacro")
-  (load "ffimacro.bin" '(WIN32 FFI-MACRO))
+  (load "ffimacro.bin" '(win32 ffi-macro))
 
   (sf-conditionally "winuser")
   (sf-conditionally "wingdi")
   (sf-conditionally "wt_user")
   (fluid-let ((sf/default-declarations
-              `((INTEGRATE-EXTERNAL "winuser" "wingdi" "wt_user"))))
+              `((integrate-external "winuser" "wingdi" "wt_user"))))
     (sf-conditionally "win_ffi")
     (sf-conditionally "graphics")
     (sf-conditionally "module"))
   (fluid-let ((sf/default-declarations
-              `((INTEGRATE-EXTERNAL "win_ffi" "wt_user"))))
+              `((integrate-external "win_ffi" "wt_user"))))
     (sf-conditionally "wf_user"))
   (fluid-let ((sf/default-declarations
-              `((INTEGRATE-EXTERNAL "win_ffi"))))
+              `((integrate-external "win_ffi"))))
     (sf-conditionally "dib"))
   (sf-directory "."))
 
-(cref/generate-constructors "win32" 'ALL)
\ No newline at end of file
+(cref/generate-constructors "win32")
\ No newline at end of file

diff --git a/src/xdoc/compile.scm b/src/xdoc/compile.scm
index 339401e089dcbe69ff81a52bab946af9fb83256d..aa6bbbe05d1284348115852c512da2ca23bf8b82 100644 (file)
--- a/src/xdoc/compile.scm
+++ b/src/xdoc/compile.scm
@@ -32,4 +32,4 @@ USA.
     (for-each compile-file
              '("db"
                "xdoc"))
-    (cref/generate-constructors "xdoc" 'all)))
\ No newline at end of file
+    (cref/generate-constructors "xdoc")))
\ No newline at end of file

diff --git a/src/xml/compile.scm b/src/xml/compile.scm
index dfdc59ae771084969ced742f2262eb592eb840b5..93021723b6371f437589f8a7f3dfb297272a9f89 100644 (file)
--- a/src/xml/compile.scm
+++ b/src/xml/compile.scm
@@ -50,4 +50,4 @@ USA.
                    "rdf-struct"
                    "rdf-nt"
                    "turtle"))))
-    (cref/generate-constructors "xml" 'all)))
\ No newline at end of file
+    (cref/generate-constructors "xml")))
\ No newline at end of file