From 2c17e66b551cc46237d9d213a443e03fb8de7c1b Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 31 Jan 2018 12:53:33 -0500
Subject: [PATCH] Cleanup

---
 match-simple.scm                              | 200 ------------------
 .../debug/match-test2.scm                     |   0
 match-test.scm => tests/match-tests.scm       |   0
 3 files changed, 200 deletions(-)
 delete mode 100644 match-simple.scm
 rename match-test2.scm => tests/debug/match-test2.scm (100%)
 rename match-test.scm => tests/match-tests.scm (100%)

diff --git a/match-simple.scm b/match-simple.scm
deleted file mode 100644
index 5e941fc5..00000000
--- a/match-simple.scm
+++ /dev/null
@@ -1,200 +0,0 @@
-;; A temporary test file, based on code from:
-;; http://synthcode.com/scheme/match-simple.scm
-;; See also - https://github.com/LemonBoy/matchable-egg/blob/master/match.scm
-(import (scheme base) (scheme write))
-
-(define-syntax match
-  (syntax-rules ()
-    ((match expr (pat . body) ...)
-     (match-gen-labels expr start () (pat . body) ...))))
-
-(define-syntax match-gen-labels
-  (syntax-rules (=>)
-    ((_ expr label ((k1 fk1 pat1 . body1) (k fk pat . body) ...))
-     (let ((tmp expr))
-       (letrec ((k (lambda () (match-one tmp pat (begin . body) (fk)))) ...
-                (label (lambda () (error "no matches" tmp))))
-         (match-one tmp pat1 (begin . body1) (fk1)))))
-    ((_ expr label (labels ...) (pat (=> fk) . body) . rest)
-     (match-gen-labels expr fk (labels ... (label fk pat . body)) . rest))
-    ((_ expr label (labels ...) (pat . body) . rest)
-     (match-gen-labels expr fail (labels ... (label fail pat . body)) . rest))
-    ))
-
-(define-syntax match-one
-  (syntax-rules (_ ___ quote ? and or not)
-    ((match-one var () sk fk)
-     (if (null? var) sk fk))
-    ((match-one var (quote a) sk fk)
-     (if (equal? var 'a) sk fk))
-    ((match-one var (and) sk fk) sk)
-    ((match-one var (and a b ...) sk fk)
-     (match-one var a (match-one var (and b ...) sk fk) fk))
-    ((match-one var (or) sk fk) fk)
-    ((match-one var (or a ...) sk fk)
-     (let ((sk2 (lambda () sk)))
-       (match-one var (not (and (not a) ...)) (sk2) fk)))
-    ((match-one var (not a) sk fk)
-     (match-one var a fk sk))
-    ((match-one var (? pred a ...) sk fk)
-     (if (pred var) (match-one var (and a ...) sk fk) fk))
-    ((match-one var (a ___) sk fk)
-     (match-extract-variables a (match-gen-ellipses var a sk fk) ()))
-    ((match-one var (a) sk fk)
-     (if (and (pair? var) (null? (cdr var)))
-       (let ((tmp (car var)))
-         (match-one tmp a sk fk))
-       fk))
-    ((match-one var (a . b) sk fk)
-     (if (pair? var)
-       (let ((tmp1 (car var)))
-         (match-one tmp1 a (let ((tmp2 (cdr var))) (match-one tmp2 b sk fk)) fk))
-       fk))
-    ((match-one var #(a ...) sk fk)
-     (if (vector? var)
-       (let ((ls (vector->list var)))
-         (match-one ls (a ...) sk fk))
-       fk))
-    ((match-one var _ sk fk) sk)
-    ((match-one var x sk fk)
-     (let-syntax ((sym?
-                   (syntax-rules ()
-                     ((sym? x) (let ((x var)) sk))
-                     ((sym? y) (if (equal? var x) sk fk)))))
-       (sym? abracadabra)))  ; thanks Oleg
-    ))
-
-(define-syntax match-gen-ellipses
-  (syntax-rules ()
-    ((_ var a sk fk ((v v-ls) ...))
-     (let loop ((ls var) (v-ls '()) ...)
-       (cond ((null? ls)
-              (let ((v (reverse v-ls)) ...) sk))
-             ((pair? ls)
-              (let ((x (car ls)))
-                (match-one x a (loop (cdr ls) (cons v v-ls) ...) fk)))
-             (else
-              fk))))
-    ))
-
-(define-syntax match-extract-variables
-  (syntax-rules (_ ___ quote ? and or not)
-    ((_ (a . b) k v)
-     (match-extract-variables a (match-extract-variables-step b k v) ()))
-    ((_ #(a ...) k v)
-     (match-extract-variables (a ...) k v))
-    ((_ a (k ...) (v ...))
-     (let-syntax ((sym?
-                   (syntax-rules ()
-                     ((sym? a) (k ... (v ... (a a-ls))))
-                     ((sym? b) (k ... (v ...))))))
-       (sym? abracadabra)))
-    ))
-
-(define-syntax match-extract-variables-step
-  (syntax-rules ()
-    ((_ a k (v ...) (v2 ...))
-     (match-extract-variables a k (v ... v2 ...)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; gimme some sugar baby
-
-(define-syntax match-lambda
-  (syntax-rules ()
-    ((_ clause ...) (lambda (expr) (match expr clause ...)))))
-
-;(define-syntax match-lambda*
-;  (syntax-rules ()
-;    ((_ clause ...) (lambda expr (match expr clause ...)))))
-;
-;(define-syntax match-let
-;  (syntax-rules ()
-;    ((_ ((pat expr)) . body)
-;     (match expr (pat . body)))
-;    ((_ ((pat expr) ...) . body)
-;     (match (list expr ...) ((pat ...) . body)))
-;    ((_ loop . rest)
-;     (match-named-let loop () . rest))
-;    ))
-;
-;(define-syntax match-named-let
-;  (syntax-rules ()
-;    ((_ loop ((pat expr var) ...) () . body)
-;     (let loop ((var expr) ...)
-;       (match-let ((pat var) ...)
-;         . body)))
-;    ((_ loop (v ...) ((pat expr) . rest) . body)
-;     (match-named-let loop (v ... (pat expr tmp)) rest . body))
-;    ))
-;
-;(define-syntax match-letrec
-;  (syntax-rules ()
-;    ((_ vars . body) (match-letrec-helper () vars . body))))
-;
-;(define-syntax match-letrec-helper
-;  (syntax-rules ()
-;    ((_ ((pat expr var) ...) () . body)
-;     (letrec ((var expr) ...)
-;       (match-let ((pat var) ...)
-;         . body)))
-;    ((_ (v ...) ((pat expr) . rest) . body)
-;     (match-letrec-helper (v ... (pat expr tmp)) rest . body))
-;    ))
-;
-;(define-syntax match-let*
-;  (syntax-rules ()
-;    ((_ () . body)
-;     (begin . body))
-;    ((_ ((pat expr) . rest) . body)
-;     (match expr (pat (match-let* rest . body))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; match-simple ends, this is the unit test section:
-
-;(define tst
-;  (match-lambda
-;     ((a b) (vector 'fromlist a b))
-;     ((? string? x) x)
-;     ((X #f))))
-;
-;(display (match (list 1 2 3) ((a b c) b)))
-;(display (tst '(1 2)))
-;(display (tst "gehtdurch"))
-;(display (tst 42))
-
-;(display (match-one '(a . b) (? pair? x) 1 0))
-#;(display (match 
-           "test"
-           ;'(c . d) ;;"test" 
-           ;((? pair? x) x)
-           ((? string? x) x)
-           (_ 'no-match)
-          ))
-
-(display (match (list 1 2 3) ((a b c) b)) )(newline)
-(display (match (list 1 2 1) ((a a b) 1) ((a b a) 2)))(newline)
-(display (match (list 1 2 1) ((_ _ b) 1) ((a b a) 2)) )(newline)
-(display (match 'a ('b 1) ('a 2)) )(newline)
-;(display (match (list 1 2 3) (`(1 ,b ,c) (list b c))) )(newline)
-;(display (match (list 1 2) ((1 2 3 ...) #t)) )(newline)
-;(display (match (list 1 2 3) ((1 2 3 ...) #t)) )(newline)
-;(display (match (list 1 2 3 3 3) ((1 2 3 ...) #t)) )(newline)
-;(display (match (list 1 2) ((a b c ...) c)) )(newline)
-;(display (match (list 1 2 3) ((a b c ...) c)) )(newline)
-;(display (match (list 1 2 3 4 5) ((a b c ...) c)) )(newline)
-;(display (match (list 1 2 3 4) ((a b c ... d e) c)) )(newline)
-;(display (match (list 1 2 3 4 5) ((a b c ... d e) c)) )(newline)
-;(display (match (list 1 2 3 4 5 6 7) ((a b c ... d e) c)) )(newline)
-;(display (match (list 1 2) ((a b c ..1) c)) )(newline)
-;(display (match (list 1 2 3) ((a b c ..1) c)) )(newline)
-(display (match 1 ((and) #t)) )(newline)
-(display (match 1 ((and x) x)) )(newline)
-(display (match 1 ((and x 1) x)) )(newline)
-(display (match 1 ((or) #t) (else #f)) )(newline)
-;(display (match 1 ((or x) x)) )(newline)
-;(display (match 1 ((or x 2) x)) )(newline)
-(display (match 1 ((not 2) #t)) )(newline)
-(display (match 1 ((? odd? x) x)) )(newline)
-;(display (match '(1 . 2) ((= car x) x)) )(newline)
-;(display (match 4 ((= square x) x)) )(newline)
-
diff --git a/match-test2.scm b/tests/debug/match-test2.scm
similarity index 100%
rename from match-test2.scm
rename to tests/debug/match-test2.scm
diff --git a/match-test.scm b/tests/match-tests.scm
similarity index 100%
rename from match-test.scm
rename to tests/match-tests.scm