From e199facf398cc533cf8a574e5c0ba3285473cd2e Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 10 Mar 2006 01:46:26 +0000
Subject: [PATCH] Don't bother making URIs work with FASDUMP/FASLOAD -- doing
 so breaks interning.  Fixing this is relatively hard.

---
 v7/src/runtime/runtime.pkg |  4 +++-
 v7/src/runtime/url.scm     | 24 +++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 658aa273b..e8783f65c 100644
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.581 2006/03/09 19:30:04 cph Exp $
+$Id: runtime.pkg,v 14.582 2006/03/10 01:46:20 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology
@@ -4810,6 +4810,8 @@ USA.
 	  ->relative-uri
 	  ->uri
 	  <partial-uri>
+	  <uri-authority>
+	  <uri>
 	  absolute-uri?
 	  char-set:uri-alpha
 	  char-set:uri-digit
diff --git a/v7/src/runtime/url.scm b/v7/src/runtime/url.scm
index 410ad1f95..cf20789fb 100644
--- a/v7/src/runtime/url.scm
+++ b/v7/src/runtime/url.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: url.scm,v 1.45 2006/03/09 19:30:05 cph Exp $
+$Id: url.scm,v 1.46 2006/03/10 01:46:26 cph Exp $
 
 Copyright 2000,2001,2003,2004,2005,2006 Massachusetts Institute of Technology
 
@@ -31,8 +31,7 @@ USA.
 (declare (usual-integrations))
 
 (define-structure (uri
-		   (type vector)
-		   (named '|#[(runtime uri)uri]|)
+		   (type-descriptor <uri>)
 		   (constructor %%make-uri)
 		   (conc-name %uri-)
 		   (print-procedure
@@ -140,8 +139,7 @@ USA.
   (not (path-absolute? path)))
 
 (define-structure (uri-authority
-		   (type vector)
-		   (named '|#[(runtime uri)uri-authority]|)
+		   (type-descriptor <uri-authority>)
 		   (constructor %%make-uri-authority)
 		   (conc-name %uri-authority-)
 		   (print-procedure
@@ -221,12 +219,12 @@ USA.
 	    '())
       ,@(if (%uri-authority uri)
 	    (let ((a (%uri-authority uri)))
-	      `(,@(if (uri-authority-userinfo a)
-		      `((userinfo ,(uri-authority-userinfo a)))
+	      `(,@(if (%uri-authority-userinfo a)
+		      `((userinfo ,(%uri-authority-userinfo a)))
 		      '())
-		(host ,(uri-authority-host a))
-		,@(if (uri-authority-port a)
-		      `((port ,(uri-authority-port a)))
+		(host ,(%uri-authority-host a))
+		,@(if (%uri-authority-port a)
+		      `((port ,(%uri-authority-port a)))
 		      '())))
 	    '())
       (path ,(%uri-path uri))
@@ -620,9 +618,9 @@ USA.
 	(write-encoded fragment char-set:uri-fragment port))))
 
 (define (write-authority authority port)
-  (%write-authority (uri-authority-userinfo authority)
-		    (uri-authority-host authority)
-		    (uri-authority-port authority)
+  (%write-authority (%uri-authority-userinfo authority)
+		    (%uri-authority-host authority)
+		    (%uri-authority-port authority)
 		    port))
 
 (define (%write-authority userinfo host port output)
-- 
2.25.1