Changeset 15020 in project for chicken

Timestamp:

06/18/09 16:08:09 (10 years ago)

Author:

felix winkelmann

Message:

added missing files to distribution/manifest; possibly fixed prefix bug

Location:

chicken/trunk

Files:

• chicken-syntax.scm (modified) (3 diffs)
• distribution/manifest (modified) (1 diff)
• expand.scm (modified) (1 diff)
• tests/syntax-tests.scm (modified) (1 diff)

chicken/trunk/chicken-syntax.scm

@@ -1 +1 @@
 ;;;; chicken-syntax.scm - non-standard syntax extensions
 ;
+; Copyright (c) 2008-2009, The Chicken Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
-; Copyright (c) 2008-2009, The Chicken Team
 ; All rights reserved.
 ;
@@ -33 +33 @@
   (fixnum) )
 
-(##sys#provide 'chicken-more-macros 'chicken-syntax)
+(##sys#provide
+ 'chicken-more-macros                   ; historical, remove later
+ 'chicken-syntax)
 
 
@@ -1057 +1059 @@
 
 
-;;; 
-
-
 ;;; Just in case someone forgets
 

chicken/trunk/distribution/manifest

@@ -218 +218 @@
 tests/test-finalizers-2.scm
 tests/module-tests-compiled.scm
+tests/scrutiny-tests.scm
+tests/scrutiny.expected
 tests/syntax-tests.scm
 tests/syntax-tests-2.scm

chicken/trunk/expand.scm

@@ -1706 +1706 @@
 
 (define (##sys#macro-subset me0)
-  (let loop ((me (##sys#macro-environment)))
-    (if (or (null? me) (eq? me me0))
-        '()
-        (cons (car me) (loop (cdr me))))))
+  (let ((se (let loop ((me (##sys#macro-environment)))
+              (if (or (null? me) (eq? me me0))
+                  '()
+                  (cons (car me) (loop (cdr me)))))))
+    (for-each                           ; fixup se
+     (lambda (sdef)
+       (when (pair? (cdr sdef))
+         (set-car! (cdr sdef) se)))
+     se)
+    se))

chicken/trunk/tests/syntax-tests.scm

@@ -341 +341 @@
 (assert (= 123 setter))
 
+
+;;; prefixed import from `chicken' module with indirect reference to imported syntax
+;;; (reported by Jack Trades)
+
+(module prefixed-self-reference (a b c)
+  (import scheme (prefix chicken c:))
+  (c:define-values (a b c) (values 1 2 3)) )