[added r6rs namespace for error system. Removed extraneous # sign from names.
atsmyles@earthlink.net**20110813090031
 Ignore-this: 9367dc5f1ad874403b3a9ef654f7a105
] hunk ./catalog.scm 63
-		    ((not (uri? path)) (assertion-violation 'read-catalog "path must be a uri"))
-		    ((or (not (uri-scheme path)) (not (eq? 'file (uri-scheme path)))) (assertion-violation 'read-catalog "read-catalog only supports the file scheme" path))
+		    ((not (uri? path)) (r6rs#assertion-violation 'read-catalog "path must be a uri"))
+		    ((or (not (uri-scheme path)) (not (eq? 'file (uri-scheme path)))) (r6rs#assertion-violation 'read-catalog "read-catalog only supports the file scheme" path))
hunk ./catalog.scm 101
-	      ((not (uri? base-uri)) (assertion-violation 'catalog->libraries "first argument must be a uri"))
+	      ((not (uri? base-uri)) (r6rs#assertion-violation 'catalog->libraries "first argument must be a uri"))
hunk ./catalog.scm 197
-    (else (assertion-violation 'read-library "argument must be a version or a uri" version-or-uri))))
+    (else (r6rs#assertion-violation 'read-library "argument must be a version or a uri" version-or-uri))))
hunk ./catalog.scm 205
-			(assertion-violation 'ex:validate-catalog "We only support file based uris" library v))
+			(r6rs#assertion-violation 'ex:validate-catalog "We only support file based uris" library v))
hunk ./catalog.scm 207
-			(assertion-violation 'ex:validate-catalog "file not found!" library v))
+			(r6rs#assertion-violation 'ex:validate-catalog "file not found!" library v))
hunk ./catalog.scm 212
-					(assertion-violation 'validate-catalog "library name in catalog is not the same as library name in version!" name library))
+					(r6rs#assertion-violation 'validate-catalog "library name in catalog is not the same as library name in version!" name library))
hunk ./catalog.scm 214
-					(assertion-violation 'validate-catalog "library version in catalog does not have the same number as the library form" version v))))))
+					(r6rs#assertion-violation 'validate-catalog "library version in catalog does not have the same number as the library form" version v))))))
hunk ./compat-gambit.scm 12
-(define (r6rs##unique-token)
+(define (r6rs#unique-token)
hunk ./compat-gambit.scm 18
-(define (r6rs##undefined . ignore) #!void)
-(define r6rs##undefined-set! 'set!)
+(define (r6rs#undefined . ignore) #!void)
+(define r6rs#undefined-set! 'set!)
hunk ./compat-gambit.scm 25
-(define r6rs##guid-prefix "r6rs-env##")
-(define r6rs##free-prefix "~")
+(define r6rs#guid-prefix "r6rs-env##")
+(define r6rs#free-prefix "~")
hunk ./compile 46
-    (for-each r6rs##expand-file from-files to-files)
+    (for-each r6rs#expand-file from-files to-files)
hunk ./compile 64
- (apply r6rs##expand-file* (path-expand (car play-files) tmp-dir) core-libraries)
- (r6rs##expand-r5rs-file "expander.scm" (path-expand (cadr play-files) tmp-dir) (r6rs##environment '(except (r5rs) eval)))
+ (apply r6rs#expand-file* (path-expand (car play-files) tmp-dir) core-libraries)
+ (r6rs#expand-r5rs-file "expander.scm" (path-expand (cadr play-files) tmp-dir) (r6rs#environment '(except (r5rs) eval)))
hunk ./compile-libs 88
-	(pretty-print (r6rs##compile-catalog (make-uri 'file (current-directory)) (generate-catalog libraries) bin options: '(debug)) port)))
+	(pretty-print (r6rs#compile-catalog (make-uri 'file (current-directory)) (generate-catalog libraries) bin options: '(debug)) port)))
hunk ./error.scm 12
-(define &condition (make-rtd '&condition '#() #f 'uid '0bf9b656-b071-404a-a514-0fb9d05cf518)); use same id as exceptions
-(define &compound (make-rtd '&compound '#((immutable conditions)) &condition))
-(define &serious (make-rtd '&serious '#() &condition))
-(define &violation (make-rtd '&violation '#() &serious))
-(define &assertion (make-rtd '&assertion '#() &violation))
-(define &who (make-rtd '&who '#((immutable who)) &condition))
-(define &message (make-rtd '&message '#((immutable message)) &condition))
-(define &irritants (make-rtd '&irritants '#((immutable irritants)) &condition))
+(define r6rs#&condition (make-rtd '&condition '#() #f 'uid '0bf9b656-b071-404a-a514-0fb9d05cf518)); use same id as exceptions
+(define r6rs#&compound (make-rtd '&compound '#((immutable conditions)) r6rs#&condition))
+(define r6rs#&serious (make-rtd '&serious '#() r6rs#&condition))
+(define r6rs#&error (make-rtd '&error '#() r6rs#&serious))
+(define r6rs#&violation (make-rtd '&violation '#() r6rs#&serious))
+(define r6rs#&assertion (make-rtd '&assertion '#() r6rs#&violation))
+(define r6rs#&who (make-rtd '&who '#((immutable who)) r6rs#&condition))
+(define r6rs#&message (make-rtd '&message '#((immutable message)) r6rs#&condition))
+(define r6rs#&irritants (make-rtd '&irritants '#((immutable irritants)) r6rs#&condition))
hunk ./error.scm 23
-(define &syntax (make-rtd '&syntax '#((immutable form) (immutable subform)) &violation))
-(define &trace (make-rtd '&trace '#((immutable trace)) &condition))
+(define r6rs#&syntax (make-rtd '&syntax '#((immutable form) (immutable subform)) r6rs#&violation))
+(define r6rs#&trace (make-rtd '&trace '#((immutable trace)) r6rs#&condition))
hunk ./error.scm 28
-(define condition
-  (let ((constructor (rtd-constructor &compound)))
+(define r6rs#condition
+  (let ((constructor (rtd-constructor r6rs#&compound)))
hunk ./error.scm 31
-	(constructor (apply append (map simple-conditions conditions)))))) 
+	(constructor (apply append (map r6rs#simple-conditions conditions)))))) 
hunk ./error.scm 33
-(define simple-conditions
-  (let ((compound? (rtd-predicate &compound))
-	(conditions (rtd-accessor &compound 'conditions)))
+(define r6rs#simple-conditions
+  (let ((compound? (rtd-predicate r6rs#&compound))
+	(conditions (rtd-accessor r6rs#&compound 'conditions)))
hunk ./error.scm 41
-(define make-who-condition (rtd-constructor &who))
-(define make-message-condition (rtd-constructor &message))
-(define make-irritants-condition (rtd-constructor &irritants))
-(define make-syntax-violation (rtd-constructor &syntax))
-(define make-assertion-violation (rtd-constructor &assertion))
+(define r6rs#make-who-condition (rtd-constructor r6rs#&who))
+(define r6rs#make-message-condition (rtd-constructor r6rs#&message))
+(define r6rs#make-irritants-condition (rtd-constructor r6rs#&irritants))
+(define r6rs#make-syntax-violation (rtd-constructor r6rs#&syntax))
+(define r6rs#make-assertion-violation (rtd-constructor r6rs#&assertion))
+(define r6rs#make-error (rtd-constructor r6rs#&error))
hunk ./error.scm 48
-(define (assertion-violation who message . irritants)
+(define (r6rs#assertion-violation who message . irritants)
hunk ./error.scm 51
-    (condition (make-who-condition who) 
-	       (make-message-condition message) 
-	       (make-irritants-condition irritants)
-	       (make-assertion-violation))
-    (condition (make-message-condition message) 
-	       (make-irritants-condition irritants)
-	       (make-assertion-violation)))))
+    (r6rs#condition (r6rs#make-who-condition who) 
+	       (r6rs#make-message-condition message) 
+	       (r6rs#make-irritants-condition irritants)
+	       (r6rs#make-assertion-violation))
+    (r6rs#condition (r6rs#make-message-condition message) 
+	       (r6rs#make-irritants-condition irritants)
+	       (r6rs#make-assertion-violation)))))
+
+;to be used by native code to throw errors compatible with r6rs
+(define (r6rs#error-object who message . irritants)
+    (if who
+    (r6rs#condition (r6rs#make-who-condition who) 
+	       (r6rs#make-message-condition message) 
+	       (r6rs#make-irritants-condition irritants)
+	       (r6rs#make-error))
+    (r6rs#condition (r6rs#make-message-condition message) 
+	       (r6rs#make-irritants-condition irritants)
+	       (r6rs#make-error))))
+
+(define (r6rs#error who message . irritants)
+	(raise (apply r6rs#error-object who message irritants)))
+ 
hunk ./expander.scm 27
-;;;  - Procedure (r6rs##unique-token) that provides a numeric GUID string once per run.
-;;;  - Single-character string r6rs##guid-prefix.  No builtin may start with this.
-;;;  - Single-character string r6rs##free-prefix.  No builtin may start with this.
-;;;  - Value r6rs##undefined representing the letrec black hole value.
-;;;  - Symbol r6rs##undefined-set! representing the corresponding setter.
+;;;  - Procedure (r6rs#unique-token) that provides a numeric GUID string once per run.
+;;;  - Single-character string r6rs#guid-prefix.  No builtin may start with this.
+;;;  - Single-character string r6rs#free-prefix.  No builtin may start with this.
+;;;  - Value r6rs#undefined representing the letrec black hole value.
+;;;  - Symbol r6rs#undefined-set! representing the corresponding setter.
hunk ./expander.scm 38
-;;;   - r6rs##repl              : Use this as REPL evaluator.  See description below.
-;;;   - r6rs##expand-file       : Use this to expand a file containing libraries and/or
+;;;   - r6rs#repl              : Use this as REPL evaluator.  See description below.
+;;;   - r6rs#expand-file       : Use this to expand a file containing libraries and/or
hunk ./expander.scm 43
-;;;   - r6rs##run-r6rs-sequence : Evaluates a sequence of forms of the format
+;;;   - r6rs#run-r6rs-sequence : Evaluates a sequence of forms of the format
hunk ./expander.scm 49
-;;;                            interactive environment, r6rs##REPL should be used instead.
-;;;   - r6rs##run-r6rs-program  : Same as r6rs##run-r6rs-sequence, except that it reads the 
+;;;                            interactive environment, r6rs#REPL should be used instead.
+;;;   - r6rs#run-r6rs-program  : Same as r6rs#run-r6rs-sequence, except that it reads the 
hunk ./expander.scm 52
-;;;   - r6rs##expand-r5rs-file  : For expanding r5rs-like toplevel files in a given environment.
+;;;   - r6rs#expand-r5rs-file  : For expanding r5rs-like toplevel files in a given environment.
hunk ./expander.scm 88
-;;; r6rs##repl in the development system so users don't have to type
-;;; (r6rs##repl '( <code> )) at each prompt.
+;;; r6rs#repl in the development system so users don't have to type
+;;; (r6rs#repl '( <code> )) at each prompt.
hunk ./expander.scm 95
-;;; completely to lambda and set! (or more accurately, whatever r6rs##undefined-set!
+;;; completely to lambda and set! (or more accurately, whatever r6rs#undefined-set!
hunk ./expander.scm 114
-;;;   (r6rs##expand-file "standard-libraries.scm" "standard-libraries.exp")
-;;;   (r6rs##expand-r5rs-file "expander.scm" "expander.exp" (r6rs##environment '(rnrs base)))
+;;;   (r6rs#expand-file "standard-libraries.scm" "standard-libraries.exp")
+;;;   (r6rs#expand-r5rs-file "expander.scm" "expander.exp" (r6rs#environment '(rnrs base)))
hunk ./expander.scm 168
-(define r6rs##make-variable-transformer #f)
-(define r6rs##identifier?               #f)
-(define r6rs##bound-identifier=?        #f)
-(define r6rs##free-identifier=?         #f)
-(define r6rs##generate-temporaries      #f)
-(define r6rs##datum->syntax             #f)
-(define r6rs##syntax->datum             #f)
-(define r6rs##environment               #f)
-(define r6rs##environment-bindings      #f)
-(define r6rs##eval                      #f)
-(define r6rs##load                      #f)
-(define r6rs##syntax-violation          #f)
-(define r6rs##primitive-macro-library   #f)
+(define r6rs#make-variable-transformer #f)
+(define r6rs#identifier?               #f)
+(define r6rs#bound-identifier=?        #f)
+(define r6rs#free-identifier=?         #f)
+(define r6rs#generate-temporaries      #f)
+(define r6rs#datum->syntax             #f)
+(define r6rs#syntax->datum             #f)
+(define r6rs#environment               #f)
+(define r6rs#environment-bindings      #f)
+(define r6rs#eval                      #f)
+(define r6rs#load                      #f)
+(define r6rs#syntax-violation          #f)
+(define r6rs#primitive-macro-library   #f)
hunk ./expander.scm 184
-(define r6rs##repl                      #f)
-(define r6rs##run-r6rs-sequence         #f)
-(define r6rs##expand-r5rs-sequence      #f)
-(define r6rs##expand-r6rs-sequence      #f)
-(define r6rs##normalize		     #f)
+(define r6rs#repl                      #f)
+(define r6rs#run-r6rs-sequence         #f)
+(define r6rs#expand-r5rs-sequence      #f)
+(define r6rs#expand-r6rs-sequence      #f)
+(define r6rs#normalize		     #f)
hunk ./expander.scm 192
-(define r6rs##invalid-form              #f)
-(define r6rs##register-macro!           #f)
-(define r6rs##syntax-rename             #f)
-(define r6rs##map-while                 #f)
-(define r6rs##dotted-length             #f)
-(define r6rs##dotted-butlast            #f)
-(define r6rs##dotted-last               #f)
-(define r6rs##uncompress                #f)
-(define r6rs##free=?                    #f)
+(define r6rs#invalid-form              #f)
+(define r6rs#register-macro!           #f)
+(define r6rs#syntax-rename             #f)
+(define r6rs#map-while                 #f)
+(define r6rs#dotted-length             #f)
+(define r6rs#dotted-butlast            #f)
+(define r6rs#dotted-last               #f)
+(define r6rs#uncompress                #f)
+(define r6rs#free=?                    #f)
hunk ./expander.scm 229
-         (r6rs##invalid-form x))
+         (r6rs#invalid-form x))
hunk ./expander.scm 242
-                    (if (r6rs##free=? x 'id) (sk) (fk)))
+                    (if (r6rs#free=? x 'id) (sk) (fk)))
hunk ./expander.scm 473
-      (let ((token (r6rs##unique-token))
+      (let ((token (r6rs#unique-token))
hunk ./expander.scm 478
-           (string-append r6rs##guid-prefix
+           (string-append r6rs#guid-prefix
hunk ./expander.scm 491
-      (string->symbol (string-append r6rs##free-prefix (symbol->string symbol))))
+      (string->symbol (string-append r6rs#free-prefix (symbol->string symbol))))
hunk ./expander.scm 745
-      `(r6rs##syntax-rename ',(id-name id)
+      `(r6rs#syntax-rename ',(id-name id)
hunk ./expander.scm 781
-                         (assertion-violation 'syntax->datum "A symbol is not a valid syntax object" leaf))
+                         (r6rs#assertion-violation 'syntax->datum "A symbol is not a valid syntax object" leaf))
hunk ./expander.scm 1018
-                                         (emit-body forms r6rs##undefined-set!)    ; +++
+                                         (emit-body forms r6rs#undefined-set!)    ; +++
hunk ./expander.scm 1020
-                                              ,@(emit-body forms r6rs##undefined-set!))
-                                            ,@(map r6rs##undefined
+                                              ,@(emit-body forms r6rs#undefined-set!))
+                                            ,@(map r6rs#undefined
hunk ./expander.scm 1121
-                                    (cons (list #f #f `(r6rs##import-libraries-for-run
+                                    (cons (list #f #f `(r6rs#import-libraries-for-run
hunk ./expander.scm 1219
-         (values id (rename 'variable 'r6rs##unspecified)))
+         (values id (rename 'variable 'r6rs#unspecified)))
hunk ./expander.scm 1294
-              ((? literal? id)    `(if (and (r6rs##identifier? ,input)
-                                            (r6rs##free-identifier=? ,input ,(syntax-reflect id)))
+              ((? literal? id)    `(if (and (r6rs#identifier? ,input)
+                                            (r6rs#free-identifier=? ,input ,(syntax-reflect id)))
hunk ./expander.scm 1310
-                       `(r6rs##map-while (lambda (,input)
+                       `(r6rs#map-while (lambda (,input)
hunk ./expander.scm 1325
-                 `(if (>= (r6rs##dotted-length ,input) ,tail-length)
-                      ,(process-match `(r6rs##dotted-butlast ,input ,tail-length)
+                 `(if (>= (r6rs#dotted-length ,input) ,tail-length)
+                      ,(process-match `(r6rs#dotted-butlast ,input ,tail-length)
hunk ./expander.scm 1328
-                                      (process-match `(r6rs##dotted-last ,input ,tail-length)
+                                      (process-match `(r6rs#dotted-last ,input ,tail-length)
hunk ./expander.scm 1394
-         `(r6rs##invalid-form ,input))
+         `(r6rs#invalid-form ,input))
hunk ./expander.scm 1457
-                                        (r6rs##syntax-violation 
+                                        (r6rs#syntax-violation 
hunk ./expander.scm 1640
-                                                    (r6rs##import-libraries-for-run ',imported-libraries
+                                                    (r6rs#import-libraries-for-run ',imported-libraries
hunk ./expander.scm 1647
-                                                             `(define ,var r6rs##unspecified))
+                                                             `(define ,var r6rs#unspecified))
hunk ./expander.scm 1649
-                                                    (r6rs##register-library!
-                                                     (r6rs##make-library
+                                                    (r6rs#register-library!
+                                                     (r6rs#make-library
hunk ./expander.scm 1656
-                                                             `(r6rs##uncompress                        ; +++ space
+                                                             `(r6rs#uncompress                        ; +++ space
hunk ./expander.scm 1667
-                                                                 `(r6rs##register-macro! ',(car def) ,(cdr def)))
+                                                                 `(r6rs#register-macro! ',(car def) ,(cdr def)))
hunk ./expander.scm 1673
-                                                                 `(set! ,var (r6rs##undefined)))
+                                                                 `(set! ,var (r6rs#undefined)))
hunk ./expander.scm 1675
-                                                        ,@(emit-body forms r6rs##undefined-set!)
+                                                        ,@(emit-body forms r6rs#undefined-set!)
hunk ./expander.scm 1697
-             (r6rs##library-build (r6rs##lookup-library (car lib-entry))))
+             (r6rs#library-build (r6rs#lookup-library (car lib-entry))))
hunk ./expander.scm 1701
-      (r6rs##import-libraries-for
+      (r6rs#import-libraries-for
hunk ./expander.scm 1707
-                  (not (r6rs##library-visited? library)))
+                  (not (r6rs#library-visited? library)))
hunk ./expander.scm 1709
-               (set! *env-table* (append ((r6rs##library-envs library)) *env-table*))
-               ((r6rs##library-visiter library))
-               (r6rs##library-visited?-set! library #t)))
+               (set! *env-table* (append ((r6rs#library-envs library)) *env-table*))
+               ((r6rs#library-visiter library))
+               (r6rs#library-visited?-set! library #t)))
hunk ./expander.scm 1713
-                  (not (r6rs##library-invoked? library)))
+                  (not (r6rs#library-invoked? library)))
hunk ./expander.scm 1715
-               ((r6rs##library-invoker library))
-               (r6rs##library-invoked?-set! library #t))))
+               ((r6rs#library-invoker library))
+               (r6rs#library-invoked?-set! library #t))))
hunk ./expander.scm 1839
-                     (let* ((library (r6rs##lookup-library (syntax->datum library-ref)))
-                            (exports (r6rs##library-exports library))
+                     (let* ((library (r6rs#lookup-library (syntax->datum library-ref)))
+                            (exports (r6rs#library-exports library))
hunk ./expander.scm 1968
-      (let ((constructor (rtd-constructor &trace)))
+      (let ((constructor (rtd-constructor r6rs#&trace)))
hunk ./expander.scm 1984
-			   (else (assertion-violation 'syntax-violation
+			   (else (r6rs#assertion-violation 'syntax-violation
hunk ./expander.scm 1989
-	    (condition (make-who-condition who) 
-		       (make-message-condition message) 
-		       (make-syntax-violation (syntax-debug form) (if subform (syntax-debug subform) #f))
+	    (r6rs#condition (r6rs#make-who-condition who) 
+		       (r6rs#make-message-condition message) 
+		       (r6rs#make-syntax-violation (syntax-debug form) (if subform (syntax-debug subform) #f))
hunk ./expander.scm 1993
-	    (condition (make-message-condition message)
-		       (make-syntax-violation (syntax-debug form) (if subform (syntax-debug subform) #f))
+	    (r6rs#condition (r6rs#make-message-condition message)
+		       (r6rs#make-syntax-violation (syntax-debug form) (if subform (syntax-debug subform) #f))
hunk ./expander.scm 2042
-          (r6rs##import-libraries-for-run (r6rs-environment-imported-libraries env) (map not imported-libraries) 0)
+          (r6rs#import-libraries-for-run (r6rs-environment-imported-libraries env) (map not imported-libraries) 0)
hunk ./expander.scm 2108
-        (cond ((< length-left n) (assertion-violation 'dotted-butlast "List too short" ls n))
+        (cond ((< length-left n) (r6rs#assertion-violation 'dotted-butlast "List too short" ls n))
hunk ./expander.scm 2118
-        (cond ((< length-left n) (assertion-violation 'dotted-last "List too short" ls n))
+        (cond ((< length-left n) (r6rs#assertion-violation 'dotted-last "List too short" ls n))
hunk ./expander.scm 2171
-               (assertion-violation 'list->string "Invalid argument" e))))
+               (r6rs#assertion-violation 'list->string "Invalid argument" e))))
hunk ./expander.scm 2298
-             (cons `(r6rs##import-libraries-for-run ',(r6rs-environment-imported-libraries r6rs-env)
+             (cons `(r6rs#import-libraries-for-run ',(r6rs-environment-imported-libraries r6rs-env)
hunk ./expander.scm 2372
-	(r6rs##make-library name 
+	(r6rs#make-library name 
hunk ./expander.scm 2394
-    (r6rs##register-library!
+    (r6rs#register-library!
hunk ./expander.scm 2411
-       (r6rs##make-library
+       (r6rs#make-library
hunk ./expander.scm 2452
-    (set! r6rs##make-variable-transformer make-variable-transformer)
-    (set! r6rs##identifier?               identifier?)
-    (set! r6rs##bound-identifier=?        bound-identifier=?)
-    (set! r6rs##free-identifier=?         free-identifier=?)
-    (set! r6rs##generate-temporaries      generate-temporaries)
-    (set! r6rs##datum->syntax             datum->syntax)
-    (set! r6rs##syntax->datum             syntax->datum)
-    (set! r6rs##environment               environment)
-    (set! r6rs##environment-bindings      environment-bindings)
-    (set! r6rs##eval                      r6rs-eval)
-    (set! r6rs##load                      r6rs-load)
-    (set! r6rs##syntax-violation          syntax-violation)
-    (set! r6rs##primitive-macro-library   primitive-macro-library)
+    (set! r6rs#make-variable-transformer make-variable-transformer)
+    (set! r6rs#identifier?               identifier?)
+    (set! r6rs#bound-identifier=?        bound-identifier=?)
+    (set! r6rs#free-identifier=?         free-identifier=?)
+    (set! r6rs#generate-temporaries      generate-temporaries)
+    (set! r6rs#datum->syntax             datum->syntax)
+    (set! r6rs#syntax->datum             syntax->datum)
+    (set! r6rs#environment               environment)
+    (set! r6rs#environment-bindings      environment-bindings)
+    (set! r6rs#eval                      r6rs-eval)
+    (set! r6rs#load                      r6rs-load)
+    (set! r6rs#syntax-violation          syntax-violation)
+    (set! r6rs#primitive-macro-library   primitive-macro-library)
hunk ./expander.scm 2466
-    (set! r6rs##repl                      repl)
-    (set! r6rs##run-r6rs-sequence         run-r6rs-sequence)
-    (set! r6rs##expand-r6rs-sequence      expand-r6rs-sequence)
-    (set! r6rs##expand-r5rs-sequence      expand-r5rs-sequence)
-    (set! r6rs##normalize        	       normalize)
+    (set! r6rs#repl                      repl)
+    (set! r6rs#run-r6rs-sequence         run-r6rs-sequence)
+    (set! r6rs#expand-r6rs-sequence      expand-r6rs-sequence)
+    (set! r6rs#expand-r5rs-sequence      expand-r5rs-sequence)
+    (set! r6rs#normalize        	       normalize)
hunk ./expander.scm 2472
-    (set! r6rs##invalid-form              invalid-form)
-    (set! r6rs##register-macro!           register-macro!)
-    (set! r6rs##syntax-rename             syntax-rename)
-    (set! r6rs##map-while                 map-while)
-    (set! r6rs##dotted-length             dotted-length)
-    (set! r6rs##dotted-butlast            dotted-butlast)
-    (set! r6rs##dotted-last               dotted-last)
-    (set! r6rs##uncompress                uncompress)
-    (set! r6rs##free=?                    free=?)
+    (set! r6rs#invalid-form              invalid-form)
+    (set! r6rs#register-macro!           register-macro!)
+    (set! r6rs#syntax-rename             syntax-rename)
+    (set! r6rs#map-while                 map-while)
+    (set! r6rs#dotted-length             dotted-length)
+    (set! r6rs#dotted-butlast            dotted-butlast)
+    (set! r6rs#dotted-last               dotted-last)
+    (set! r6rs#uncompress                uncompress)
+    (set! r6rs#free=?                    free=?)
hunk ./gambit-ffi.scm 1
-(r6rs##register-library! (r6rs##primitive-macro-library '(gambit ffi macros) '(c-lambda c-define-type)))
+(r6rs#register-library! (r6rs#primitive-macro-library '(gambit ffi macros) '(c-lambda c-define-type)))
hunk ./libs/core/core.scm 40
-   (rename (r6rs##make-variable-transformer make-variable-transformer)
-           (r6rs##identifier?               identifier?)
-           (r6rs##bound-identifier=?        bound-identifier=?)
-           (r6rs##free-identifier=?         free-identifier=?)
-           (r6rs##generate-temporaries      generate-temporaries) 
-           (r6rs##datum->syntax             datum->syntax)
-           (r6rs##syntax->datum             syntax->datum)
-           (r6rs##syntax-violation          syntax-violation)
-           (r6rs##environment               environment)
-           (r6rs##environment-bindings      environment-bindings)
-           (r6rs##eval                      eval)
-           (r6rs##undefined                 undefined)))
+   (rename (r6rs#make-variable-transformer make-variable-transformer)
+           (r6rs#identifier?               identifier?)
+           (r6rs#bound-identifier=?        bound-identifier=?)
+           (r6rs#free-identifier=?         free-identifier=?)
+           (r6rs#generate-temporaries      generate-temporaries) 
+           (r6rs#datum->syntax             datum->syntax)
+           (r6rs#syntax->datum             syntax->datum)
+           (r6rs#syntax-violation          syntax-violation)
+           (r6rs#environment               environment)
+           (r6rs#environment-bindings      environment-bindings)
+           (r6rs#eval                      eval)
+           (r6rs#undefined                 undefined)))
hunk ./libs/core/core.scm 70
-    r6rs##make-variable-transformer r6rs##identifier? r6rs##bound-identifier=?
-    r6rs##free-identifier=? r6rs##generate-temporaries r6rs##datum->syntax r6rs##syntax->datum 
-    r6rs##syntax-violation r6rs##environment r6rs##environment-bindings r6rs##eval
-    r6rs##undefined
+    r6rs#make-variable-transformer r6rs#identifier? r6rs#bound-identifier=?
+    r6rs#free-identifier=? r6rs#generate-temporaries r6rs#datum->syntax r6rs#syntax->datum 
+    r6rs#syntax-violation r6rs#environment r6rs#environment-bindings r6rs#eval
+    r6rs#undefined
hunk ./libs/core/r5rs.scm 130
-	   assertion-violation	   
+	   r6rs#assertion-violation	   
hunk ./libs/core/r5rs.scm 155
-      (assertion-violation 'scheme-report-environment "Argument should be 5" n))
+      (r6rs#assertion-violation 'scheme-report-environment "Argument should be 5" n))
hunk ./libs/core/r5rs.scm 170
-          (assertion-violation 'null-environment "Argument should be 5" n))
+          (r6rs#assertion-violation 'null-environment "Argument should be 5" n))
hunk ./libs/rnrs/base.scm 50
-   symbol=? string-for-each vector-map vector-for-each error assertion-violation
+   symbol=? string-for-each vector-map vector-for-each 
+   (rename (r6rs#error error) (r6rs#assertion-violation assertion-violation))
hunk ./libs/rnrs/base.scm 62
-	  (only (rnrs exceptions) raise)
-	  (only (rnrs conditions) condition make-error make-message-condition make-who-condition make-irritants-condition)
+	  ;(only (rnrs exceptions) raise)
+	  ;(only (rnrs conditions) condition make-error make-message-condition make-who-condition make-irritants-condition)
hunk ./libs/rnrs/base.scm 70
-           finite? infinite? nan? integer-sqrt assertion-violation))
+           finite? infinite? nan? integer-sqrt r6rs#assertion-violation r6rs#error))
hunk ./libs/rnrs/base.scm 107
-	(assertion-violation name message seqs))))
+	(r6rs#assertion-violation name message seqs))))
hunk ./libs/rnrs/base.scm 121
-	  (assertion-violation 'vector-map "Vectors must have the same length!" vectors)))
+	  (r6rs#assertion-violation 'vector-map "Vectors must have the same length!" vectors)))
hunk ./libs/rnrs/base.scm 137
-  (define (error who message . irritants)
+  ; now defined as a native function
+  #;(define (error who message . irritants)
hunk ./libs/rnrs/base.scm 155
-             (assertion-violation #f "assertion failed" 'expression)))))
+             (r6rs#assertion-violation #f "assertion failed" 'expression)))))
hunk ./libs/rnrs/base.scm 160
-	   ((zero? y) (assertion-violation 'div "Second argument cannot be zero!" y))
+	   ((zero? y) (r6rs#assertion-violation 'div "Second argument cannot be zero!" y))
hunk ./libs/rnrs/base.scm 172
-	   ((zero? y) (assertion-violation 'div0 "Second argument cannot be zero!" y))
+	   ((zero? y) (r6rs#assertion-violation 'div0 "Second argument cannot be zero!" y))
hunk ./libs/rnrs/base.scm 177
-	(if (zero? y) (assertion-violation 'div-and-mod "Second argument cannot be zero!" y)
+	(if (zero? y) (r6rs#assertion-violation 'div-and-mod "Second argument cannot be zero!" y)
hunk ./libs/rnrs/base.scm 181
-	   (if (zero? y) (assertion-violation 'div0-and-mod0 "Second argument cannot be zero!" y)
+	   (if (zero? y) (r6rs#assertion-violation 'div0-and-mod0 "Second argument cannot be zero!" y)
hunk ./libs/rnrs/base.scm 185
-	(if (zero? y) (assertion-violation 'mod "Second argument cannot be zero!" y)
+	(if (zero? y) (r6rs#assertion-violation 'mod "Second argument cannot be zero!" y)
hunk ./libs/rnrs/base.scm 191
-	(if (zero? y) (assertion-violation 'mod0 "Second argument cannot be zero!" y)
+	(if (zero? y) (r6rs#assertion-violation 'mod0 "Second argument cannot be zero!" y)
hunk ./libs/rnrs/base.scm 218
+
hunk ./libs/rnrs/conditions.scm 2
-	 (export &condition condition simple-conditions condition? condition-predicate condition-accessor
+	 (export (rename (r6rs#&condition &condition) (r6rs#condition condition) (r6rs#simple-conditions simple-conditions)) 
+		 condition? condition-predicate condition-accessor
hunk ./libs/rnrs/conditions.scm 5
-		 &message make-message-condition message-condition? condition-message
+		 (rename (r6rs#&message &message) (r6rs#make-message-condition make-message-condition)) message-condition? condition-message
hunk ./libs/rnrs/conditions.scm 7
-		 &serious make-serious-condition serious-condition?
-		 &error make-error error?
-		 &violation make-violation violation?
-		 &assertion make-assertion-violation assertion-violation?
-		 &irritants make-irritants-condition irritants-condition? condition-irritants
-		 &who make-who-condition who-condition? condition-who
+		 (rename (r6rs#&serious &serious)) make-serious-condition serious-condition?
+		 (rename (r6rs#&error &error) (r6rs#make-error make-error)) error?
+		 (rename (r6rs#&violation &violation)) make-violation violation?
+		 (rename (r6rs#&assertion &assertion) (r6rs#make-assertion-violation make-assertion-violation)) assertion-violation?
+		 (rename (r6rs#&irritants &irritants) (r6rs#make-irritants-condition make-irritants-condition)) irritants-condition? condition-irritants
+		 (rename (r6rs#&who &who) (r6rs#make-who-condition make-who-condition)) who-condition? condition-who
hunk ./libs/rnrs/conditions.scm 16
-		 &syntax make-syntax-violation syntax-violation-form syntax-violation-subform
+		 (rename (r6rs#&syntax &syntax) (r6rs#make-syntax-violation make-syntax-violation)) syntax-violation-form syntax-violation-subform
hunk ./libs/rnrs/conditions.scm 26
-		       &condition &serious &violation &assertion &who &message &irritants &syntax
-		       condition simple-conditions make-assertion-violation make-syntax-violation
-		       make-who-condition make-message-condition make-irritants-condition))
+		       r6rs#&condition r6rs#&serious r6rs#&violation r6rs#&assertion r6rs#&who r6rs#&message r6rs#&irritants r6rs#&syntax r6rs#&error
+		       r6rs#condition r6rs#simple-conditions r6rs#make-assertion-violation r6rs#make-syntax-violation r6rs#make-error
+		       r6rs#make-who-condition r6rs#make-message-condition r6rs#make-irritants-condition))
hunk ./libs/rnrs/conditions.scm 40
-	 (define condition? (rtd-predicate &condition))
+	 (define condition? (rtd-predicate r6rs#&condition))
hunk ./libs/rnrs/conditions.scm 45
-	     (let recur ((conditions (simple-conditions x)))
+	     (let recur ((conditions (r6rs#simple-conditions x)))
hunk ./libs/rnrs/conditions.scm 54
-	     (let recur ((conditions (simple-conditions x)))
+	     (let recur ((conditions (r6rs#simple-conditions x)))
hunk ./libs/rnrs/conditions.scm 61
-	 (define-condition-type &warning &condition make-warning warning?)
-	 (define make-serious-condition (rtd-constructor &serious))
-	 (define serious-condition? (condition-predicate &serious))
-	 (define-condition-type &error &serious make-error error?)
-	 (define make-violation (rtd-constructor &violation))
-	 (define violation? (condition-predicate &violation))
-	 (define assertion-violation? (condition-predicate &assertion))
-	 (define-condition-type &lexical &violation make-lexical-violation lexical-violation?)
-	 (define-condition-type &undefined &violation make-undefined-violation undefined-violation?)
-	 (define who-condition? (condition-predicate &who))
-	 (define condition-who (condition-accessor &who (rtd-accessor &who 'who)))
-	 (define message-condition? (condition-predicate &message))
-	 (define condition-message (condition-accessor &message (rtd-accessor &message 'message)))
-	 (define irritants-condition? (condition-predicate &irritants))
-	 (define condition-irritants (condition-accessor &irritants (rtd-accessor &irritants 'irritants)))
+	 (define-condition-type &warning r6rs#&condition make-warning warning?)
+	 (define make-serious-condition (rtd-constructor r6rs#&serious))
+	 (define serious-condition? (condition-predicate r6rs#&serious))
+	 (define error? (condition-predicate r6rs#&error))
+         ;(define-condition-type &error &serious make-error error?)
+	 (define make-violation (rtd-constructor r6rs#&violation))
+	 (define violation? (condition-predicate r6rs#&violation))
+	 (define assertion-violation? (condition-predicate r6rs#&assertion))
+	 (define-condition-type &lexical r6rs#&violation make-lexical-violation lexical-violation?)
+	 (define-condition-type &undefined r6rs#&violation make-undefined-violation undefined-violation?)
+	 (define who-condition? (condition-predicate r6rs#&who))
+	 (define condition-who (condition-accessor r6rs#&who (rtd-accessor r6rs#&who 'who)))
+	 (define message-condition? (condition-predicate r6rs#&message))
+	 (define condition-message (condition-accessor r6rs#&message (rtd-accessor r6rs#&message 'message)))
+	 (define irritants-condition? (condition-predicate r6rs#&irritants))
+	 (define condition-irritants (condition-accessor r6rs#&irritants (rtd-accessor r6rs#&irritants 'irritants)))
hunk ./libs/rnrs/conditions.scm 78
-	 (define-condition-type &non-continuable &violation 
+	 (define-condition-type &non-continuable r6rs#&violation 
hunk ./libs/rnrs/conditions.scm 80
-	 (define-condition-type &implementation-restriction &violation 
+	 (define-condition-type &implementation-restriction r6rs#&violation 
hunk ./libs/rnrs/conditions.scm 83
-	 (define syntax-violation? (condition-predicate &syntax))
-	 (define syntax-violation-form (condition-accessor &syntax (rtd-accessor &syntax 'form)))
-	 (define syntax-violation-subform (condition-accessor &syntax (rtd-accessor &syntax 'subform)))
+	 (define syntax-violation? (condition-predicate r6rs#&syntax))
+	 (define syntax-violation-form (condition-accessor r6rs#&syntax (rtd-accessor r6rs#&syntax 'form)))
+	 (define syntax-violation-subform (condition-accessor r6rs#&syntax (rtd-accessor r6rs#&syntax 'subform)))
hunk ./libs/rnrs/load.scm 9
-          (primitives r6rs##repl))
+          (primitives r6rs#repl))
hunk ./libs/rnrs/load.scm 19
-    (r6rs##repl (read-file filename)))
+    (r6rs#repl (read-file filename)))
hunk ./primitives.scm 93
-    (define (r6rs##run-r6rs-program filename)
-      (r6rs##run-r6rs-sequence (read-file filename)))
+    (define (r6rs#run-r6rs-program filename)
+      (r6rs#run-r6rs-sequence (read-file filename)))
hunk ./primitives.scm 96
-    (define (r6rs##expand-file filename target-filename)
-      (write-file (r6rs##expand-r6rs-sequence (read-file filename))
+    (define (r6rs#expand-file filename target-filename)
+      (write-file (r6rs#expand-r6rs-sequence (read-file filename))
hunk ./primitives.scm 100
-(define (r6rs##expand-file* target-filename . files)
+(define (r6rs#expand-file* target-filename . files)
hunk ./primitives.scm 102
-	(r6rs##expand-r6rs-sequence 
+	(r6rs#expand-r6rs-sequence 
hunk ./primitives.scm 110
-(define (r6rs##compile-library library-form output-file . rest)
+(define (r6rs#compile-library library-form output-file . rest)
hunk ./primitives.scm 112
-     (r6rs##compile-native-library library-form output-file '() '())
+     (r6rs#compile-native-library library-form output-file '() '())
hunk ./primitives.scm 114
-     (r6rs##compile-native-library library-form output-file (or (car rest) '()) (cdr rest))
+     (r6rs#compile-native-library library-form output-file (or (car rest) '()) (cdr rest))
hunk ./primitives.scm 117
-(define (r6rs##compile-native-library library-form output-file native-files compiler-options)
+(define (r6rs#compile-native-library library-form output-file native-files compiler-options)
hunk ./primitives.scm 132
-	   (else (assertion-violation 'compile-files-to-c "files must be file uris or strings" files f))))
+	   (else (r6rs#assertion-violation 'compile-files-to-c "files must be file uris or strings" files f))))
hunk ./primitives.scm 157
-		  (lambda () (r6rs##expand-r6rs-sequence (list library))))))
+		  (lambda () (r6rs#expand-r6rs-sequence (list library))))))
hunk ./primitives.scm 183
-(define (r6rs##compile-catalog base-dir catalog bin . compiler-options)	
+(define (r6rs#compile-catalog base-dir catalog bin . compiler-options)	
hunk ./primitives.scm 205
-			      (r6rs##compile-native-library library-form out-file native-files (append (list keep-files: #t) version-compiler-options compiler-options))
+			      (r6rs#compile-native-library library-form out-file native-files (append (list keep-files: #t) version-compiler-options compiler-options))
hunk ./primitives.scm 212
-    (define (r6rs##expand-r5rs-file filename target-filename r6rs-env)
-      (write-file (r6rs##expand-r5rs-sequence (read-file filename) r6rs-env) target-filename))
+    (define (r6rs#expand-r5rs-file filename target-filename r6rs-env)
+      (write-file (r6rs#expand-r5rs-sequence (read-file filename) r6rs-env) target-filename))
hunk ./runtime.scm 7
-(define r6rs##unspecified (if #f #f))
-(define r6rs##library (make-rtd 'library '#((immutable name) (immutable envs) (immutable exports) (immutable imports) (immutable builds) (immutable visiter) (immutable invoker) (immutable build) (mutable visited?) (mutable invoked?))))
+(define r6rs#unspecified (if #f #f))
+(define r6rs#library (make-rtd 'library '#((immutable name) (immutable envs) (immutable exports) (immutable imports) (immutable builds) (immutable visiter) (immutable invoker) (immutable build) (mutable visited?) (mutable invoked?))))
hunk ./runtime.scm 10
-(define r6rs##make-library 
-   (let ((constructor (rtd-constructor r6rs##library)))
+(define r6rs#make-library 
+   (let ((constructor (rtd-constructor r6rs#library)))
hunk ./runtime.scm 15
-;(define (r6rs##make-library name envs exports imports builds visiter invoker build)
+;(define (r6rs#make-library name envs exports imports builds visiter invoker build)
hunk ./runtime.scm 18
-(define r6rs##library-name (rtd-accessor r6rs##library 'name))
-(define r6rs##library-envs (rtd-accessor r6rs##library 'envs))
-(define r6rs##library-exports (rtd-accessor r6rs##library 'exports))
-(define r6rs##library-imports (rtd-accessor r6rs##library 'imports))
-(define r6rs##library-builds  (rtd-accessor r6rs##library 'builds))
-(define r6rs##library-visiter (rtd-accessor r6rs##library 'visiter))
-(define r6rs##library-invoker (rtd-accessor r6rs##library 'invoker))
-(define r6rs##library-build   (rtd-accessor r6rs##library 'build))
-(define r6rs##library-visited? (rtd-accessor r6rs##library 'visited?))
-(define r6rs##library-invoked? (rtd-accessor r6rs##library 'invoked?))
+(define r6rs#library-name (rtd-accessor r6rs#library 'name))
+(define r6rs#library-envs (rtd-accessor r6rs#library 'envs))
+(define r6rs#library-exports (rtd-accessor r6rs#library 'exports))
+(define r6rs#library-imports (rtd-accessor r6rs#library 'imports))
+(define r6rs#library-builds  (rtd-accessor r6rs#library 'builds))
+(define r6rs#library-visiter (rtd-accessor r6rs#library 'visiter))
+(define r6rs#library-invoker (rtd-accessor r6rs#library 'invoker))
+(define r6rs#library-build   (rtd-accessor r6rs#library 'build))
+(define r6rs#library-visited? (rtd-accessor r6rs#library 'visited?))
+(define r6rs#library-invoked? (rtd-accessor r6rs#library 'invoked?))
hunk ./runtime.scm 29
-(define r6rs##library-visited?-set! (rtd-mutator r6rs##library 'visited?))
-(define r6rs##library-invoked?-set! (rtd-mutator r6rs##library 'invoked?))
+(define r6rs#library-visited?-set! (rtd-mutator r6rs#library 'visited?))
+(define r6rs#library-invoked?-set! (rtd-mutator r6rs#library 'invoked?))
hunk ./runtime.scm 32
-(define r6rs##imported '())
-(define (r6rs##import-libraries-for imports builds phase importer run-or-expand)
+(define r6rs#imported '())
+(define (r6rs#import-libraries-for imports builds phase importer run-or-expand)
hunk ./runtime.scm 45
-    (if (not (member (cons name (cons phase run-or-expand)) r6rs##imported))
-        (let ((library (r6rs##lookup-library name)))
+    (if (not (member (cons name (cons phase run-or-expand)) r6rs#imported))
+        (let ((library (r6rs#lookup-library name)))
hunk ./runtime.scm 48
-              (eq? build (r6rs##library-build library))
-              (assertion-violation 'import "Client was expanded against a different build of this library" name))
-          (import-libraries (r6rs##library-imports library) 
-                            (r6rs##library-builds library)
+              (eq? build (r6rs#library-build library))
+              (r6rs#assertion-violation 'import "Client was expanded against a different build of this library" name))
+          (import-libraries (r6rs#library-imports library) 
+                            (r6rs#library-builds library)
hunk ./runtime.scm 53
-          (importer library phase r6rs##imported)
-          (set! r6rs##imported (cons (cons name (cons phase run-or-expand)) r6rs##imported)))))
+          (importer library phase r6rs#imported)
+          (set! r6rs#imported (cons (cons name (cons phase run-or-expand)) r6rs#imported)))))
hunk ./runtime.scm 57
-(define (r6rs##import-libraries-for-run imports builds phase)
-  (r6rs##import-libraries-for imports 
+(define (r6rs#import-libraries-for-run imports builds phase)
+  (r6rs#import-libraries-for imports 
hunk ./runtime.scm 63
-                                      (not (r6rs##library-invoked? library)))
+                                      (not (r6rs#library-invoked? library)))
hunk ./runtime.scm 65
-                                   ((r6rs##library-invoker library))
-                                   (r6rs##library-invoked?-set! library #t))))
+                                   ((r6rs#library-invoker library))
+                                   (r6rs#library-invoked?-set! library #t))))
hunk ./runtime.scm 71
-(define r6rs##register-library! #f)
-(define r6rs##lookup-library    #f)
-(define r6rs##register-catalogs! #f)
-(define r6rs##catalog #f)
+(define r6rs#register-library! #f)
+(define r6rs#lookup-library    #f)
+(define r6rs#register-catalogs! #f)
+(define r6rs#catalog #f)
hunk ./runtime.scm 78
-     (define (r6rs##load-library name)
+     (define (r6rs#load-library name)
hunk ./runtime.scm 84
-				(r6rs##run-r6rs-sequence (list (read-library version)))))
-		    (else (assertion-violation 'lookup-library "Library not registered in catalog!" name (hash-table->alist catalog))))
-		(r6rs##lookup-library name)))
+				(r6rs#run-r6rs-sequence (list (read-library version)))))
+		    (else (r6rs#assertion-violation 'lookup-library "Library not registered in catalog!" name (hash-table->alist catalog))))
+		(r6rs#lookup-library name)))
hunk ./runtime.scm 98
-		(source (or gambit-binary (r6rs##read-library (call/cc (lambda (return)
+		(source (or gambit-binary (r6rs#read-library (call/cc (lambda (return)
hunk ./runtime.scm 106
-	     (r6rs##run-r6rs-sequence (list source))) ;no gambit binary; load first source file
-	  (r6rs##lookup-library name))
-	(assertion-violation 'lookup-library "Library not registered in catalog!" name (hash-table->alist catalog))))      
+	     (r6rs#run-r6rs-sequence (list source))) ;no gambit binary; load first source file
+	  (r6rs#lookup-library name))
+	(r6rs#assertion-violation 'lookup-library "Library not registered in catalog!" name (hash-table->alist catalog))))      
hunk ./runtime.scm 163
-  (set! r6rs##register-catalogs! (lambda (catalogs)
+  (set! r6rs#register-catalogs! (lambda (catalogs)
hunk ./runtime.scm 166
-  (set! r6rs##catalog (lambda () (pp (hash-table->alist catalog))))
+  (set! r6rs#catalog (lambda () (pp (hash-table->alist catalog))))
hunk ./runtime.scm 169
-  (set! r6rs##register-library! 
+  (set! r6rs#register-library! 
hunk ./runtime.scm 171
-          (set! table (cons (cons (r6rs##library-name library) library) table))
-	  (set! r6rs##imported (filter (lambda (entry)
-                                      (not (equal? (r6rs##library-name library) 
+          (set! table (cons (cons (r6rs#library-name library) library) table))
+	  (set! r6rs#imported (filter (lambda (entry)
+                                      (not (equal? (r6rs#library-name library) 
hunk ./runtime.scm 175
-                                    r6rs##imported))))
+                                    r6rs#imported))))
hunk ./runtime.scm 177
-  (set! r6rs##lookup-library 
+  (set! r6rs#lookup-library 
hunk ./runtime.scm 183
-		   (r6rs##load-library name)
-		   ;(r6rs##lookup-library name)
+		   (r6rs#load-library name)
+		   ;(r6rs#lookup-library name)
hunk ./runtime.scm 191
-(r6rs##register-library! 
+(r6rs#register-library! 
hunk ./runtime.scm 193
-                (assertion-violation 
+                (r6rs#assertion-violation 
hunk ./runtime.scm 196
-   (r6rs##make-library
+   (r6rs#make-library
hunk ./srfi-69.scm 70
-	((not (hash-table? hash-table)) (assertion-violation 'hash-table-set! "First argument must be a hash-table" hash-table))
+	((not (hash-table? hash-table)) (r6rs#assertion-violation 'hash-table-set! "First argument must be a hash-table" hash-table))
hunk ./srfi-69.scm 125
-	   ((not (hash-table? table)) (assertion-violation 'hash-table-walk "first argument must be a table" table))
-	   ((not (procedure? proc)) (assertion-violation 'hash-table-walk "second argument must be a procedure" proc))
+	   ((not (hash-table? table)) (r6rs#assertion-violation 'hash-table-walk "first argument must be a table" table))
+	   ((not (procedure? proc)) (r6rs#assertion-violation 'hash-table-walk "second argument must be a procedure" proc))
hunk ./srfi-99.scm 67
-	((and parent (not (rtd? parent))) (assertion-violation 'make-rtd "Third argument must be an rtd or #f" parent)))
+	((and parent (not (rtd? parent))) (r6rs#assertion-violation 'make-rtd "Third argument must be an rtd or #f" parent)))
hunk ./srfi-99.scm 126
-			(else (assertion-violation (rtd-name rtd) "Invalid field!" field))))))
+			(else (r6rs#assertion-violation (rtd-name rtd) "Invalid field!" field))))))
hunk ./srfi-99.scm 131
-	    ((not (predicate? obj))(assertion-violation 'rtd-deconstructor (string-append "First argument must be of type " (symbol->string (rtd-name rtd))) obj))
+	    ((not (predicate? obj))(r6rs#assertion-violation 'rtd-deconstructor (string-append "First argument must be of type " (symbol->string (rtd-name rtd))) obj))
hunk ./srfi-99.scm 135
-  (assertion-violation 'rtd-deconstructor "first argument must be a record type descriptor" rtd)))
+  (r6rs#assertion-violation 'rtd-deconstructor "first argument must be a record type descriptor" rtd)))
hunk ./srfi-99.scm 149
-	   (assertion-violation 'rtd-accessor "invalid field name" field))))
-    (assertion-violation 'rtd-accessor "first argument must be a record type descriptor" rtd)))
+	   (r6rs#assertion-violation 'rtd-accessor "invalid field name" field))))
+    (r6rs#assertion-violation 'rtd-accessor "first argument must be a record type descriptor" rtd)))
hunk ./srfi-99.scm 164
-	  (assertion-violation 'rtd-mutator "invalid field" field))))
-    (assertion-violation 'rtd-accessor "first argument must be an record type descriptor" rtd)))
+	  (r6rs#assertion-violation 'rtd-mutator "invalid field" field))))
+    (r6rs#assertion-violation 'rtd-accessor "first argument must be an record type descriptor" rtd)))
hunk ./srfi-99.scm 172
-    (assertion-violation 'record-rtd "first argument must of type record" obj) 
+    (r6rs#assertion-violation 'record-rtd "first argument must of type record" obj) 
hunk ./test/examples.scm 31
-;(r6rs##expand-file "standard-libraries.scm" "standard-libraries.exp")
+;(r6rs#expand-file "standard-libraries.scm" "standard-libraries.exp")
hunk ./test/examples.scm 49
-(r6rs##repl
+(r6rs#repl
hunk ./test/examples.scm 2153
-(r6rs##expand-file "sample-libs-and-program.scm" "sample-libs-and-program.exp")
+(r6rs#expand-file "sample-libs-and-program.scm" "sample-libs-and-program.exp")
hunk ./test/examples.scm 2195
-(r6rs##expand-file "sample-stack.scm" "sample-stack.exp")
-(r6rs##expand-file "sample-balloons.scm" "sample-balloons.exp")
+(r6rs#expand-file "sample-stack.scm" "sample-stack.exp")
+(r6rs#expand-file "sample-balloons.scm" "sample-balloons.exp")
hunk ./test/examples.scm 2199
-(r6rs##expand-file "sample-party.scm" "sample-party.exp")
+(r6rs#expand-file "sample-party.scm" "sample-party.exp")
hunk ./test/examples.scm 2201
-(r6rs##expand-file "sample-program.scm" "sample-program.exp")
+(r6rs#expand-file "sample-program.scm" "sample-program.exp")
hunk ./uri.scm 19
-	    ((not (or (symbol? scheme) (not scheme))) (assertion-violation 'make-uri "uri scheme must be a symbol of #f" scheme))
-      	    ((not (string? body)) (assertion-violation 'make-uri "uri body must be a string" body))
-      	    ((not (or (string? query) (boolean? query))) (assertion-violation 'make-uri "uri query must be a string or boolean"))
-            ((not (or (string? fragment) (boolean? fragment))) (assertion-violation 'make-uri "uri fragment must be a string or boolean"))
+	    ((not (or (symbol? scheme) (not scheme))) (r6rs#assertion-violation 'make-uri "uri scheme must be a symbol of #f" scheme))
+      	    ((not (string? body)) (r6rs#assertion-violation 'make-uri "uri body must be a string" body))
+      	    ((not (or (string? query) (boolean? query))) (r6rs#assertion-violation 'make-uri "uri query must be a string or boolean"))
+            ((not (or (string? fragment) (boolean? fragment))) (r6rs#assertion-violation 'make-uri "uri fragment must be a string or boolean"))
hunk ./uri.scm 29
-	       (else (assertion-violation 'make-uri "this function only accepts 4 arguments"))))))
+	       (else (r6rs#assertion-violation 'make-uri "this function only accepts 4 arguments"))))))
hunk ./uri.scm 138
-	((not (uri? base)) (assertion-violation 'relative-uri "first argument must be a uri" base))
-	((not (uri? uri)) (assertion-violation 'relative-uri "second argument must be a uri" uri))
+	((not (uri? base)) (r6rs#assertion-violation 'relative-uri "first argument must be a uri" base))
+	((not (uri? uri)) (r6rs#assertion-violation 'relative-uri "second argument must be a uri" uri))