Changeset 18913 in project


Ignore:
Timestamp:
07/21/10 20:28:36 (10 years ago)
Author:
Kon Lovett
Message:

Bug fix for '(and a)

Location:
release/4/expand-full
Files:
6 edited
1 copied

Legend:

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

    r16024 r18913  
    66(module expand-full
    77
    8   (expand* pretty-print-expand* ppexpand*)
     8  (;export
     9    expand*
     10    pretty-print-expand*
     11    ppexpand*)
    912
    10   (import scheme chicken
    11           (only csi toplevel-command)
    12           (only extras pretty-print)
    13           (only srfi-1 map!))
     13  (import
     14    scheme
     15    chicken
     16    (only csi toplevel-command)
     17    (only extras pretty-print)
     18    (only srfi-1 map!))
    1419 
    1520  (require-library extras srfi-1)
     
    2126(define (expand* form #!optional se)
    2227  (let expd ((form form))
    23     (let ((form* (cond ((list? form) (map! expd (expand form se)) )
    24                        ((pair? form) (cons (expd (car form)) (expd (cdr form))) )
    25                        (else (expand form se) ) ) ) )
     28    (let ((form*
     29            (cond
     30              ((list? form)
     31                (let ((form* (expand form se)))
     32                  (if (not (list? form*)) form*
     33                      (map! expd form*) ) ) )
     34              ((pair? form)
     35                (cons (expd (car form)) (expd (cdr form))) )
     36              (else
     37                (expand form se) ) ) ) )
    2638      (if (equal? form form*) form
    2739          (expd form*) ) ) ) )
  • release/4/expand-full/tags/1.0.2/expand-full.setup

    r16024 r18913  
    55(verify-extension-name "expand-full")
    66
    7 (setup-shared-extension-module (extension-name) (extension-version "1.0.0")
     7(setup-shared-extension-module (extension-name) (extension-version "1.0.2")
    88  #:compile-options '(-optimize-level 3 -fixnum-arithmetic -no-procedure-checks))
  • release/4/expand-full/tags/1.0.2/tests/run.scm

    r14069 r18913  
    4141        (stream-map (lambda (z) (stream-cons y z))
    4242                    (stream-intersperse ys x))))) )
     43
     44(ppexpand*  '(and a b))
  • release/4/expand-full/trunk/expand-full.scm

    r16024 r18913  
    66(module expand-full
    77
    8   (expand* pretty-print-expand* ppexpand*)
     8  (;export
     9    expand*
     10    pretty-print-expand*
     11    ppexpand*)
    912
    10   (import scheme chicken
    11           (only csi toplevel-command)
    12           (only extras pretty-print)
    13           (only srfi-1 map!))
     13  (import
     14    scheme
     15    chicken
     16    (only csi toplevel-command)
     17    (only extras pretty-print)
     18    (only srfi-1 map!))
    1419 
    1520  (require-library extras srfi-1)
     
    2126(define (expand* form #!optional se)
    2227  (let expd ((form form))
    23     (let ((form* (cond ((list? form) (map! expd (expand form se)) )
    24                        ((pair? form) (cons (expd (car form)) (expd (cdr form))) )
    25                        (else (expand form se) ) ) ) )
     28    (let ((form*
     29            (cond
     30              ((list? form)
     31                (let ((form* (expand form se)))
     32                  (if (not (list? form*)) form*
     33                      (map! expd form*) ) ) )
     34              ((pair? form)
     35                (cons (expd (car form)) (expd (cdr form))) )
     36              (else
     37                (expand form se) ) ) ) )
    2638      (if (equal? form form*) form
    2739          (expd form*) ) ) ) )
  • release/4/expand-full/trunk/expand-full.setup

    r16024 r18913  
    55(verify-extension-name "expand-full")
    66
    7 (setup-shared-extension-module (extension-name) (extension-version "1.0.0")
     7(setup-shared-extension-module (extension-name) (extension-version "1.0.2")
    88  #:compile-options '(-optimize-level 3 -fixnum-arithmetic -no-procedure-checks))
  • release/4/expand-full/trunk/tests/run.scm

    r14069 r18913  
    4141        (stream-map (lambda (z) (stream-cons y z))
    4242                    (stream-intersperse ys x))))) )
     43
     44(ppexpand*  '(and a b))
Note: See TracChangeset for help on using the changeset viewer.