~ chicken-core (chicken-5) b8db248bbfb65136c211b853ebaee017af75fc09

commit b8db248bbfb65136c211b853ebaee017af75fc09
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Tue Feb 9 12:14:05 2016 +1300
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Tue Mar 8 22:52:35 2016 +1300

    Some small fixes after rebasing against chicken-5

diff --git a/rules.make b/rules.make
index 6b00dc34..f5ca9722 100644
--- a/rules.make
+++ b/rules.make
@@ -601,6 +601,7 @@ chicken-ffi-syntax.c: chicken-ffi-syntax.scm \
 		chicken.data-structures.import.scm \
 		chicken.format.import.scm
 support.c: support.scm mini-srfi-1.scm \
+		chicken.bitwise.import.scm \
 		chicken.data-structures.import.scm \
 		chicken.expand.import.scm \
 		chicken.files.import.scm \
diff --git a/support.scm b/support.scm
index fa2c17c5..03e28c16 100644
--- a/support.scm
+++ b/support.scm
@@ -76,6 +76,7 @@
      number-type unsafe)
 
 (import chicken scheme
+	chicken.bitwise
 	chicken.data-structures
 	chicken.expand
 	chicken.files
diff --git a/tests/lolevel-tests.scm b/tests/lolevel-tests.scm
index d43123ab..9082bf95 100644
--- a/tests/lolevel-tests.scm
+++ b/tests/lolevel-tests.scm
@@ -1,6 +1,6 @@
 ;;;; Unit lolevel testing
 
-(require-extension locative lolevel srfi-4)
+(require-extension format locative lolevel srfi-4)
 
 (define-syntax assert-error
   (syntax-rules ()
diff --git a/tests/scrutiny.expected b/tests/scrutiny.expected
index 39d6c67c..babb71f8 100644
--- a/tests/scrutiny.expected
+++ b/tests/scrutiny.expected
@@ -43,10 +43,10 @@ Warning: at toplevel:
   assignment of value of type `fixnum' to toplevel variable `car' does not match declared type `(forall (a) (procedure car ((pair a *)) a))'
 
 Warning: at toplevel:
-  expected in `let' binding of `g20' a single result, but were given 2 results
+  expected a single result in `let' binding of `g20', but received 2 results
 
 Warning: at toplevel:
-  in procedure call to `g20', expected a value of type `(procedure () *)', but was given a value of type `fixnum'
+  in procedure call to `g20', expected a value of type `(procedure () *)' but was given a value of type `fixnum'
 
 Note: in toplevel procedure `foo':
   expected a value of type boolean in conditional, but was given a value of type `(procedure bar () *)' which is always true: