From mantoniotti at common-lisp.net  Mon May 21 12:29:24 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 08:29:24 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521122924.3D8E47208C@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv30753

Modified Files:
	unification.system 
Log Message:
Added file 'apply-substitition.lisp' with a few new functions that are
a start for the variable substitition operation.

New fixes to the MATCH and MATCH-CASE macros.  They should now work as
advertised.

Minor changes to other files: added exports to package file, fixed
.system and .asd files.


--- /project/cl-unification/cvsroot/cl-unification/unification.system	2004/11/17 22:19:55	1.1.1.1
+++ /project/cl-unification/cvsroot/cl-unification/unification.system	2007/05/21 12:29:24	1.2
@@ -7,6 +7,7 @@
                "lambda-list-parsing"
                "templates-hierarchy"
                "unifier"
-               "match-block"))
+               "match-block"
+               "apply-substitution"))
    
 ;;; end of file -- unification.system --



From mantoniotti at common-lisp.net  Mon May 21 12:33:05 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 08:33:05 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521123305.EE3C27208E@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv31810

Added Files:
	apply-substitution.lisp 
Log Message:
See previous message.



--- /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp	2007/05/21 12:33:05	NONE
+++ /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp	2007/05/21 12:33:05	1.1
;;; -*- Mode: Lisp -*-

;;; substitutions.lisp
;;; General CL structures unifier.
;;; Substitution definitions.

(in-package "CL.EXT.DACF.UNIFICATION") ; DACF = Data And Control Flow.

;;;---------------------------------------------------------------------------
;;; Substitution application.

(defgeneric apply-substitution (substitution item))


(defmethod apply-substitution ((substitution environment) (s symbol))
  (cond ((variable-any-p s) s)
        ((variablep s)
         (multiple-value-bind (val foundp)
             (find-variable-value s substitution)
           (cond (foundp val)
                 (t (warn "~S is a free variable in the current environment." s)
                    s))))
        (t s)))


(defmethod apply-substitution ((substitution environment) (l cons))
  (cons (apply-substitution substitution (first l))
        (apply-substitution substitution (rest l))))

