~ chicken-core (chicken-5) 517009e3b9ea5bbb911687c4449987147c461d53
commit 517009e3b9ea5bbb911687c4449987147c461d53
Author: Evan Hanson <evhan@foldling.org>
AuthorDate: Sun Jul 12 19:37:15 2015 +1200
Commit: Evan Hanson <evhan@foldling.org>
CommitDate: Sun Jul 12 19:37:15 2015 +1200
Add missing extras dependencies
For internal usage of `printf` et al.
diff --git a/c-backend.scm b/c-backend.scm
index 6c7d234c..f85a1c17 100644
--- a/c-backend.scm
+++ b/c-backend.scm
@@ -30,8 +30,7 @@
;; Same goes for "platform" and "driver".
(declare
(unit c-backend)
- (uses data-structures
- c-platform compiler support))
+ (uses data-structures extras c-platform compiler support))
(module chicken.compiler.c-backend
(generate-code
@@ -43,6 +42,7 @@
chicken.compiler.core
chicken.compiler.c-platform
chicken.compiler.support
+ chicken.extras
chicken.foreign)
(include "mini-srfi-1.scm")
diff --git a/chicken-ffi-syntax.scm b/chicken-ffi-syntax.scm
index 6963aca8..8ba9c15e 100644
--- a/chicken-ffi-syntax.scm
+++ b/chicken-ffi-syntax.scm
@@ -27,7 +27,7 @@
(declare
(unit chicken-ffi-syntax)
- (uses data-structures)
+ (uses data-structures extras)
(disable-interrupts)
(fixnum))
@@ -39,7 +39,8 @@
(no-bound-checks)
(no-procedure-checks))
-(import chicken.data-structures)
+(import chicken.data-structures
+ chicken.extras)
(include "mini-srfi-1.scm")
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index 555fbfcb..fbee0f21 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -34,6 +34,7 @@
(import scheme chicken)
(import setup-api)
(import chicken.data-structures
+ chicken.extras
chicken.files
chicken.foreign
chicken.irregex
diff --git a/compiler-syntax.scm b/compiler-syntax.scm
index ff3b0585..68eb6656 100644
--- a/compiler-syntax.scm
+++ b/compiler-syntax.scm
@@ -26,8 +26,7 @@
(declare
(unit compiler-syntax)
- (uses data-structures
- support compiler) )
+ (uses data-structures extras support compiler))
(module chicken.compiler.compiler-syntax
(compiler-syntax-statistics)
@@ -35,7 +34,8 @@
(import chicken scheme
chicken.compiler.support
chicken.compiler.core
- chicken.data-structures)
+ chicken.data-structures
+ chicken.extras)
(include "tweaks.scm")
(include "mini-srfi-1.scm")
diff --git a/expand.scm b/expand.scm
index b9618dd3..6c20f1b9 100644
--- a/expand.scm
+++ b/expand.scm
@@ -29,6 +29,7 @@
(declare
(unit expand)
+ (uses extras)
(disable-interrupts)
(fixnum)
(not inline ##sys#syntax-error-hook ##sys#compiler-syntax-hook
@@ -1159,7 +1160,7 @@
(##sys#check-syntax 'cond clause '#(_ 1))
(cond (else?
(##sys#warn
- (sprintf "clause following `~S' clause in `cond'" else?)
+ (chicken.extras#sprintf "clause following `~S' clause in `cond'" else?)
(chicken.expand#strip-syntax clause))
(expand rclauses else?)
'(##core#begin))
diff --git a/lfa2.scm b/lfa2.scm
index 2cff9807..9c408c94 100644
--- a/lfa2.scm
+++ b/lfa2.scm
@@ -34,13 +34,14 @@
(declare
(unit lfa2)
- (uses support) )
+ (uses extras support))
(module chicken.compiler.lfa2
(perform-secondary-flow-analysis)
(import chicken scheme
- chicken.compiler.support)
+ chicken.compiler.support
+ chicken.extras)
(include "tweaks")
(include "mini-srfi-1.scm")
diff --git a/rules.make b/rules.make
index 08ddf55b..4284064d 100644
--- a/rules.make
+++ b/rules.make
@@ -542,7 +542,8 @@ c-backend.c: c-backend.scm mini-srfi-1.scm \
chicken.compiler.c-platform.import.scm \
chicken.compiler.support.import.scm \
chicken.compiler.core.import.scm \
- chicken.data-structures.import.scm
+ chicken.data-structures.import.scm \
+ chicken.extras.import.scm
core.c: core.scm mini-srfi-1.scm \
chicken.compiler.scrutinizer.import.scm \
chicken.compiler.support.import.scm \
@@ -555,6 +556,8 @@ optimizer.c: optimizer.scm mini-srfi-1.scm \
chicken.data-structures.import.scm \
chicken.extras.import.scm \
chicken.foreign.import.scm
+scheduler.c: scheduler.scm \
+ chicken.extras.import.scm
scrutinizer.c: scrutinizer.scm mini-srfi-1.scm \
chicken.compiler.support.import.scm \
chicken.data-structures.import.scm \
@@ -563,13 +566,16 @@ scrutinizer.c: scrutinizer.scm mini-srfi-1.scm \
chicken.files.import.scm \
chicken.ports.import.scm
lfa2.c: lfa2.scm mini-srfi-1.scm \
- chicken.compiler.support.import.scm
+ chicken.compiler.support.import.scm \
+ chicken.extras.import.scm
compiler-syntax.c: compiler-syntax.scm mini-srfi-1.scm \
chicken.compiler.support.import.scm \
chicken.compiler.core.import.scm \
- chicken.data-structures.import.scm
+ chicken.data-structures.import.scm \
+ chicken.extras.import.scm
chicken-ffi-syntax.c: chicken-ffi-syntax.scm \
- chicken.data-structures.import.scm
+ chicken.data-structures.import.scm \
+ chicken.extras.import.scm
support.c: support.scm mini-srfi-1.scm \
chicken.data-structures.import.scm \
chicken.expand.import.scm \
@@ -615,6 +621,7 @@ chicken-install.c: chicken-install.scm \
setup-download.import.scm
chicken-uninstall.c: chicken-uninstall.scm \
chicken.data-structures.import.scm \
+ chicken.extras.import.scm \
chicken.files.import.scm \
chicken.foreign.import.scm \
chicken.irregex.import.scm \
diff --git a/scheduler.scm b/scheduler.scm
index ea9c0765..a975882c 100644
--- a/scheduler.scm
+++ b/scheduler.scm
@@ -27,6 +27,7 @@
(declare
(unit scheduler)
+ (uses extras)
(disable-interrupts)
(hide ready-queue-head ready-queue-tail ##sys#timeout-list
##sys#update-thread-state-buffer ##sys#restore-thread-state-buffer
@@ -128,6 +129,8 @@ C_inline void C_fdset_add(int fd, int input, int output) {
EOF
) )
+(import chicken.extras)
+
(include "common-declarations.scm")
#;(begin
Trap