Add rexp abstraction.

diff --git a/v7/src/runtime/Makefile.in b/v7/src/runtime/Makefile.in
index 3eca68d1902506aaa9c060a62a67f2fa4b14dbf7..0c39e347ef869c615b9875b06d98b9dce4fa2188 100644 (file)
--- a/v7/src/runtime/Makefile.in
+++ b/v7/src/runtime/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.3 2000/12/25 05:43:32 cph Exp $
+# $Id: Makefile.in,v 1.4 2001/10/05 15:43:38 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -63,7 +63,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 AUXDIR = @AUXDIR@
 RODIR = $(AUXDIR)/options
 RUNOPTS = chrsyn cpress format gdbm hashtb krypt mime-codec numint optiondb \
-         ordvec process rbtree regexp rgxcmp syncproc wttree ystep
+         ordvec process rbtree regexp rexp rgxcmp syncproc wttree ystep
 
 all:
        echo "No ALL action"

diff --git a/v7/src/runtime/ed-ffi.scm b/v7/src/runtime/ed-ffi.scm
index 3833ffa7ecd145e11d07705893025dbe6f2f7888..5cb220c2f3430c39d6d6763a5d834d88057ae162 100644 (file)
--- a/v7/src/runtime/ed-ffi.scm
+++ b/v7/src/runtime/ed-ffi.scm
@@ -1,8 +1,8 @@
 #| -*- Scheme -*-
 
-$Id: ed-ffi.scm,v 1.24 2000/06/22 03:53:02 cph Exp $
+$Id: ed-ffi.scm,v 1.25 2001/10/05 15:43:40 cph Exp $
 
-Copyright (c) 1988-2000 Massachusetts Institute of Technology
+Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
 |#
 
 ;;;; Edwin buffer packaging info
@@ -223,6 +224,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                syntax-table/system-internal)
     ("rep"     (runtime rep)
                syntax-table/system-internal)
+    ("rexp"    (runtime rexp)
+               syntax-table/system-internal)
     ("rgxcmp"  (runtime regular-expression-compiler)
                syntax-table/system-internal)
     ("savres"  (runtime save/restore)

diff --git a/v7/src/runtime/optiondb.scm b/v7/src/runtime/optiondb.scm
index cd8b13a324451e82af6319c2e06a1e55d7329d8c..31b27d059e30fe62ba526ab7ad5dbfbf652326cb 100644 (file)
--- a/v7/src/runtime/optiondb.scm
+++ b/v7/src/runtime/optiondb.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: optiondb.scm,v 1.9 2000/06/08 16:31:45 cph Exp $
+$Id: optiondb.scm,v 1.10 2001/10/05 15:43:43 cph Exp $
 
-Copyright (c) 1994-2000 Massachusetts Institute of Technology
+Copyright (c) 1994-2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
 |#
 
 (declare (usual-integrations))
@@ -82,4 +83,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                          "chrsyn")
   (standard-option-loader '(RUNTIME REGULAR-EXPRESSION)
                          '(INITIALIZE-PACKAGE!)
-                         "regexp"))
\ No newline at end of file
+                         "regexp")
+  (standard-option-loader '(RUNTIME REXP)
+                         #F
+                         "rexp"))
\ No newline at end of file

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 588cc6fc897a55c8e778a908501b5f039f6de246..802c345abc32c57ae845fcd088406ab497b2df0e 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.376 2001/09/25 05:30:24 cph Exp $
+$Id: runtime.pkg,v 14.377 2001/10/05 15:43:46 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -3677,6 +3677,36 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
          re-quote-string
          re-translation-table))
 
+(define-package (runtime rexp)
+  (file-case options
+    ((load) "rexp")
+    (else))
+  (parent ())
+  (export ()
+         rexp*
+         rexp+
+         rexp->regexp
+         rexp-alternatives
+         rexp-any-char
+         rexp-case-fold
+         rexp-compile
+         rexp-group
+         rexp-line-end
+         rexp-line-start
+         rexp-not-syntax-char
+         rexp-not-word-char
+         rexp-not-word-edge
+         rexp-optional
+         rexp-sequence
+         rexp-string-end
+         rexp-string-start
+         rexp-syntax-char
+         rexp-word-char
+         rexp-word-edge
+         rexp-word-end
+         rexp-word-start
+         rexp?))
+
 (define-package (runtime char-syntax)
   (file-case options
     ((load) "chrsyn")