~ chicken-core (chicken-5) abd9f27ec1900db8e1d55c5bc5436782fdf2660c
commit abd9f27ec1900db8e1d55c5bc5436782fdf2660c
Author: Evan Hanson <evhan@foldling.org>
AuthorDate: Thu Feb 12 19:20:24 2015 +1300
Commit: Evan Hanson <evhan@foldling.org>
CommitDate: Thu Feb 12 19:20:24 2015 +1300
Rename the foreign module to chicken.foreign
diff --git a/README b/README
index 38e27b9a..1c22a3fe 100644
--- a/README
+++ b/README
@@ -287,6 +287,7 @@
| | |-- chicken.data-structures.import.so
| | |-- chicken.extras.import.so
| | |-- chicken.files.import.so
+ | | |-- chicken.foreign.import.so
| | |-- chicken.lolevel.import.so
| | |-- chicken.irregex.import.so
| | |-- chicken.ports.import.so
@@ -294,7 +295,6 @@
| | |-- chicken.tcp.import.so
| | |-- chicken.utils.import.so
| | |-- csi.import.so
- | | |-- foreign.import.so
| | |-- modules.db
| | |-- setup-api.import.so
| | |-- setup-api.so
diff --git a/c-backend.scm b/c-backend.scm
index 4419430e..6c7d234c 100644
--- a/c-backend.scm
+++ b/c-backend.scm
@@ -38,11 +38,12 @@
;; For "foreign" (aka chicken-ffi-syntax):
foreign-type-declaration)
-(import chicken scheme foreign
+(import chicken scheme
chicken.data-structures
chicken.compiler.core
chicken.compiler.c-platform
- chicken.compiler.support)
+ chicken.compiler.support
+ chicken.foreign)
(include "mini-srfi-1.scm")
diff --git a/chicken-bug.scm b/chicken-bug.scm
index 197f78e3..d6c9c86f 100644
--- a/chicken-bug.scm
+++ b/chicken-bug.scm
@@ -28,6 +28,7 @@
(import chicken.data-structures
chicken.extras
+ chicken.foreign
chicken.posix
chicken.tcp
chicken.utils)
diff --git a/chicken-install.scm b/chicken-install.scm
index 9f7f8b50..9badbb39 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -32,10 +32,10 @@
(import scheme chicken)
(import setup-download setup-api)
- (import foreign)
(import chicken.data-structures
chicken.extras
chicken.files
+ chicken.foreign
chicken.irregex
chicken.ports
chicken.posix
@@ -51,6 +51,7 @@
"chicken.data-structures.import.so"
"chicken.extras.import.so"
"chicken.files.import.so"
+ "chicken.foreign.import.so"
"chicken.irregex.import.so"
"chicken.lolevel.import.so"
"chicken.ports.import.so"
@@ -59,7 +60,6 @@
"chicken.utils.import.so"
"srfi-1.import.so"
"srfi-4.import.so"
- "foreign.import.so"
"csi.import.so"
"types.db"))
diff --git a/chicken-status.scm b/chicken-status.scm
index 62f6c9b2..e6f6c727 100644
--- a/chicken-status.scm
+++ b/chicken-status.scm
@@ -29,11 +29,12 @@
(module main ()
- (import scheme chicken foreign)
+ (import scheme chicken)
(import setup-api)
(import chicken.data-structures
chicken.extras
chicken.files
+ chicken.foreign
chicken.irregex
chicken.ports
chicken.posix)
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index d9181383..555fbfcb 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -31,10 +31,11 @@
(module main ()
- (import scheme chicken foreign)
+ (import scheme chicken)
(import setup-api)
(import chicken.data-structures
chicken.files
+ chicken.foreign
chicken.irregex
chicken.ports
chicken.posix
diff --git a/foreign.import.scm b/chicken.foreign.import.scm
similarity index 90%
rename from foreign.import.scm
rename to chicken.foreign.import.scm
index fa54a6d8..bfee5927 100644
--- a/foreign.import.scm
+++ b/chicken.foreign.import.scm
@@ -1,4 +1,4 @@
-;;;; foreign.import.scm - import library for "foreign" pseudo module
+;;;; chicken.foreign.import.scm - import library for "foreign" pseudo module
;
; Copyright (c) 2008-2015, The CHICKEN Team
; All rights reserved.
@@ -7,11 +7,11 @@
; conditions are met:
;
; Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-; disclaimer.
+; disclaimer.
; Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-; disclaimer in the documentation and/or other materials provided with the distribution.
+; disclaimer in the documentation and/or other materials provided with the distribution.
; Neither the name of the author nor the names of its contributors may be used to endorse or promote
-; products derived from this software without specific prior written permission.
+; products derived from this software without specific prior written permission.
;
; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -25,6 +25,6 @@
(##sys#register-primitive-module
- 'foreign
+ 'chicken.foreign
'()
##sys#chicken-ffi-macro-environment)
diff --git a/core.scm b/core.scm
index 23230902..b4b247ac 100644
--- a/core.scm
+++ b/core.scm
@@ -314,11 +314,12 @@
constant-table immutable-constants inline-table line-number-database-2
line-number-database-size)
-(import chicken scheme foreign
+(import chicken scheme
chicken.compiler.scrutinizer
chicken.compiler.support
chicken.data-structures
- chicken.extras)
+ chicken.extras
+ chicken.foreign)
(define (d arg1 . more)
(when (##sys#fudge 13) ; debug mode?
diff --git a/data-structures.scm b/data-structures.scm
index 37a9ad77..faa448fb 100644
--- a/data-structures.scm
+++ b/data-structures.scm
@@ -42,7 +42,8 @@
any? constantly complement compose
conjoin disjoin each flip identity list-of? o)
-(import scheme chicken foreign)
+(import scheme chicken)
+(import chicken.foreign)
(include "common-declarations.scm")
diff --git a/defaults.make b/defaults.make
index 92808c2c..81f1417e 100644
--- a/defaults.make
+++ b/defaults.make
@@ -268,9 +268,9 @@ CHICKEN_PROGRAM_OPTIONS += $(if $(PROFILE_OBJECTS),-profile)
# import libraries
PRIMITIVE_IMPORT_LIBRARIES = chicken srfi-4
-PRIMITIVE_IMPORT_LIBRARIES += foreign csi
-PRIMITIVE_IMPORT_LIBRARIES += setup-api setup-download
+PRIMITIVE_IMPORT_LIBRARIES += csi setup-api setup-download
POSIX_IMPORT_LIBRARY = posix
+FOREIGN_IMPORT_LIBRARY = foreign
DYNAMIC_IMPORT_LIBRARIES = data-structures extras files irregex lolevel ports tcp utils
# targets
@@ -283,7 +283,9 @@ CHICKEN_INSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)
CHICKEN_UNINSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)
CHICKEN_STATUS_PROGRAM = $(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX)
CHICKEN_BUG_PROGRAM = $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)
-IMPORT_LIBRARIES = $(PRIMITIVE_IMPORT_LIBRARIES) chicken.$(POSIX_IMPORT_LIBRARY) \
+IMPORT_LIBRARIES = $(PRIMITIVE_IMPORT_LIBRARIES) \
+ chicken.$(POSIX_IMPORT_LIBRARY) \
+ chicken.$(FOREIGN_IMPORT_LIBRARY) \
$(foreach lib,$(DYNAMIC_IMPORT_LIBRARIES),chicken.$(lib))
ifdef STATICBUILD
diff --git a/distribution/manifest b/distribution/manifest
index f783792f..879a23ff 100644
--- a/distribution/manifest
+++ b/distribution/manifest
@@ -244,6 +244,8 @@ chicken.extras.import.scm
chicken.extras.import.c
chicken.files.import.scm
chicken.files.import.c
+chicken.foreign.import.scm
+chicken.foreign.import.c
chicken.irregex.import.scm
chicken.irregex.import.c
chicken.lolevel.import.scm
@@ -256,8 +258,6 @@ chicken.tcp.import.scm
chicken.tcp.import.c
chicken.utils.import.scm
chicken.utils.import.c
-foreign.import.scm
-foreign.import.c
srfi-4.import.scm
srfi-4.import.c
csi.import.scm
diff --git a/files.scm b/files.scm
index 2beab6d3..a434d07c 100644
--- a/files.scm
+++ b/files.scm
@@ -60,9 +60,10 @@ EOF
pathname-replace-file pathname-strip-directory
pathname-strip-extension normalize-pathname)
-(import scheme chicken foreign)
+(import scheme chicken)
(import chicken.data-structures
chicken.extras
+ chicken.foreign
chicken.irregex)
(include "common-declarations.scm")
diff --git a/lolevel.scm b/lolevel.scm
index 60b2159f..9b5f252a 100644
--- a/lolevel.scm
+++ b/lolevel.scm
@@ -54,7 +54,8 @@ EOF
record-instance-slot-set! record-instance-type record-instance?
set-procedure-data! tag-pointer tagged-pointer? vector-like?)
-(import scheme chicken foreign)
+(import scheme chicken)
+(import chicken.foreign)
(include "common-declarations.scm")
diff --git a/modules.scm b/modules.scm
index 49f558f7..810c7022 100644
--- a/modules.scm
+++ b/modules.scm
@@ -916,6 +916,7 @@
(##sys#register-module-alias 'data-structures 'chicken.data-structures)
(##sys#register-module-alias 'extras 'chicken.extras)
(##sys#register-module-alias 'files 'chicken.files)
+(##sys#register-module-alias 'foreign 'chicken.foreign)
(##sys#register-module-alias 'irregex 'chicken.irregex)
(##sys#register-module-alias 'lolevel 'chicken.lolevel)
(##sys#register-module-alias 'ports 'chicken.ports)
diff --git a/posixunix.scm b/posixunix.scm
index b613371a..7ad7e3d0 100644
--- a/posixunix.scm
+++ b/posixunix.scm
@@ -86,8 +86,9 @@
terminal-port? terminal-size time->string unsetenv user-information
utc-time->seconds with-input-from-pipe with-output-to-pipe)
-(import scheme chicken foreign)
+(import scheme chicken)
(import chicken.files
+ chicken.foreign
chicken.irregex
chicken.ports)
diff --git a/posixwin.scm b/posixwin.scm
index 834c3f42..dbdd9160 100644
--- a/posixwin.scm
+++ b/posixwin.scm
@@ -711,10 +711,11 @@ EOF
terminal-port? terminal-size time->string unsetenv user-information
utc-time->seconds with-input-from-pipe with-output-to-pipe)
-(import scheme chicken foreign)
+(import scheme chicken)
(import chicken.data-structures
chicken.extras
chicken.files
+ chicken.foreign
chicken.irregex
chicken.ports)
diff --git a/rules.make b/rules.make
index 9aac7379..bdf18862 100644
--- a/rules.make
+++ b/rules.make
@@ -533,7 +533,8 @@ c-platform.c: c-platform.scm mini-srfi-1.scm \
chicken.compiler.core.import.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
- chicken.files.import.scm
+ chicken.files.import.scm \
+ chicken.foreign.import.scm
c-backend.c: c-backend.scm mini-srfi-1.scm \
chicken.compiler.c-platform.import.scm \
chicken.compiler.support.import.scm \
@@ -547,7 +548,8 @@ core.c: core.scm mini-srfi-1.scm \
optimizer.c: optimizer.scm mini-srfi-1.scm \
chicken.compiler.support.import.scm \
chicken.data-structures.import.scm \
- chicken.extras.import.scm
+ chicken.extras.import.scm \
+ chicken.foreign.import.scm
scrutinizer.c: scrutinizer.scm mini-srfi-1.scm \
chicken.compiler.support.import.scm \
chicken.data-structures.import.scm \
@@ -566,6 +568,7 @@ support.c: support.scm mini-srfi-1.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.ports.import.scm
csc.c: csc.scm \
chicken.data-structures.import.scm \
@@ -578,6 +581,7 @@ csi.c: csi.scm \
chicken-bug.c: chicken-bug.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
+ chicken.foreign.import.scm \
chicken.tcp.import.scm \
chicken.utils.import.scm
chicken-profile.c: chicken-profile.scm \
@@ -586,6 +590,7 @@ chicken-status.c: chicken-status.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm \
chicken.posix.import.scm \
@@ -594,6 +599,7 @@ chicken-install.c: chicken-install.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm \
chicken.posix.import.scm \
@@ -603,6 +609,7 @@ chicken-install.c: chicken-install.scm \
chicken-uninstall.c: chicken-uninstall.scm \
chicken.data-structures.import.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm \
chicken.posix.import.scm \
@@ -612,6 +619,7 @@ setup-api.c: setup-api.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm \
chicken.posix.import.scm \
@@ -620,6 +628,7 @@ setup-download.c: setup-download.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm \
chicken.posix.import.scm \
@@ -628,26 +637,35 @@ setup-download.c: setup-download.scm \
setup-api.import.scm
posixunix.c: posixunix.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm
posixwin.c: posixwin.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm
+data-structures.c: data-structures.scm \
+ chicken.foreign.import.scm
extras.c: extras.scm \
chicken.data-structures.import.scm
files.c: files.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
+ chicken.foreign.import.scm \
chicken.irregex.import.scm
+lolevel.c: lolevel.scm \
+ chicken.foreign.import.scm
ports.c: ports.scm \
chicken.extras.import.scm
tcp.c: tcp.scm \
+ chicken.foreign.import.scm \
chicken.ports.import.scm
utils.c: utils.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
chicken.files.import.scm \
+ chicken.foreign.import.scm \
chicken.posix.import.scm \
chicken.irregex.import.scm
diff --git a/setup-api.scm b/setup-api.scm
index ae5bec13..a2f8ca3d 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -65,10 +65,11 @@
shellpath
setup-error-handling)
- (import scheme chicken foreign
+ (import scheme chicken
chicken.data-structures
chicken.extras
chicken.files
+ chicken.foreign
chicken.ports
chicken.posix
chicken.irregex
diff --git a/setup-download.scm b/setup-download.scm
index 6bdf552c..f5f48a14 100644
--- a/setup-download.scm
+++ b/setup-download.scm
@@ -36,11 +36,12 @@
list-extension-versions
temporary-directory)
- (import scheme chicken foreign)
+ (import scheme chicken)
(import setup-api
chicken.data-structures
chicken.extras
chicken.files
+ chicken.foreign
chicken.irregex
chicken.posix
chicken.tcp
diff --git a/support.scm b/support.scm
index d61ff1dd..b56cd477 100644
--- a/support.scm
+++ b/support.scm
@@ -75,10 +75,11 @@
;; in a lot of other places.
number-type unsafe)
-(import chicken scheme foreign
+(import chicken scheme
chicken.data-structures
chicken.extras
chicken.files
+ chicken.foreign
chicken.ports)
(include "tweaks")
diff --git a/tcp.scm b/tcp.scm
index 8c2b9c5a..3c3600cf 100644
--- a/tcp.scm
+++ b/tcp.scm
@@ -143,8 +143,9 @@ EOF
tcp-listener-fileno tcp-port-numbers tcp-buffer-size tcp-read-timeout
tcp-write-timeout tcp-accept-timeout tcp-connect-timeout)
-(import scheme chicken foreign)
-(import chicken.ports)
+(import scheme chicken)
+(import chicken.foreign
+ chicken.ports)
(include "common-declarations.scm")
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 6fed1e9c..e07bdf98 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -43,7 +43,7 @@ for x in setup-api.so setup-api.import.so setup-download.so \
chicken.extras.import.so \
chicken.irregex.import.so \
chicken.tcp.import.so \
- foreign.import.so \
+ chicken.foreign.import.so \
csi.import.so types.db; do
cp ../$x test-repository
done
diff --git a/utils.scm b/utils.scm
index c3bb2827..0689a6bf 100644
--- a/utils.scm
+++ b/utils.scm
@@ -41,10 +41,10 @@
qs)
(import scheme chicken)
-(import foreign)
(import chicken.data-structures
chicken.extras
chicken.files
+ chicken.foreign
chicken.posix
chicken.irregex)
Trap