diff --git a/scheme/cyclone/macros.sld b/scheme/cyclone/macros.sld index 003a872f..0015636d 100644 --- a/scheme/cyclone/macros.sld +++ b/scheme/cyclone/macros.sld @@ -13,9 +13,6 @@ (scheme cyclone util) ) (export - define-syntax? - let-syntax? - letrec-syntax? macro:macro? macro:expand macro:add! @@ -51,15 +48,6 @@ (define (macro:get-defined-macros) *macro:defined-macros*) ;; Macro section - (define (define-syntax? exp) - (tagged-list? 'define-syntax exp)) - - (define (let-syntax? exp) - (tagged-list? 'let-syntax exp)) - - (define (letrec-syntax? exp) - (tagged-list? 'letrec-syntax exp)) - (define (macro:macro? exp defined-macros) (assoc (car exp) defined-macros)) (define (macro:expand exp macro mac-env rename-env) diff --git a/scheme/cyclone/util.sld b/scheme/cyclone/util.sld index 7fa9050b..897a4bef 100644 --- a/scheme/cyclone/util.sld +++ b/scheme/cyclone/util.sld @@ -11,6 +11,9 @@ (scheme char)) (export ;; Code analysis + define-syntax? + let-syntax? + letrec-syntax? tagged-list? if? if-syntax? @@ -120,7 +123,15 @@ (or (= (length exp) 3) (= (length exp) 4)))) - + +(define (define-syntax? exp) + (tagged-list? 'define-syntax exp)) + +(define (let-syntax? exp) + (tagged-list? 'let-syntax exp)) + +(define (letrec-syntax? exp) + (tagged-list? 'letrec-syntax exp)) ; begin? : exp -> boolean (define (begin? exp)