From d1c3e99c9f7489c9ba6c7acc7e5bb2e084765cee Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Mon, 22 Oct 2018 19:44:40 -0700 Subject: [PATCH] Eliminate use of 'all arg to cref/generate-constructors. --- src/6001/6001.sf | 8 ++++---- src/compiler/machines/C/compiler.sf | 2 +- src/compiler/machines/i386/compiler.sf | 2 +- src/compiler/machines/svm/compiler.sf | 2 +- src/compiler/machines/x86-64/compiler.sf | 2 +- src/cref/cref.sf | 2 +- src/ffi/compile.scm | 6 +++--- src/runtime/infutl.scm | 3 +-- src/runtime/runtime.sf | 4 +--- src/sf/sf.sf | 2 +- src/sos/compile.scm | 2 +- src/ssp/compile.scm | 2 +- src/star-parser/compile.scm | 2 +- src/win32/win32.sf | 16 ++++++++-------- src/xdoc/compile.scm | 2 +- src/xml/compile.scm | 2 +- 16 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/6001/6001.sf b/src/6001/6001.sf index 1e8e7b389..6c181f0d4 100644 --- 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 48e962269..5503a4e10 100644 --- 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 cf046b4e5..8d73e4d0f 100644 --- 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 140643463..0dc3d58e6 100644 --- 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 f718dbd6d..9cadbd49f 100644 --- 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 abd67e685..653143b99 100644 --- 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 7e6f1aa47..5888afd0b 100644 --- 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 9161e4fe4..6b0ca155b 100644 --- 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)) (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 cafe8e5e8..4c569b2d7 100644 --- 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 bc8157d74..5bb44d62f 100644 --- 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 8f922c7f2..1ebc78585 100644 --- 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 ab0112379..552d788b9 100644 --- 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 81f96a914..c894d763d 100644 --- 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 dad2f89f8..46cac8dd4 100644 --- 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 339401e08..aa6bbbe05 100644 --- 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 dfdc59ae7..93021723b 100644 --- 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 -- 2.25.1