From 16a217abf0520e1da95cb7db4da09383b6a1ba08 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Mon, 21 May 2018 18:24:55 -0400 Subject: [PATCH] Handle input in AST form --- find-named-lets.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/find-named-lets.scm b/find-named-lets.scm index f88dcded..ce911bf6 100644 --- a/find-named-lets.scm +++ b/find-named-lets.scm @@ -49,22 +49,22 @@ (cond ((and-let* ( ;; Find lambda with initial #f assignment - ((lambda? (car exp))) + ((ast:lambda? (car exp))) ((pair? (cdr exp))) ((not (cadr exp))) - (= 1 (length (lambda->formals (car exp)))) + (= 1 (length (ast:lambda-args (car exp)))) ;; Get information for continuation - (loop-sym (car (lambda->formals (car exp)))) - (inner-exp (car (lambda->exp (car exp)))) + (loop-sym (car (ast:lambda-args (car exp)))) + (inner-exp (car (ast:lambda-body (car exp)))) ((app? inner-exp)) - ((lambda? (car inner-exp))) + ((ast:lambda? (car inner-exp))) ;; Find the set (assumes CPS conversion) ((pair? (cdr inner-exp))) ((set!? (cadr inner-exp))) ((equal? (set!->var (cadr inner-exp)) loop-sym)) ;; Check the set's continuation - ((app? (car (lambda->exp (car inner-exp))))) - ((equal? (caar (lambda->exp (car inner-exp))) loop-sym)) + ((app? (car (ast:lambda-body (car inner-exp))))) + ((equal? (caar (ast:lambda-body (car inner-exp))) loop-sym)) ) (write `(found named lambda loop ,loop-sym)) ;; Continue scanning @@ -135,6 +135,6 @@ #f)))) (scan - ;(ast:sexp->ast - sexp);) + (ast:sexp->ast + sexp))