From 30a3e784380f7c6509b0a3df7098ad9bfb97fca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <jahvascriptmaniac+github@free.fr>
Date: Sun, 7 Nov 2010 00:40:49 +0100
Subject: [PATCH] Type dans les clauses (? ...)

---
 match.lisp | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/match.lisp b/match.lisp
index efde47f..e254a6f 100644
--- a/match.lisp
+++ b/match.lisp
@@ -40,7 +40,7 @@
                   ((eq (car pred) 'lambda)   pred)
                   (t
                    `(lambda (x) ,pred))))
-          (cdr pattern)))
+          pattern))
 
 (defun pattern-match-do-lambdas-1 (pattern)
   (if (atom pattern)
@@ -48,15 +48,21 @@
       `(list ',(first pattern)
              ',(second pattern)
              ,(if (second pattern)
-                  (let ((?-clause (third pattern)))
-                    (cond ((atom (cdr ?-clause))       `(list 'and #'identity))
-                          ((eq 'and (second ?-clause)) `(list 'and ,@(pattern-match-do-lambdas-transform (cdr ?-clause))))
-                          ((eq 'or  (second ?-clause)) `(list 'or  ,@(pattern-match-do-lambdas-transform (cdr ?-clause))))
-                          (t                           `(list 'and ,@(pattern-match-do-lambdas-transform ?-clause)))))
+                  (let ((?-clause (cdr (third pattern)))
+                        (type '_))
+                    (when (and (consp ?-clause) (member (car ?-clause) '(nil _ $ @ @.)))
+                      (setq type (car ?-clause))
+                      (setq ?-clause (cdr ?-clause)))
+                    (cond ((atom ?-clause)            `(list ',type 'and #'identity))
+                          ((eq 'and (first ?-clause)) `(list ',type 'and ,@(pattern-match-do-lambdas-transform (cdr ?-clause))))
+                          ((eq 'or  (first ?-clause)) `(list ',type 'or  ,@(pattern-match-do-lambdas-transform (cdr ?-clause))))
+                          (t                          `(list ',type 'and ,@(pattern-match-do-lambdas-transform ?-clause)))))
                   (pattern-match-do-lambdas-1 (third pattern)))
              ',(fourth pattern)
              ,(pattern-match-do-lambdas-1 (fifth pattern)))))
 
+(pattern-match-preprocess (? car cdr))
+
 (defmacro pattern-match-do-lambdas (pattern)
   "Transforme les (? (<code>)) et (? (lambda ...)) en vrais lambdas."
   (pattern-match-do-lambdas-1 pattern))
@@ -328,13 +334,14 @@
             (cond
               ;; (? <prédicat(s)>)
               (is-predicate
-               (when (cond
-                       ;; (? and symbole-1 ... symbole-n)
-                       ((eq 'and (first pattern))
-                        (every (lambda (predicat) (funcall predicat expr)) (cdr pattern)))
-                       ;; (? or symbole-1 ... symbole-n)
-                       ((eq 'or (first pattern))
-                        (some (lambda (predicat) (funcall predicat expr)) (cdr pattern))))
+               (when (and (pattern-match `(nil nil ,(car pattern) nil nil) expr)
+                          (cond
+                            ;; (? and symbole-1 ... symbole-n)
+                            ((eq 'and (second pattern))
+                             (every (lambda (predicat) (funcall predicat expr)) (cddr pattern)))
+                            ;; (? or symbole-1 ... symbole-n)
+                            ((eq 'or (second pattern))
+                             (some (lambda (predicat) (funcall predicat expr)) (cddr pattern)))))
                  (acons-capture capture-name expr nil)))
               ;; ()
               ((null pattern)