From 176ebba1e547594ce219719ef67993a478bbd9d8 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sat, 26 Jul 2008 22:51:29 +0000 Subject: [PATCH] Export STRING-IS-MIME-TOKEN? and STRING-IS-MIME-TYPE?, and add substring args to them. --- v7/src/runtime/runtime.pkg | 6 ++++-- v7/src/runtime/sfile.scm | 16 +++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg index 749b04b1e..d1e994671 100644 --- a/v7/src/runtime/runtime.pkg +++ b/v7/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.652 2008/07/26 05:45:35 cph Exp $ +$Id: runtime.pkg,v 14.653 2008/07/26 22:51:15 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -484,7 +484,9 @@ USA. pathname-type->mime-type rename-file soft-link-file - string->mime-type) + string->mime-type + string-is-mime-token? + string-is-mime-type?) (initialization (initialize-package!))) (define-package (runtime symbol) diff --git a/v7/src/runtime/sfile.scm b/v7/src/runtime/sfile.scm index c71c26f12..ce9526d7b 100644 --- a/v7/src/runtime/sfile.scm +++ b/v7/src/runtime/sfile.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: sfile.scm,v 14.43 2008/01/30 20:02:35 cph Exp $ +$Id: sfile.scm,v 14.44 2008/07/26 22:51:29 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -344,9 +344,10 @@ USA. (and (string? object) (string-is-mime-type? object))) -(define (string-is-mime-type? string) - (let ((end (string-length string))) - (let ((i (check-mime-token-syntax string 0 end))) +(define (string-is-mime-type? string #!optional start end) + (let ((start (if (default-object? start) 0 start)) + (end (if (default-object? end) (string-length string) end))) + (let ((i (check-mime-token-syntax string start end))) (and (fix:> i 0) (fix:< i end) (char=? (string-ref string i) #\/) @@ -362,9 +363,10 @@ USA. (and (string? object) (string-is-mime-token? object))) -(define (string-is-mime-token? string) - (let ((end (string-length string))) - (fix:= end (check-mime-token-syntax string 0 end)))) +(define (string-is-mime-token? string #!optional start end) + (let ((start (if (default-object? start) 0 start)) + (end (if (default-object? end) (string-length string) end))) + (fix:= end (check-mime-token-syntax string start end)))) (define (check-mime-token-syntax string start end) (let loop ((i start)) -- 2.25.1