From 4f99b8b6291d71ef8e1c807b3a22a32eb6581b37 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Fri, 16 Sep 2016 17:51:48 -0400 Subject: [PATCH] Relocated (lambda->exp) --- scheme/cyclone/macros.sld | 1 + scheme/cyclone/transforms.sld | 5 ----- scheme/cyclone/util.sld | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scheme/cyclone/macros.sld b/scheme/cyclone/macros.sld index 03ef495f..b30804a2 100644 --- a/scheme/cyclone/macros.sld +++ b/scheme/cyclone/macros.sld @@ -17,6 +17,7 @@ macro:macro? macro:expand macro:add! + macro:cleanup macro:load-env! macro:get-env macro:get-defined-macros diff --git a/scheme/cyclone/transforms.sld b/scheme/cyclone/transforms.sld index 76b0b4d9..d022cf5f 100644 --- a/scheme/cyclone/transforms.sld +++ b/scheme/cyclone/transforms.sld @@ -63,7 +63,6 @@ ast:lambda-formals->list list->lambda-formals list->pair - lambda->exp app->fun app->args precompute-prim-app? @@ -327,10 +326,6 @@ (else (cons (car lst) (loop (cdr lst))))))) -; lambda->exp : lambda-exp -> exp -(define (lambda->exp exp) - (cddr exp)) ;; JAE - changed from caddr, so we can handle multiple expressions - ; app->fun : app-exp -> exp (define (app->fun exp) (car exp)) diff --git a/scheme/cyclone/util.sld b/scheme/cyclone/util.sld index 39b80f30..8b7e6bb9 100644 --- a/scheme/cyclone/util.sld +++ b/scheme/cyclone/util.sld @@ -20,6 +20,7 @@ lambda-formals->list lambda-varargs? lambda->formals + lambda->exp lambda-formals-type lambda-varargs-var pack-lambda-arguments @@ -200,6 +201,10 @@ (define (lambda->formals exp) (cadr exp)) +; lambda->exp : lambda-exp -> exp +(define (lambda->exp exp) + (cddr exp)) ;; JAE - changed from caddr, so we can handle multiple expressions + (define (lambda-varargs-var exp) (if (lambda-varargs? exp) (if (equal? (lambda-formals-type exp) 'args:varargs)