Rename REXP-0*N to REXP-*N.

diff --git a/v7/src/runtime/rexp.scm b/v7/src/runtime/rexp.scm
index fcfd3b97bf7e5402258cde994465c7ce68c84b37..d13253a2c09516303a43f7ecef6a68be7f716a84 100644 (file)
--- a/v7/src/runtime/rexp.scm
+++ b/v7/src/runtime/rexp.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: rexp.scm,v 1.23 2005/05/30 02:45:04 cph Exp $
+$Id: rexp.scm,v 1.24 2005/06/05 19:28:16 cph Exp $
 
 Copyright 2000,2001,2002,2005 Massachusetts Institute of Technology
 
@@ -254,7 +254,7 @@ USA.
 (define (rexp-n*n n . rexps)
   (apply rexp-n*m n n rexps))
 
-(define (rexp-0*n n . rexps)
+(define (rexp-*n n . rexps)
   (apply rexp-n*m 0 n rexps))
 
 (define (rexp-n* n . rexps)

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index d82faf589bfc0b945765a3a79581b0d875dc01dd..f3d2f2953cc49fd0b03b569599c61e2ed875cd25 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.554 2005/06/03 13:32:27 cph Exp $
+$Id: runtime.pkg,v 14.555 2005/06/05 19:28:25 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology
@@ -4504,7 +4504,7 @@ USA.
   (export ()
          rexp*
          rexp+
-         rexp-0*n
+         rexp-*n
          rexp->regexp
          rexp-alternatives
          rexp-any-char

diff --git a/v7/src/runtime/url.scm b/v7/src/runtime/url.scm
index ad35885425d0734fb32066cb1593416610ce2d17..226f1bc2fdfa8cb1f4e580958d04a48d28fe1f62 100644 (file)
--- a/v7/src/runtime/url.scm
+++ b/v7/src/runtime/url.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: url.scm,v 1.33 2005/06/04 23:48:25 cph Exp $
+$Id: url.scm,v 1.34 2005/06/05 19:28:32 cph Exp $
 
 Copyright 2000,2001,2003,2004,2005 Massachusetts Institute of Technology
 
@@ -732,15 +732,15 @@ USA.
        (alt rexp-alternatives)
        (seq rexp-sequence)
        (? rexp-optional))
-    (alt (seq                                   (rexp-n*n 6 h16 ":") ls32)
-        (seq                              "::" (rexp-n*n 5 h16 ":") ls32)
-        (seq (?                      h16) "::" (rexp-n*n 4 h16 ":") ls32)
-        (seq (? (rexp-0*n 1 h16 ":") h16) "::" (rexp-n*n 3 h16 ":") ls32)
-        (seq (? (rexp-0*n 2 h16 ":") h16) "::" (rexp-n*n 2 h16 ":") ls32)
-        (seq (? (rexp-0*n 3 h16 ":") h16) "::" (rexp-n*n 1 h16 ":") ls32)
-        (seq (? (rexp-0*n 4 h16 ":") h16) "::"                      ls32)
-        (seq (? (rexp-0*n 5 h16 ":") h16) "::"                      h16 )
-        (seq (? (rexp-0*n 6 h16 ":") h16) "::"                          ))))
+    (alt (seq                                  (rexp-n*n 6 h16 ":") ls32)
+        (seq                             "::" (rexp-n*n 5 h16 ":") ls32)
+        (seq (?                     h16) "::" (rexp-n*n 4 h16 ":") ls32)
+        (seq (? (rexp-*n 1 h16 ":") h16) "::" (rexp-n*n 3 h16 ":") ls32)
+        (seq (? (rexp-*n 2 h16 ":") h16) "::" (rexp-n*n 2 h16 ":") ls32)
+        (seq (? (rexp-*n 3 h16 ":") h16) "::" (rexp-n*n 1 h16 ":") ls32)
+        (seq (? (rexp-*n 4 h16 ":") h16) "::"                      ls32)
+        (seq (? (rexp-*n 5 h16 ":") h16) "::"                      h16 )
+        (seq (? (rexp-*n 6 h16 ":") h16) "::"                          ))))
 
 (define (uri-rexp:h16)
   (rexp-n*m 1 4 char-set:uri-hex))