From 2470bda772e6b93f037130ba266a4ad535ee655e Mon Sep 17 00:00:00 2001
From: Julian Graham <julian.graham@aya.yale.edu>
Date: Thu, 20 May 2010 09:33:39 -0400
Subject: [PATCH] Explicitly import `@@' to support R6RS library purification
 enhancements on `master'.

* module/rnrs/6/conditions.scm:
* module/rnrs/6/exceptions.scm:
* module/rnrs/6/files.scm:
* module/rnrs/6/hashtables.scm:
* module/rnrs/io/6/simple.scm:
* module/rnrs/records/6/inspection.scm: Add explicit import for `@@'.
---
 module/rnrs/6/conditions.scm         | 2 +-
 module/rnrs/6/exceptions.scm         | 2 +-
 module/rnrs/6/files.scm              | 2 +-
 module/rnrs/6/hashtables.scm         | 2 +-
 module/rnrs/io/6/simple.scm          | 3 ++-
 module/rnrs/records/6/inspection.scm | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/rnrs/6/conditions.scm b/module/rnrs/6/conditions.scm
index 678dc1aec..9c6539fef 100644
--- a/module/rnrs/6/conditions.scm
+++ b/module/rnrs/6/conditions.scm
@@ -82,7 +82,7 @@
 	  &undefined
 	  make-undefined-violation
 	  undefined-violation?)
-  (import (only (guile) and=>)
+  (import (only (guile) and=> @@)
 	  (rnrs base (6))
 	  (rnrs lists (6))
 	  (rnrs records procedural (6)))
diff --git a/module/rnrs/6/exceptions.scm b/module/rnrs/6/exceptions.scm
index 70526f53b..d810f2b26 100644
--- a/module/rnrs/6/exceptions.scm
+++ b/module/rnrs/6/exceptions.scm
@@ -22,7 +22,7 @@
   (import (rnrs base (6))
           (rnrs conditions (6))
 	  (rnrs records procedural (6))
-	  (only (guile) with-throw-handler))
+	  (only (guile) with-throw-handler @@))
 
   (define raise (@@ (rnrs records procedural) r6rs-raise))
   (define raise-continuable 
diff --git a/module/rnrs/6/files.scm b/module/rnrs/6/files.scm
index da806d4bb..e6851d0ec 100644
--- a/module/rnrs/6/files.scm
+++ b/module/rnrs/6/files.scm
@@ -56,7 +56,7 @@
 	  i/o-port-error?
 	  i/o-error-port)
 
-  (import (rename (only (guile) file-exists? delete-file catch) 
+  (import (rename (only (guile) file-exists? delete-file catch @@) 
 		  (delete-file delete-file-internal))
 	  (rnrs base (6))
 	  (rnrs conditions (6))
diff --git a/module/rnrs/6/hashtables.scm b/module/rnrs/6/hashtables.scm
index 1afa91b6e..8affbbb4a 100644
--- a/module/rnrs/6/hashtables.scm
+++ b/module/rnrs/6/hashtables.scm
@@ -42,7 +42,7 @@
 	  string-hash
 	  string-ci-hash
 	  symbol-hash)
-  (import (rename (only (guile) string-hash-ci string-hash hashq hashv)
+  (import (rename (only (guile) string-hash-ci string-hash hashq hashv @@)
 		  (string-hash-ci string-ci-hash))
 	  (only (ice-9 optargs) define*)
 	  (rename (only (srfi :69) make-hash-table
diff --git a/module/rnrs/io/6/simple.scm b/module/rnrs/io/6/simple.scm
index 593414a7f..6afae140e 100644
--- a/module/rnrs/io/6/simple.scm
+++ b/module/rnrs/io/6/simple.scm
@@ -88,7 +88,8 @@
  
                                 input-port? 
 				output-port?)
-          (only (guile) call-with-input-file
+          (only (guile) @@
+                        call-with-input-file
 			call-with-output-file
 
 			current-input-port
diff --git a/module/rnrs/records/6/inspection.scm b/module/rnrs/records/6/inspection.scm
index 47b289c6e..a142d7cdd 100644
--- a/module/rnrs/records/6/inspection.scm
+++ b/module/rnrs/records/6/inspection.scm
@@ -32,7 +32,7 @@
 	  (rnrs conditions (6))
           (rnrs exceptions (6))
 	  (rnrs records procedural (6))
-	  (only (guile) struct-ref vtable-index-layout))
+	  (only (guile) struct-ref vtable-index-layout @@))
 
   (define record-internal? (@@ (rnrs records procedural) record-internal?))