Changeset 14138 in project


Ignore:
Timestamp:
04/07/09 02:07:29 (11 years ago)
Author:
Kon Lovett
Message:

Fix for expand*
--This line, and thtse below, will be ignored--

M expand-full/trunk/expand-full.scm
M expand-full/tags/1.0.0/expand-full.scm

Location:
release/4/expand-full
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/expand-full/tags/1.0.0/expand-full.scm

    r14126 r14138  
    1717  (only csi toplevel-command)
    1818  (only extras pretty-print)
    19   (only data-structures atom?)
    2019  (only srfi-1 map!))
    2120
    22 (require-library extras data-structures srfi-1)
     21(require-library extras srfi-1)
    2322
    2423;;;
     
    2726
    2827(define (expand* form #!optional se)
     28
     29  ; expand while expanding
    2930  (define (exp form)
    30     (if (atom? form) form
    31         (let ((form* (expand* form se)))
    32           (if (equal? form form*) form
    33               (exp form*) ) ) ) )
    34   (map! exp (expand form se)) )
     31    (let ((form* (expand* form se)))
     32      (if (equal? form form*) form
     33          (exp form*) ) ) )
     34
     35  (let ((form (expand form se)))
     36    (if (pair? form) (map! exp form)
     37        form ) ) )
    3538
    3639;;
  • release/4/expand-full/trunk/expand-full.scm

    r14126 r14138  
    1717  (only csi toplevel-command)
    1818  (only extras pretty-print)
    19   (only data-structures atom?)
    2019  (only srfi-1 map!))
    2120
    22 (require-library extras data-structures srfi-1)
     21(require-library extras srfi-1)
    2322
    2423;;;
     
    2726
    2827(define (expand* form #!optional se)
     28
     29  ; expand while expanding
    2930  (define (exp form)
    30     (if (atom? form) form
    31         (let ((form* (expand* form se)))
    32           (if (equal? form form*) form
    33               (exp form*) ) ) ) )
    34   (map! exp (expand form se)) )
     31    (let ((form* (expand* form se)))
     32      (if (equal? form form*) form
     33          (exp form*) ) ) )
     34
     35  (let ((form (expand form se)))
     36    (if (pair? form) (map! exp form)
     37        form ) ) )
    3538
    3639;;
Note: See TracChangeset for help on using the changeset viewer.