From ff875a067d3633448df0d3c0a39d99ad12295710 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 22 Apr 2016 19:37:13 -0700 Subject: [PATCH] Rename param:base-uri to uri-merge-defaults. --- src/runtime/runtime.pkg | 2 +- src/runtime/url.scm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg index 9cf8bbb66..15380de2c 100644 --- a/src/runtime/runtime.pkg +++ b/src/runtime/runtime.pkg @@ -5415,7 +5415,6 @@ USA. make-uri make-uri-authority merge-uris - param:base-uri parse-absolute-uri parse-partial-absolute-uri parse-partial-uri @@ -5450,6 +5449,7 @@ USA. uri-authority? uri-fragment uri-host? + uri-merge-defaults uri-path uri-path-absolute? uri-path-relative? diff --git a/src/runtime/url.scm b/src/runtime/url.scm index 5606a78b6..07b5a0212 100644 --- a/src/runtime/url.scm +++ b/src/runtime/url.scm @@ -196,7 +196,7 @@ USA. (compute-base-uri base-uri 'MERGE-URIS))) (define (compute-base-uri base-uri caller) - (let ((default (param:base-uri))) + (let ((default (uri-merge-defaults))) (if default (if (default-object? base-uri) default @@ -209,12 +209,12 @@ USA. (error "Must supply a base URI for merging:" caller)) (->absolute-uri base-uri caller))))) -(define param:base-uri) -(define (make-param:base-uri) +(define uri-merge-defaults) +(define (make-uri-merge-defaults) (make-parameter #f (lambda (object) (and object - (->absolute-uri object 'param:base-uri))))) + (->absolute-uri object 'uri-merge-defaults))))) (define (%merge-uris uri base-uri) (cond ((uri-scheme uri) @@ -930,7 +930,7 @@ USA. (char-set-union url:char-set:unreserved (string->char-set ";/?:@&="))) - (set! param:base-uri (make-param:base-uri)) + (set! uri-merge-defaults (make-uri-merge-defaults)) unspecific) ;;;; Partial URIs -- 2.25.1