Changeset 12359 in project

Timestamp:

11/05/08 11:28:42 (11 years ago)

Author:

felix winkelmann

Message:

fixed ellipsis check (srfi-46 extension); chicken-install removes failed http locations from defaults list

Location:

chicken/trunk

Files:

• TODO (modified) (2 diffs)
• chicken-install.scm (modified) (1 diff)
• synrules.scm (modified) (5 diffs)
• tests/syntax-tests.scm (modified) (3 diffs)

chicken/trunk/TODO

@@ -11 +11 @@
     it seems that we have to add unexported syntax to the import lib, in case it is referenced
     from exported syntax. ugh.
-*** alternative ellipsis (SRFI-46) broken
-    using alternative ellipsis in syntax-rules results in nested '... to be treated
-    as ordinary (temporary) identifier
 *** expansion of r5rs_pitfall 4.2 incorrect
     possibly due to a non-aliased implicit "begin" somewhere
@@ -46 +43 @@
 
 ** module issues
+*** need a way to omit generating module registration without generating import lib
+    for example when compiling static version, where implib already exists
 *** code-duplication in compiler and evaluator for ##core#module
 *** "scheme" module does not include some special forms ("define-syntax", etc.)

chicken/trunk/chicken-install.scm

@@ -192 +192 @@
                       #f)
                      (e () (abort e)))
-                   (loop (cdr defs)))))))
+                   (begin
+                     (set! *default-sources* (delete def *default-sources* eq?))
+                     (loop (cdr defs))))))))
 
     (define (retrieve eggs)

chicken/trunk/synrules.scm

@@ -99 +99 @@
   (define %temp (r 'temp))
   (define %syntax-error '##sys#syntax-error-hook)
+  (define %ellipsis (r ellipsis))
+
+  (define (ellipsis? x)
+    (c x %ellipsis))
 
   (define (make-transformer rules)
@@ -157 +161 @@
      (let* ((len (vector-length pattern))
             (segment? (and (>= len 2)
-                           (eq? (vector-ref pattern (- len 1))
-                                ellipsis))))
+                           (ellipsis? (vector-ref pattern (- len 1))))))
        `((,%let ((,%temp ,input))
           (,%and (,%vector? ,%temp)
@@ -202 +205 @@
            (let* ((len (vector-length pattern))
                   (segment? (and (>= len 2)
-                                 (eq? (vector-ref pattern (- len 1))
-                                      ellipsis))))
+                                 (ellipsis? (vector-ref pattern (- len 1))))))
              (if segment?
                  (process-pattern (vector->list pattern) 
@@ -311 +313 @@
     (and (pair? pattern)
          (pair? (cdr pattern))
-         (eq? (cadr pattern) ellipsis)))
+         (ellipsis? (cadr pattern))))
 
   ;; Count the number of `...'s in PATTERN.
@@ -325 +327 @@
     (let loop ((pattern (cdr pattern)))
       (if (and (pair? pattern)
-               (eq? (car pattern) ellipsis))
+               (ellipsis? (car pattern)))
           (loop (cdr pattern))
           pattern)))

chicken/trunk/tests/syntax-tests.scm

@@ -142 +142 @@
 )
 
+;;; alternative ellipsis test
+
 (define-syntax foo
   (syntax-rules 
@@ -150 +152 @@
    (foo 1 2 3)
 )
+
+(define-syntax defalias
+  (syntax-rules ___ ()
+    ((_ new old)
+     (define-syntax new
+       (syntax-rules ()
+         ((_ args ...) (old args ...)))))))
+
+(defalias inc add1)
+
+(t 3 (inc 2))
+
+;;;
 
 (define-syntax usetmp
@@ -255 +270 @@
         (set! i (add1 i))))
 (newline)
-
-
-;;; alternative define-syntax syntax
-
-(define-syntax (foo . _) '(list 42))
-
-(assert (equal? '(42) (foo)))
-
-(assert
- (equal? 
-  '(1)
-  (let ()
-    (define-syntax (bar x r c)
-      `(,(r 'list) (,(r 'quote) ,(cadr x))))
-    (bar 1))))