diff options
| -rw-r--r-- | tests/test-vikalpa.scm | 32 | ||||
| -rw-r--r-- | vikalpa.scm | 12 |
2 files changed, 22 insertions, 22 deletions
diff --git a/tests/test-vikalpa.scm b/tests/test-vikalpa.scm index 91e11f6..6561e17 100644 --- a/tests/test-vikalpa.scm +++ b/tests/test-vikalpa.scm @@ -197,7 +197,7 @@ (define-proof (predicate list?) (cdr-induction x) - ((rewrite (2) if-same (set x (list? (cdr x)))) + ((rewrite (2) if-same (= x (list? (cdr x)))) (rewrite (2 2 1) if-nest) (rewrite (2 2 2 2 1) list?) (rewrite (2 2 2 2 1 3 2) equal-if) @@ -210,7 +210,7 @@ (rewrite (2 3) if-true) (rewrite (2 3 1) list?) (rewrite (2 3 1 3) if-nest) - (rewrite (2 3) if-same (set x (null? x))) + (rewrite (2 3) if-same (= x (null? x))) (rewrite (2 3 2 1) if-nest) (rewrite (2 3 2) if-true) (rewrite (2 3 2 1 1) (substitute null?)) @@ -220,7 +220,7 @@ (rewrite (2 3) if-same) (rewrite (2) if-same) (rewrite (3 1) list?) - (rewrite (3) if-same (set x (null? x))) + (rewrite (3) if-same (= x (null? x))) (rewrite (3 2 1) if-nest) (rewrite (3 2) if-true) (rewrite (3 2 1 1) (substitute null?)) @@ -256,12 +256,12 @@ (define-proof (is list? (o not null?) pair?) ((rewrite (2) if-not) (rewrite (1) list?) - (rewrite () if-same (set x (null? x))) + (rewrite () if-same (= x (null? x))) (rewrite (2 1) if-nest) (rewrite (2) if-true) (rewrite (2) if-nest) (rewrite (3 1) if-nest) - (rewrite (3) if-same (set x (pair? x))) + (rewrite (3) if-same (= x (pair? x))) (rewrite (3 2 1) if-nest) (rewrite (3 2 2 3 1) (predicate pair?)) (rewrite (3 2 2 3) equal-same) @@ -273,7 +273,7 @@ (rewrite () if-same))) (define-proof (is-not pair? null?) - ((rewrite () if-same (set x (null? x))) + ((rewrite () if-same (= x (null? x))) (rewrite (2 1 1) (substitute null?)) (eval (2 1)) (rewrite (2) if-false) @@ -283,7 +283,7 @@ (rewrite () if-same))) (define-proof (is list? pair? (o list? cdr)) - ((rewrite () if-same (set x (pair? x))) + ((rewrite () if-same (= x (pair? x))) (rewrite (2 2) if-nest) (rewrite (3 2) if-nest) (rewrite (3) if-same) @@ -300,7 +300,7 @@ (size x) ((rewrite (2 2 1) (natural? size)) (rewrite (2 2) if-true) - (rewrite (2 2 3) if-same (set x (pair? x))) + (rewrite (2 2 3) if-same (= x (pair? x))) (rewrite (2 2 3 2) (< size cdr)) (rewrite (2 2 3 1) (is list? (o not null?) pair?)) (rewrite (2 2 3) if-true) @@ -321,12 +321,12 @@ (define-proof (is list? (o not pair?) null?) ((rewrite (2) if-not) - (rewrite () if-same (set x (pair? x))) + (rewrite () if-same (= x (pair? x))) (rewrite (2 2) if-nest) (rewrite (2) if-same) (rewrite (3 2) if-nest) (rewrite (3 1) list?) - (rewrite (3) if-same (set x (null? x))) + (rewrite (3) if-same (= x (null? x))) (rewrite (3 2 1) if-nest) (rewrite (3 2) if-true) (rewrite (3 2 1) (predicate null?)) @@ -345,7 +345,7 @@ (define-proof (associative append) (cdr-induction x) - ((rewrite (3 2 2 2) if-same (set x (null? x))) + ((rewrite (3 2 2 2) if-same (= x (null? x))) (rewrite (3 2 2 2 2 1 1 1) (substitute null?)) (rewrite (3 2 2 2 2 2 1) (substitute null?)) (rewrite (3 2 2 2 1) (is list? (o not pair?) null?)) @@ -356,7 +356,7 @@ (rewrite (3 2 2) if-same) (rewrite (3 2) if-same) (rewrite (3) if-same) - (rewrite (2) if-same (set x (list? y))) + (rewrite (2) if-same (= x (list? y))) (rewrite (2 2 1 2) if-nest) (rewrite (2 2 2 2) if-nest) (rewrite (2 3 1 2) if-nest) @@ -364,7 +364,7 @@ (rewrite (2 3 1) if-same) (rewrite (2 3) if-true) (rewrite (2 3) if-same) - (rewrite (2 2) if-same (set x (list? z))) + (rewrite (2 2) if-same (= x (list? z))) (rewrite (2 2 2 1 2) if-nest) (rewrite (2 2 2 2 2) if-nest) (rewrite (2 2 3 1 2) if-nest) @@ -372,7 +372,7 @@ (rewrite (2 2 3 1) if-same) (rewrite (2 2 3) if-true) (rewrite (2 2 3) if-same) - (rewrite (2 2 2) if-same (set x (list? (cdr x)))) + (rewrite (2 2 2) if-same (= x (list? (cdr x)))) (rewrite (2 2 2 2 1) if-nest) (rewrite (2 2 2 3 1) if-nest) (rewrite (2 2 2 3) if-true) @@ -385,7 +385,7 @@ (rewrite (2 2 2 2 2 2 1 1) if-false) (rewrite (2 2 2 2 2 2 1) append) (rewrite (2 2 2 2 2 2 1) if-same - (set x (pair? (cons (car x) (append (cdr x) y))))) + (= x (pair? (cons (car x) (append (cdr x) y))))) (rewrite (2 2 2 2 2 2 1 2 1) (is-not pair? null?)) (rewrite (2 2 2 2 2 2 1 1) (pair? cons)) (rewrite (2 2 2 2 2 2 1) if-true) @@ -395,7 +395,7 @@ (rewrite (2 2 2 2 2 2) equal-same) (rewrite (2 2 2 2 2) if-same) (rewrite (2 2 2 2) if-same) - (rewrite (2 2 2) if-same (set x (list? x))) + (rewrite (2 2 2) if-same (= x (list? x))) (rewrite (2 2 2 2 1) (is list? pair? (o list? cdr))) (rewrite (2 2 2 2) if-true) (rewrite (2 2 2 3 3) if-nest) diff --git a/vikalpa.scm b/vikalpa.scm index eadd2a0..290b90d 100644 --- a/vikalpa.scm +++ b/vikalpa.scm @@ -741,10 +741,10 @@ (define (command-option? x) (and (pair? x) (case (car x) - ((set) (and (list? x) - (= 3 (length x)) - (variable? (list-ref x 1)) - (expression? (list-ref x 2)))) + ((=) (and (list? x) + (= 3 (length x)) + (variable? (list-ref x 1)) + (expression? (list-ref x 2)))) (else #f)))) (define (command-name x) @@ -815,7 +815,7 @@ (receive (env) (parse-options/theorem (cdr ops) fail) (case (caar ops) - ((set) + ((=) (let ((op (car ops))) (cons (cons (list-ref op 1) (list-ref op 2)) @@ -1371,7 +1371,7 @@ (('rewrite _ _ . command-ops) (for-each (lambda (x) (match x - (('set var expr) + (('= var expr) (validate-expression sys `(define-proof ,(get-name d)) (get-variables d) |