- cl-unification-cvs@lists.common-lisp.net

[cl-unification-cvs] CVS update: cl-unification/unifier.lisp
by mantoniotti＠common-lisp.net 20 May '05

20 May '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv20210 Modified Files: unifier.lisp Log Message: 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. Date: Fri May 20 17:19:53 2005 Author: mantoniotti Index: cl-unification/unifier.lisp diff -u cl-unification/unifier.lisp:1.2 cl-unification/unifier.lisp:1.3 --- cl-unification/unifier.lisp:1.2 Fri Jan 28 20:30:35 2005 +++ cl-unification/unifier.lisp Fri May 20 17:19:53 2005 @@ -94,15 +94,15 @@ (defmethod unify ((a symbol) (b string) &optional (env (make-empty-environment))) (cond ((variable-any-p a) env) - ((variablep a) (extend-environment a b env)) + ((variablep a) (var-unify a b env)) (t (error 'unification-failure - :format-control "Cannot unify a symbol with a string: ~S ~S." - :format-arguments (list a b))))) + :format-control "Cannot unify a symbol with a string: ~S ~S." + :format-arguments (list a b))))) (defmethod unify ((b string) (a symbol) &optional (env (make-empty-environment))) (cond ((variable-any-p a) env) - ((variablep a) (extend-environment a b env)) + ((variablep a) (var-unify a b env)) (t (error 'unification-failure :format-control "Cannot unify a string with a symbol: ~S ~S." :format-arguments (list b a))))) @@ -121,13 +121,13 @@ (defmethod unify ((a symbol) (b t) &optional (env (make-empty-environment))) (cond ((variable-any-p a) env) - ((variablep a) (extend-environment a b env)) + ((variablep a) (var-unify a b env)) (t (call-next-method)))) (defmethod unify ((b t) (a symbol) &optional (env (make-empty-environment))) (cond ((variable-any-p a) env) - ((variablep a) (extend-environment a b env)) + ((variablep a) (var-unify a b env)) (t (call-next-method))))

1 0

[cl-unification-cvs] CVS update: cl-unification/README
by mantoniotti＠common-lisp.net 19 May '05

19 May '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv26483 Modified Files: README Log Message: Year updated. Date: Fri May 20 01:00:18 2005 Author: mantoniotti Index: cl-unification/README diff -u cl-unification/README:1.1.1.1 cl-unification/README:1.2 --- cl-unification/README:1.1.1.1 Wed Nov 17 23:19:54 2004 +++ cl-unification/README Fri May 20 01:00:18 2005 @@ -1,6 +1,6 @@ CL-UNIFICATION -Marco Antoniotti 2004 +Marco Antoniotti 2004-2005 The directory containing this file you are reading should contain the code and the documentation of the CL-UNIFICATION package.

1 0

[cl-unification-cvs] CVS update: cl-unification/ACKNOWLEDGEMENTS
by mantoniotti＠common-lisp.net 19 May '05

19 May '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv26081 Added Files: ACKNOWLEDGEMENTS Log Message: File added. Date: Fri May 20 00:58:34 2005 Author: mantoniotti

1 0

[cl-unification-cvs] CVS update: cl-unification/ChangeLog
by mantoniotti＠common-lisp.net 19 May '05

19 May '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv26054 Added Files: ChangeLog Log Message: ChangeLog updated. Date: Fri May 20 00:54:27 2005 Author: mantoniotti

1 0

[cl-unification-cvs] CVS update: cl-unification/COPYING
by mantoniotti＠common-lisp.net 19 May '05

19 May '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv26017 Modified Files: COPYING Log Message: Updated copyright notice. Date: Fri May 20 00:52:52 2005 Author: mantoniotti Index: cl-unification/COPYING diff -u cl-unification/COPYING:1.1.1.1 cl-unification/COPYING:1.2 --- cl-unification/COPYING:1.1.1.1 Wed Nov 17 23:19:54 2004 +++ cl-unification/COPYING Fri May 20 00:52:52 2005 @@ -1,4 +1,4 @@ -Copyright (c) 2004 Marco Antoniotti +Copyright (c) 2004-2005 Marco Antoniotti All rights reserved. Permission is hereby granted, without written agreement and without @@ -12,10 +12,10 @@ THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE AUTHOR(S), HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -THE AUTHOR(S) UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE -PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE AUTHOR(S) HAVE NO -OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR -MODIFICATIONS. +THE AUTHOR(S) UNIVERSITY, COMPANY AND/OR AFFILIATION SPECIFICALLY +DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND +THE AUTHOR(S) HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, +UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

1 0

[cl-unification-cvs] CVS update: cl-unification/docs/html/downloads.html cl-unification/docs/html/index.html
by mantoniotti＠common-lisp.net 19 May '05

19 May '05

Update of /project/cl-unification/cvsroot/cl-unification/docs/html In directory common-lisp.net:/tmp/cvs-serv25953/docs/html Modified Files: downloads.html index.html Log Message: Changed the DISCLAIMER parts in the files, in order to clarify the licensing of the code. Date: Fri May 20 00:50:00 2005 Author: mantoniotti Index: cl-unification/docs/html/downloads.html diff -u cl-unification/docs/html/downloads.html:1.1 cl-unification/docs/html/downloads.html:1.2 --- cl-unification/docs/html/downloads.html:1.1 Fri Jan 28 20:46:37 2005 +++ cl-unification/docs/html/downloads.html Fri May 20 00:49:59 2005 @@ -41,13 +41,11 @@ completely tested and it is bound to contain errors and omissions. This documentation may contain errors and omissions as well. - Finally, the license under which the code is released is not - settled yet, although the file <tt>COPYING</tt> contains a - Berkeley-style license. For the time being you are advised to use - the code at your own risk. No warranty whatsoever is provided, the - author will not be held responsible for any effect generated by your - use of the library, and you can put here the scarier extra - disclaimer you can think of. + The file <tt>COPYING</tt> contains a Berkeley-style license. You + are advised to use the code at your own risk. No warranty + whatsoever is provided, the author will not be held responsible for + any effect generated by your use of the library, and you can put + here the scarier extra disclaimer you can think of. <hr> Index: cl-unification/docs/html/index.html diff -u cl-unification/docs/html/index.html:1.2 cl-unification/docs/html/index.html:1.3 --- cl-unification/docs/html/index.html:1.2 Fri Jan 28 20:45:40 2005 +++ cl-unification/docs/html/index.html Fri May 20 00:49:59 2005 @@ -41,13 +41,11 @@ completely tested and it is bound to contain errors and omissions. This documentation may contain errors and omissions as well. - Finally, the license under which the code is released is not - settled yet, although the file <tt>COPYING</tt> contains a - Berkeley-style license. For the time being you are advised to use - the code at your own risk. No warranty whatsoever is provided, the - author will not be held responsible for any effect generated by your - use of the library, and you can put here the scarier extra - disclaimer you can think of. + The file <tt>COPYING</tt> contains a Berkeley-style license. You + are advised to use the code at your own risk. No warranty + whatsoever is provided, the author will not be held responsible for + any effect generated by your use of the library, and you can put + here the scarier extra disclaimer you can think of. <hr>

1 0

[cl-unification-cvs] CVS update: cl-unification/docs/html/control-flow.html
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification/docs/html In directory common-lisp.net:/tmp/cvs-serv26398 Modified Files: control-flow.html Log Message: Fixed factorial example. Date: Wed Apr 27 23:04:59 2005 Author: mantoniotti Index: cl-unification/docs/html/control-flow.html diff -u cl-unification/docs/html/control-flow.html:1.1.1.1 cl-unification/docs/html/control-flow.html:1.2 --- cl-unification/docs/html/control-flow.html:1.1.1.1 Wed Nov 17 23:19:55 2004 +++ cl-unification/docs/html/control-flow.html Wed Apr 27 23:04:59 2005 @@ -68,7 +68,7 @@ (defun factorial (x) (match-case (x) (0 1) - (#T(number ?n) (factorial (1- ?n))) + (#T(number ?n) (* ?n (factorial (1- ?n)))) (otherwise (error "Incorrect match for ~S." x)))) </pre>

1 0

[cl-unification-cvs] CVS update: cl-unification/match-block.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv26367 Modified Files: match-block.lisp Log Message: Added IGNORABLE declaration to MATCH macro expansion. This is useful in quieting various compilers. Date: Wed Apr 27 23:04:36 2005 Author: mantoniotti Index: cl-unification/match-block.lisp diff -u cl-unification/match-block.lisp:1.4 cl-unification/match-block.lisp:1.5 --- cl-unification/match-block.lisp:1.4 Wed Apr 27 22:54:05 2005 +++ cl-unification/match-block.lisp Wed Apr 27 23:04:36 2005 @@ -42,7 +42,11 @@ (let* ((,env-var (unify ',template ,object ,substitution)) ,@(generate-var-bindings) ) + (declare (ignorable ,@(mapcar #'first (generate-var-bindings)))) ,@forms) + + ;; Yes. The above is sligthly wasteful. + (unification-failure (uf) (if ,errorp (signal uf)

1 0

[cl-unification-cvs] CVS update: cl-unification/match-block.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv25202 Modified Files: match-block.lisp Log Message: Added acknowledgement to Peter Scott. Date: Wed Apr 27 22:54:05 2005 Author: mantoniotti Index: cl-unification/match-block.lisp diff -u cl-unification/match-block.lisp:1.3 cl-unification/match-block.lisp:1.4 --- cl-unification/match-block.lisp:1.3 Wed Apr 27 22:52:09 2005 +++ cl-unification/match-block.lisp Wed Apr 27 22:54:05 2005 @@ -127,6 +127,9 @@ +;;; match-case -- +;;; Implementation provided by Peter Scott. + (defmacro match-case ((object &key errorp default-substitution) &rest clauses) "MATCH-CASE sets up a CASE-like environment for multiple template matching clauses. The syntax of MATCH-CASE comprises a number of clauses of the form

1 0

[cl-unification-cvs] CVS update: cl-unification/match-block.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv25105 Modified Files: match-block.lisp Log Message: Fixed bug in condition signaling within MATCH-CASE. Date: Wed Apr 27 22:52:09 2005 Author: mantoniotti Index: cl-unification/match-block.lisp diff -u cl-unification/match-block.lisp:1.2 cl-unification/match-block.lisp:1.3 --- cl-unification/match-block.lisp:1.2 Wed Apr 27 22:41:56 2005 +++ cl-unification/match-block.lisp Wed Apr 27 22:52:09 2005 @@ -166,7 +166,8 @@ (if otherwise-clause-present-p (first (last clauses)) (when errorp - `(error 'unification-not-exhaustive)))) + `(error 'unification-non-exhaustive + :format-control "Non exhaustive matching.")))) ) (labels ((generate-matchers (clauses) (if (null clauses)

1 0