Published scheme17 and uploaded the first public version of aps

7 files changed, 14 insertions, 15 deletions

diff --git a/scheme/Makefile b/scheme/Makefile
index f69b528..0d3be32 100644
--- a/scheme/Makefile
+++ b/scheme/Makefile
@@ -1,4 +1,4 @@
 upload:
 	python make_sweet_macros.py
-	zip -r aps aps/README.txt sweet-macros aps/compat.ikarus.sls aps/compat.ypsilon.sls aps/cut.sls aps/easy-test.sls aps/list-utils.sls aps/repeat.sls
-	#scp aps.zip merlin.phyast.pitt.edu:public_html/scheme
+	zip -r aps aps/README.txt sweet-macros/main.sls sweet-macros/main.mzscheme.sls sweet-macros/helper1.mzscheme.sls sweet-macros/helper2.mzscheme.sls sweet-macros/helper3.mzscheme.sls aps/compat.ikarus.sls aps/compat.ypsilon.sls aps/compat.mzscheme.sls aps/cut.sls aps/easy-test.sls aps/list-utils.sls aps/repeat.sls
+	scp aps.zip merlin.phyast.pitt.edu:public_html/scheme
diff --git a/scheme/aps/compat.mzscheme.sls b/scheme/aps/compat.mzscheme.sls
index b08f3f0..3c9c5ee 100644
--- a/scheme/aps/compat.mzscheme.sls
+++ b/scheme/aps/compat.mzscheme.sls
@@ -1,7 +1,4 @@
 #!r6rs
 (library (aps compat)
-(export (rename (mzscheme:printf printf)
-                (mzscheme:format format)
-                (mzscheme:gensym gensym)
-                (mzscheme:pretty-print pretty-print)))
-(import (rnrs) (prefix (scheme) mzscheme:)))
+(export printf format gensym pretty-print)
+(import (rnrs) (only (scheme) printf format gensym pretty-print)))
diff --git a/scheme/aps/list-utils.sls b/scheme/aps/list-utils.sls
index 3358407..faeecde 100644
--- a/scheme/aps/list-utils.sls
+++ b/scheme/aps/list-utils.sls
@@ -1,6 +1,6 @@
 #!r6rs
 (library (aps list-utils)
-(export range enumerate zip transpose distinct? let+ perm
+(export range enumerate zip transpose distinct? let+ perm list-of-aux
         remove-dupl append-unique fold flatten list-of)
 (import (rnrs) (sweet-macros) (aps cut))
 
diff --git a/scheme/aps/test-all.ss b/scheme/aps/test-all.ss
index c4eab80..f032c96 100644
--- a/scheme/aps/test-all.ss
+++ b/scheme/aps/test-all.ss
@@ -17,10 +17,12 @@
    (test "zip"
          (zip '(a b c) '(1 2 3))
          '((a 1) (b 2) (c 3)))
-   
+
+   ;;ZIP-WITH-ERROR
    (test "zip-with-error"
          (catch-error (zip '(a b c) '(1 2)))
          "length mismatch")
+   ;;END
    
    (test "zip3"
          (zip '(a b) '(1 2) '(X Y))
diff --git a/scheme/sweet-macros/helper1.mzscheme.sls b/scheme/sweet-macros/helper1.mzscheme.sls
index 7c58613..06f52f5 100644
--- a/scheme/sweet-macros/helper1.mzscheme.sls
+++ b/scheme/sweet-macros/helper1.mzscheme.sls
@@ -8,8 +8,8 @@
     (syntax-case x (syntax-match)
       ((local expr)
        #'expr)
-      ((local (let-form name value) ... (syntax-match rest ...))
-       #'(syntax-match (local (let-form name value) ...) rest ...))
+      ((local (let-form name value) ... (syntax-match b0 b1 b2 ...))
+       #'(syntax-match (local (let-form name value) ...) b0 b1 b2 ...))
       ((local (let-form name value) (l n v) ... expr)
        #'(let-form ((name value)) (local (l n v) ... expr))))
     ))
diff --git a/scheme/sweet-macros/helper2.mzscheme.sls b/scheme/sweet-macros/helper2.mzscheme.sls
index c9b9e2b..55d2f22 100644
--- a/scheme/sweet-macros/helper2.mzscheme.sls
+++ b/scheme/sweet-macros/helper2.mzscheme.sls
@@ -16,10 +16,10 @@
            ((ctx <patterns>)
             #''((... (... patt)) ...))
            ((ctx <source>)
-            #''(self (local (let-form name value) ...) ((... (... literal)) ...)
+            #''(self (local (let-form name value) ...) (literal ...)
                      (... (... (sub patt skel . rest))) ...))
            ((ctx <transformer>)
-            #'(self (local (let-form name value) ...) ((... (... literal)) ...)
+            #'(self (local (let-form name value) ...) (literal ...)
                     (... (... (sub patt skel . rest))) ...))
            (patt skel . rest) ...))
      (for-all identifier? #'(literal ...))
diff --git a/scheme/sweet-macros/main.sls b/scheme/sweet-macros/main.sls
index 1bc94fd..7542190 100644
--- a/scheme/sweet-macros/main.sls
+++ b/scheme/sweet-macros/main.sls
@@ -8,8 +8,8 @@
     (syntax-case x (syntax-match)
       ((local expr)
        #'expr)
-      ((local (let-form name value) ... (syntax-match rest ...))
-       #'(syntax-match (local (let-form name value) ...) rest ...))
+      ((local (let-form name value) ... (syntax-match b0 b1 b2 ...))
+       #'(syntax-match (local (let-form name value) ...) b0 b1 b2 ...))
       ((local (let-form name value) (l n v) ... expr)
        #'(let-form ((name value)) (local (l n v) ... expr))))
     ))