cl-unification-cvs

cl-unification-cvs@common-lisp.net

158 discussions

[cl-unification-cvs] CVS cl-unification/docs/html
by mantoniotti 21 May '07

21 May '07

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"> - © 2003-2004, Marco Antoniotti, all rights reserved. + © 2004-2007, Marco Antoniotti, all rights reserved. </div> </td> </tr>

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 21 May '07

21 May '07

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(a)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(a)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(a)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(a)paniscia.disco.unimib.it> + + * docs/html/downloads.html: Minor cleanup. + +2005-05-20 author <author(a)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(a)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@vault> * COPYING: Updated copyright notice.

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 21 May '07

21 May '07

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 --

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 21 May '07

21 May '07

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"

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 21 May '07

21 May '07

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) () )

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 21 May '07

21 May '07

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)

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 21 May '07

21 May '07

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 --

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 21 May '07

21 May '07

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 --

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 19 Jul '06

19 Jul '06

Update of /project/cl-unification/cvsroot/cl-unification In directory clnet:/tmp/cvs-serv30069 Modified Files: templates-hierarchy.lisp unifier.lisp Log Message: 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 --- /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2005/04/27 20:44:25 1.2 +++ /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2006/07/19 21:52:34 1.3 @@ -221,17 +221,33 @@ ;;; Setting up the reader macro. -(defun |#T-reader| (stream subchar arg) +#|| +(defun |sharp-T-reader| (stream subchar arg) (declare (ignore subchar arg)) (let ((spec (read stream t nil t))) (typecase spec (null (make-template nil spec)) (cons (make-template (first spec) spec)) (t (make-template spec spec))))) +||# + + +;;; New version with more 'macro-like' behavior. The previous version +;;; created an object at read-time, which may cause problems with +;;; MAKE-LOAD-FORMs, constant-ness etc etc. + +(defun |sharp-T-reader| (stream subchar arg) + (declare (ignore subchar arg)) + (let ((spec (read stream t nil t))) + (typecase spec + (null `(make-template nil ',spec)) + (cons `(make-template ',(first spec) ',spec)) + (t `(make-template ',spec ',spec))) + )) (eval-when (:load-toplevel :execute) - (set-dispatch-macro-character #\# #\T #'|#T-reader|)) + (set-dispatch-macro-character #\# #\T #'|sharp-T-reader|)) (defmethod make-template ((kind null) (spec symbol)) (assert (null spec) (spec) "MAKE-TEMPLATE called erroneously with ~S and ~S." kind spec) --- /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2005/10/25 19:17:33 1.4 +++ /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2006/07/19 21:52:34 1.5 @@ -230,6 +230,7 @@ ;;; Special catch all method. (defmethod unify ((x template) (y template) &optional (env (make-empty-environment))) + (declare (ignore env)) (error 'unification-failure :format-control "Unification of two templates of type ~A and ~A has not been yet implemented." :format-arguments (list (class-name (class-of x)) @@ -239,15 +240,23 @@ ;;;--------------------------------------------------------------------------- ;;; NIL special unification methods. -(defmethod unify ((x null) (nt nil-template) &optional (env (make-empty-environment))) +(defmethod unify ((x null) (y null) + &optional (env (make-empty-environment))) + env) + + +(defmethod unify ((x null) (nt nil-template) + &optional (env (make-empty-environment))) env) -(defmethod unify ((nt nil-template) (x null) &optional (env (make-empty-environment))) +(defmethod unify ((nt nil-template) (x null) + &optional (env (make-empty-environment))) env) -(defmethod unify ((nt1 nil-template) (nt2 nil-template) &optional (env (make-empty-environment))) +(defmethod unify ((nt1 nil-template) (nt2 nil-template) + &optional (env (make-empty-environment))) env) @@ -299,6 +308,7 @@ ;;; Sequence (List) template methods (defmethod unify ((a sequence) (b template) &optional (env (make-empty-environment))) + (declare (ignore env)) (error 'unification-failure :format-control "Cannot unify a sequence with a non sequence or non sequence access template: ~S ~S." :format-arguments (list a b))) @@ -354,6 +364,7 @@ ;;; Vector template methods. (defmethod unify ((a vector) (b template) &optional (env (make-empty-environment))) + (declare (ignore env)) (error 'unification-failure :format-control "Cannot unify a vector with a non-vector template: ~S ~S." :format-arguments (list a b))) @@ -398,6 +409,7 @@ ;;; Array template methods. (defmethod unify ((a array) (b template) &optional (env (make-empty-environment))) + (declare (ignore env)) (error 'unification-failure :format-control "Cannot unify an array with a non array or non array access template: ~S ~S." :format-arguments (list a b))) @@ -447,7 +459,7 @@ ;; Template is (array (['*' | <element type>] [<dimension spec>]) <shape template>) (destructuring-bind (array-kwd type-spec shape-template) template-spec - (declare (ignore array-kwd)) + (declare (ignore array-kwd type-spec)) ;; Missing check for type-spec. (unify-array-rows a shape-template env)) ))) @@ -458,11 +470,12 @@ ;;; Standard object template methods. (defmethod unify ((a standard-object) (b template) &optional (env (make-empty-environment))) + (declare (ignore env)) (error 'unification-failure :format-control "Cannot unify a standard object with a non standard object template: ~S ~S." :format-arguments (list a b))) -#| Old version with heavy syntax +#|| Old version with heavy syntax (defmethod unify ((a standard-object) (b standard-object-template) &optional (env (make-empty-environment))) (destructuring-bind (class &rest template-slot-specs) @@ -484,7 +497,7 @@ then (slot-spec-unify accessor-spec reader value-template mgu) finally (return mgu)) env)))) -|# +||# (defmethod unify ((a standard-object) (b standard-object-template) @@ -519,6 +532,7 @@ ;;; Structure object template methods. (defmethod unify ((a structure-object) (b template) &optional (env (make-empty-environment))) + (declare (ignore env)) (error 'unification-failure :format-control "Cannot unify a structure object with a non structure object template: ~S ~S." :format-arguments (list a b))) @@ -553,7 +567,9 @@ (let* ((seq-type (type-of a)) (seq-template-kind (if (symbolp seq-type) seq-type (first seq-type))) ; Stupid FTTB. ) - (unify (subseq a from to) (make-template seq-template-kind `(,seq-template-kind ,@spec)))))) + (unify (subseq a from to) + (make-template seq-template-kind `(,seq-template-kind ,@spec)) + env)))) (defmethod unify ((b subseq-template) (a sequence) &optional (env (make-empty-environment))) @@ -597,7 +613,7 @@ -#| +#|| (defmethod occurs-in-p ((var symbol) pat env) (cond ((variablep pat) (or (eq var pat) @@ -612,7 +628,8 @@ (occurs-in-p var (rest pat) env))) (t (error "unimplemented")))) -|# +||# + (defmethod occurs-in-p ((var symbol) (pat symbol) env) (when (variablep pat) @@ -623,10 +640,21 @@ (occurs-in-p var value env))) ))) + (defmethod occurs-in-p ((var symbol) (pat list) env) (or (occurs-in-p var (first pat) env) (occurs-in-p var (rest pat) env))) + +(defmethod occurs-in-p ((var symbol) (pat null) env) + ;; This is needed because of different precedence rules among lisps + ;; in COMPUTE-APPLICABLE-METHODS when NIL has to matched against + ;; SYMBOL and LIST. + + ;; We know (assume) that VAR is not NIL. + nil) + + (defmethod occurs-in-p ((var symbol) (pat array) env) (loop for i from 0 below (array-total-size pat) thereis (occurs-in-p var (row-major-aref pat i) env)))

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 19 Jul '06

19 Jul '06

Update of /project/cl-unification/cvsroot/cl-unification In directory clnet:/tmp/cvs-serv19365 Modified Files: unification-package.lisp Log Message: Added missing export. --- /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2004/11/17 22:19:55 1.1.1.1 +++ /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2006/07/19 20:28:49 1.2 @@ -17,6 +17,7 @@ "MAKE-EMPTY-ENVIRONMENT") (:export "MATCH" - "MATCHING")) + "MATCHING" + "MATCH-CASE")) ;;; end of file -- unification-package.lisp --

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

cl-unification-cvs