(defmethod apply-substitution ((substitution environment) (l null))
  '())

(export '(apply-substitution))


(defun ground-term (term &optional (substitution (make-empty-environment)))
  (apply-substitution substitution term))


;;; end of file -- apply-substitutions.lisp --


From mantoniotti at common-lisp.net  Mon May 21 12:33:07 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 08:33:07 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521123307.83AFC74308@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv31824

Modified Files:
	match-block.lisp 
Log Message:
See previous message.


--- /project/cl-unification/cvsroot/cl-unification/match-block.lisp	2005/10/25 19:08:15	1.6
+++ /project/cl-unification/cvsroot/cl-unification/match-block.lisp	2007/05/21 12:33:07	1.7
@@ -10,7 +10,7 @@
 
 (defmacro match ((template object
                            &key
-                           (substitution (make-empty-environment))
+                           (substitution '(make-empty-environment))
                            (errorp t)
                            (error-value nil))
                  &body forms)
@@ -39,7 +39,7 @@
            )
       `(block nil
          (handler-case
-             (let* ((,env-var (unify ',template ,object ,substitution))
+             (let* ((,env-var (unify ,template ,object ,substitution))
                     ,@(generate-var-bindings)
                     )
 	       (declare (ignorable ,@(mapcar #'first (generate-var-bindings))))
@@ -49,7 +49,7 @@
 
            (unification-failure (uf)
                                 (if ,errorp
-                                    (signal uf)
+                                    (error uf)
                                     ,error-value))
            )))))
 
@@ -155,7 +155,7 @@
 <form> and <forms> are regular Common Lisp forms.
 <template> is a unification template.
 
-The full syntax of MATCHING is
+The full syntax of MATCH-CASE is
 
   match-case <object> (&key errorp default-substitution) <clauses>
 
@@ -163,7 +163,7 @@
 present in the template are bound lexically.  Note that both variable
 names '?FOO' and 'FOO' are bound for convenience.
 
-The values returned by the MATCHING form are those of the last form in
+The values returned by the MATCH-CASE form are those of the last form in
 the first clause that satisfies the match test.
 
 If ERRORP is non-NIL then if none of the regular clauses matches, then
@@ -188,7 +188,7 @@
          )
     (labels ((generate-matchers (clauses)
 	       (if (null clauses)
-		   otherwise-clause
+		   `(progn ,@(rest otherwise-clause))
 		   (destructuring-bind (pattern &rest body)
 		       (car clauses)
 		     `(handler-case (match (,pattern ,object-var)



From mantoniotti at common-lisp.net  Mon May 21 12:33:13 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 08:33:13 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521123313.91A5C16011@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv31847

Modified Files:
	substitutions.lisp 
Log Message:
See previous message.


--- /project/cl-unification/cvsroot/cl-unification/substitutions.lisp	2004/11/17 22:19:54	1.1.1.1
+++ /project/cl-unification/cvsroot/cl-unification/substitutions.lisp	2007/05/21 12:33:09	1.2
@@ -24,11 +24,22 @@
   (declare (type binding b))
   (car b))
 
+(defun (setf binding-variable) (v b)
+  (declare (type binding b))
+  (setf (car b) v))
+
+
 (defun binding-value (b)
   (declare (type binding b))
   (cdr b))
 
 
+(defun (setf binding-value) (v b)
+  (declare (type binding b))
+  (setf (cdr b) v))
+
+
+
 (define-condition unification-variable-unbound (unbound-variable)
   ()
   )



From mantoniotti at common-lisp.net  Mon May 21 12:33:16 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 08:33:16 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521123316.CD13C21053@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv31895

Modified Files:
	unification-package.lisp 
Log Message:
See previous message.


--- /project/cl-unification/cvsroot/cl-unification/unification-package.lisp	2006/07/19 20:28:49	1.2
+++ /project/cl-unification/cvsroot/cl-unification/unification-package.lisp	2007/05/21 12:33:15	1.3
@@ -14,7 +14,8 @@
    "*UNIFY-STRING-CASE-INSENSITIVE-P*"
    "UNIFY"
    "FIND-VARIABLE-VALUE"
-   "MAKE-EMPTY-ENVIRONMENT")
+   "MAKE-EMPTY-ENVIRONMENT"
+   "APPLY-SUBSTITUTION")
   (:export
    "MATCH"
    "MATCHING"



From mantoniotti at common-lisp.net  Mon May 21 12:33:19 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 08:33:19 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521123319.6B7972B129@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv31922

Modified Files:
	unification.asd 
Log Message:
See previous message.


--- /project/cl-unification/cvsroot/cl-unification/unification.asd	2005/04/27 19:31:18	1.1
+++ /project/cl-unification/cvsroot/cl-unification/unification.asd	2007/05/21 12:33:18	1.2
@@ -12,6 +12,7 @@
 			     (:file "lambda-list-parsing")
 			     (:file "templates-hierarchy")
 			     (:file "unifier")
-			     (:file "match-block")))
+			     (:file "match-block")
+			     (:file "apply-substitution")))
 
 ;;; end of file -- unification.asd --



From mantoniotti at common-lisp.net  Mon May 21 16:55:58 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 12:55:58 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521165558.110A574016@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv26060

Modified Files:
	ChangeLog 
Log Message:
ChangeLog updated.


--- /project/cl-unification/cvsroot/cl-unification/ChangeLog	2005/05/19 22:54:27	1.1
+++ /project/cl-unification/cvsroot/cl-unification/ChangeLog	2007/05/21 16:55:57	1.2
@@ -1,3 +1,97 @@
+2007-05-21  author  <author at paniscia.disco.unimib.it>
+
+	* unification.system:
+	Added file 'apply-substitition.lisp' with a few new functions that are
+	a start for the variable substitition operation.
+
+	New fixes to the MATCH and MATCH-CASE macros.  They should now work as
+	advertised.
+
+	Minor changes to other files: added exports to package file, fixed
+	.system and .asd files.
+
+2006-07-19  author  <author at paniscia.disco.unimib.it>
+
+	* templates-hierarchy.lisp, unifier.lisp:
+	Fixed two problems with the unifier machinery.
+
+	The first one had to do with the matching of NIL against SYMBOL and LIST
+	in several places: essentially, the problem is incongruencies in the
+	results of COMPUTE-APPLICABLE-METHODS in these cases.  I think I caught
+	most of them: unification of lists and the occur-check were the obvious
+	places where things went awry.
+
+	The second problem had to do with the reader macro #T.  The original
+	code generated an object at read time, which is not such a good idea.
+	Now the code generates a call to MAKE-TEMPLATE with is evaluated later.
+	Incidentally, the reader macro function is now called |sharp-T-reader|, in
+	order to placate Emacs fontification.
+
+	Modified Files:
+	 	templates-hierarchy.lisp unifier.lisp
+
+	* unification-package.lisp: Added missing export.
+
+2005-10-25  author  <author at paniscia.disco.unimib.it>
+
+	* unifier.lisp: Fixed problem with the unification of a list with a
+	SEQUENCE-TEMPLATE.  The implementation was not checking that the
+	length of the list was compatible with the length of the required
+	elements in the template.
+
+	Apart from that, keyword matching is still unimplemented.
+
+	* match-block.lisp:
+	Fixed problem with checking the presence of T and OTHERWISE clauses in
+	MATCHING.
+
+2005-07-25  author  <author at paniscia.disco.unimib.it>
+
+	* docs/html/downloads.html: Minor cleanup.
+
+2005-05-20  author  <author at paniscia.disco.unimib.it>
+
+	* docs/html/links.html: Fixed typos.
+
+	* docs/html/nil-template-class.html: Fixed bug in documentation.
+
+	* docs/html/links.html: Page updated.
+
+	* docs/html/unification-dictionary.html: Incremental change to page.
+
+	* docs/html/number-template-class.html: Fixed a documentation bug.
+	Thanks to Norman Werner for spotting it.
+
+	* docs/html/index.html: Added link to "Mailing Lists" page.
+
+	* docs/html/mailing-lists.html: File added.
+
+	* unifier.lisp:
+	Fixed two major bugs reported by Norman Werver.  Unification of
+	strings and symbols and of numers and symbols was not recurring on
+	VAR-UNIFY, as required; thus
+
+		(unify '(?x ?x) '("asd" "qweert"))
+	and
+		(unify '(foo ?x baz) '(foo 42 ?x))
+
+	would succed.
+	The two cases are now fixed.
+
+2005-05-19  author  <author at paniscia.disco.unimib.it>
+
+	* README: Year updated.
+
+	* ACKNOWLEDGEMENTS: File added.
+
+	* ChangeLog: ChangeLog updated.
+
+	* COPYING: Updated copyright notice.
+
+	* docs/html/downloads.html, docs/html/index.html:
+	Changed the DISCLAIMER parts in the files, in order to clarify the licensing
+	of the code.
+
 2005-05-19  mantoniotti  <mantoniotti at vault>
 
 	* COPYING: Updated copyright notice.



From mantoniotti at common-lisp.net  Mon May 21 17:10:26 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 13:10:26 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification/docs/html
Message-ID: <20070521171026.5B11574308@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification/docs/html
In directory clnet:/tmp/cvs-serv29916

Modified Files:
	index.html 
Log Message:
Updated copyrights dates.


--- /project/cl-unification/cvsroot/cl-unification/docs/html/index.html	2005/05/20 15:47:44	1.4
+++ /project/cl-unification/cvsroot/cl-unification/docs/html/index.html	2007/05/21 17:10:26	1.5
@@ -368,7 +368,7 @@
  <tr>
   <td colspan="3" valign="bottom" align="right">
   <div class="copyright">
-  &copy; 2003-2004, Marco Antoniotti, all rights reserved.
+  &copy; 2004-2007, Marco Antoniotti, all rights reserved.
   </div>
   </td>
  </tr>



From mantoniotti at common-lisp.net  Mon May 21 17:11:42 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 13:11:42 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521171142.C3416D001@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv30059

Modified Files:
	ACKNOWLEDGEMENTS 
Log Message:
Updated copyrights dates and changed a few instructions in the
INSTALLATION file.


--- /project/cl-unification/cvsroot/cl-unification/ACKNOWLEDGEMENTS	2005/05/19 22:58:34	1.1
+++ /project/cl-unification/cvsroot/cl-unification/ACKNOWLEDGEMENTS	2007/05/21 17:11:42	1.2
@@ -6,5 +6,9 @@
 The following individuals have provided feedback and (precious) bug
 fixes.
 
+Korablin, Vladimir V.
+Leuner, John
 Scott, Peter
 Werner, Norman
+
+



From mantoniotti at common-lisp.net  Mon May 21 17:11:45 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 13:11:45 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521171145.5A74BD001@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv30076

Modified Files:
	COPYING 
Log Message:
Updated copyrights dates and changed a few instructions in the
INSTALLATION file.


--- /project/cl-unification/cvsroot/cl-unification/COPYING	2005/05/19 22:52:52	1.2
+++ /project/cl-unification/cvsroot/cl-unification/COPYING	2007/05/21 17:11:45	1.3
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2005 Marco Antoniotti
+Copyright (c) 2004-2007 Marco Antoniotti
 All rights reserved.
  
 Permission is hereby granted, without written agreement and without



From mantoniotti at common-lisp.net  Mon May 21 17:11:48 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 13:11:48 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521171148.EF6BE2105C@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv30099

Modified Files:
	INSTALLATION 
Log Message:
Updated copyrights dates and changed a few instructions in the
INSTALLATION file.


--- /project/cl-unification/cvsroot/cl-unification/INSTALLATION	2004/11/17 22:19:54	1.1.1.1
+++ /project/cl-unification/cvsroot/cl-unification/INSTALLATION	2007/05/21 17:11:47	1.2
@@ -13,6 +13,8 @@
 
 will make the UNIFY package available.
 
+There is also an ASDF system definition for those who use this system.
+
 If your CL implementation is ASDF-INSTALL aware, you should also be
 able to just say
 



From mantoniotti at common-lisp.net  Mon May 21 17:11:51 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 13:11:51 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521171151.E107B2F043@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv30120

Modified Files:
	README 
Log Message:
Updated copyrights dates and changed a few instructions in the
INSTALLATION file.


--- /project/cl-unification/cvsroot/cl-unification/README	2005/05/19 23:00:18	1.2
+++ /project/cl-unification/cvsroot/cl-unification/README	2007/05/21 17:11:51	1.3
@@ -1,6 +1,6 @@
 CL-UNIFICATION
 
-Marco Antoniotti 2004-2005
+Marco Antoniotti (c) 2004-2007
 
 The directory containing this file you are reading should contain the
 code and the documentation of the CL-UNIFICATION package.



From mantoniotti at common-lisp.net  Mon May 21 17:12:58 2007
From: mantoniotti at common-lisp.net (mantoniotti)
Date: Mon, 21 May 2007 13:12:58 -0400 (EDT)
Subject: [cl-unification-cvs] CVS cl-unification
Message-ID: <20070521171258.F1AB43700E@common-lisp.net>

Update of /project/cl-unification/cvsroot/cl-unification
In directory clnet:/tmp/cvs-serv30211

Modified Files:
	ChangeLog 
Log Message:
ChangeLog updated.


--- /project/cl-unification/cvsroot/cl-unification/ChangeLog	2007/05/21 16:55:57	1.2
+++ /project/cl-unification/cvsroot/cl-unification/ChangeLog	2007/05/21 17:12:58	1.3
@@ -1,3 +1,26 @@
+2007-05-21  author  <author at Paniscia-di-Marco-Antoniotti.local>
+
+	* README, ACKNOWLEDGEMENTS, COPYING, INSTALLATION:
+	Updated copyrights dates and changed a few instructions in the
+	INSTALLATION file.
+
+	* docs/html/index.html: Updated copyrights dates.
+
+	* ChangeLog: ChangeLog updated.
+
+	* unification-package.lisp, unification.asd, apply-substitution.lisp, match-block.lisp, substitutions.lisp:
+	See previous message.
+
+	* unification.system:
+	Added file 'apply-substitition.lisp' with a few new functions that are
+	a start for the variable substitition operation.
+
+	New fixes to the MATCH and MATCH-CASE macros.  They should now work as
+	advertised.
+
+	Minor changes to other files: added exports to package file, fixed
+	.system and .asd files.
+
 2007-05-21  author  <author at paniscia.disco.unimib.it>
 
 	* unification.system: