From a725292a4d3436726fa62b1770a30976f38358ab Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Wed, 19 Dec 2007 17:39:26 -0500
Subject: [PATCH] moved match.ss and pregexp.ss to the lib directory and
 modified lib/Makefile.am accordingly

---
 lib/Makefile.am                | 2 +-
 lib/Makefile.in                | 2 +-
 {other-libs => lib}/match.ss   | 0
 {other-libs => lib}/pregexp.ss | 0
 other-libs/test-match.ss       | 2 --
 scheme/last-revision           | 2 +-
 6 files changed, 3 insertions(+), 5 deletions(-)
 rename {other-libs => lib}/match.ss (100%)
 rename {other-libs => lib}/pregexp.ss (100%)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4dbdb78..cac397a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 libstreamsdir=$(pkglibdir)/streams
 dist_libstreams_DATA=streams/primitive.ss streams/derived.ss
 
-dist_pkglib_DATA=streams.ss
+dist_pkglib_DATA=streams.ss match.ss pregexp.ss
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index bd1b47e..4798dc0 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -159,7 +159,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libstreamsdir = $(pkglibdir)/streams
 dist_libstreams_DATA = streams/primitive.ss streams/derived.ss
-dist_pkglib_DATA = streams.ss
+dist_pkglib_DATA = streams.ss match.ss pregexp.ss
 all: all-am
 
 .SUFFIXES:
diff --git a/other-libs/match.ss b/lib/match.ss
similarity index 100%
rename from other-libs/match.ss
rename to lib/match.ss
diff --git a/other-libs/pregexp.ss b/lib/pregexp.ss
similarity index 100%
rename from other-libs/pregexp.ss
rename to lib/pregexp.ss
diff --git a/other-libs/test-match.ss b/other-libs/test-match.ss
index b8dbaf2..6dd7bc1 100755
--- a/other-libs/test-match.ss
+++ b/other-libs/test-match.ss
@@ -13,8 +13,6 @@
        (cond
          ((assq x env) => cdr)
          (else (error 'ee "unbound variable" x)))]
-      ;[(let ([,x* ,v*] ...) ,b)
-      ; (ee b (append (map cons x* (map (lambda (x) (ee x env)) v*)) env))]
       [(let ([,x* ,[v*]] ...) ,b)
        (ee b (append (map cons x* v*) env))]
       [(+ ,[x] ,[y]) (+ x y)]
diff --git a/scheme/last-revision b/scheme/last-revision
index d07807c..c686973 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1265
+1267