diff --git a/cyclone.scm b/cyclone.scm index daa88753..aac30b65 100644 --- a/cyclone.scm +++ b/cyclone.scm @@ -274,7 +274,7 @@ (in-prog (read-file in-file)) (program? (not (library? (car in-prog)))) (lib-deps - (if (my-and program? + (if (and program? (tagged-list? 'import (car in-prog))) (lib:get-all-import-deps (cdar in-prog)) '())) diff --git a/scheme/base.sld b/scheme/base.sld index fadfb5ea..8b3043ee 100644 --- a/scheme/base.sld +++ b/scheme/base.sld @@ -80,14 +80,14 @@ flush-output-port read-line features - my-and - my-or + and + or ) (begin ;; Features implemented by this Scheme (define (features) '(cyclone r7rs exact-closed)) - (define-syntax my-and + (define-syntax and (er-macro-transformer (lambda (expr rename compare) (cond ((null? (cdr expr)) #t) @@ -95,7 +95,7 @@ (else (list (rename 'if) (cadr expr) (cons (rename 'and) (cddr expr)) #f)))))) - (define-syntax my-or + (define-syntax or (er-macro-transformer (lambda (expr rename compare) (cond ((null? (cdr expr)) #f) diff --git a/scheme/cyclone/transforms.sld b/scheme/cyclone/transforms.sld index 5e2ff45e..46b07545 100644 --- a/scheme/cyclone/transforms.sld +++ b/scheme/cyclone/transforms.sld @@ -139,22 +139,6 @@ (define (get-macros) *defined-macros*) (define *defined-macros* (list - (cons 'and - (lambda (expr rename compare) - (cond ((null? (cdr expr)) #t) - ((null? (cddr expr)) (cadr expr)) - (else (list (rename 'if) (cadr expr) - (cons (rename 'and) (cddr expr)) - #f))))) - (cons 'or - (lambda (expr rename compare) - (cond ((null? (cdr expr)) #f) - ((null? (cddr expr)) (cadr expr)) - (else - (list (rename 'let) (list (list (rename 'tmp) (cadr expr))) - (list (rename 'if) (rename 'tmp) - (rename 'tmp) - (cons (rename 'or) (cddr expr)))))))) ; (cons 'let (lambda (exp rename compare) (let=>lambda exp))) (cons 'let (lambda (expr rename compare)