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

[cl-unification-cvs] CVS cl-unification
by rbrown 24 Feb '11

24 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv24664 Modified Files: ChangeLog apply-substitution.lisp cl-unification.system lambda-list-parsing.lisp match-block.lisp templates-hierarchy.lisp unifier.lisp Log Message: Delete trailing whitespace. In lambda-list-parsing.lisp this fixes a bug with ~@<newline> format directives. --- /project/cl-unification/cvsroot/cl-unification/ChangeLog 2011/02/24 20:16:01 1.11 +++ /project/cl-unification/cvsroot/cl-unification/ChangeLog 2011/02/24 20:44:12 1.12 @@ -1,5 +1,15 @@ 2011-02-24 Robert Brown <robert.brown(a)gmail.com> + * lambda-list-parsing.lisp: Delete trailing whitespace that turned + ~@<newline> into a bogus format directive by converting it into + ~@<space><newline> + + * unifier.lisp, apply-substitution.lisp, cl-unification.system + * match-block.lisp, templates-hierarchy.lisp, unifier.lisp + * lib-dependent/cl-ppcre-template.lisp: delete trailing whitespace + +2011-02-24 Robert Brown <robert.brown(a)gmail.com> + * unifier.lisp: Allow vectors to unify with sequence templates. * test/unification-tests.lisp: new test to verify the change --- /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp 2009/04/17 07:52:25 1.4 +++ /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp 2011/02/24 20:44:12 1.5 @@ -70,8 +70,8 @@ finally (return (make-frame result-bindings))) into frames finally (return (make-environment :frames frames)))) - - + + ;;; ground-term -- --- /project/cl-unification/cvsroot/cl-unification/cl-unification.system 2009/04/17 22:42:50 1.4 +++ /project/cl-unification/cvsroot/cl-unification/cl-unification.system 2011/02/24 20:44:12 1.5 @@ -20,5 +20,5 @@ ) )) )) - + ;;; end of file -- cl-unification.system -- --- /project/cl-unification/cvsroot/cl-unification/lambda-list-parsing.lisp 2005/01/28 19:30:35 1.2 +++ /project/cl-unification/cvsroot/cl-unification/lambda-list-parsing.lisp 2011/02/24 20:44:12 1.3 @@ -49,7 +49,7 @@ ) ;;; The next function is really implementation-dependent, give the -;;; definition of LAMBDA-LIST-KEYWORDS +;;; definition of LAMBDA-LIST-KEYWORDS. (define-condition lambda-list-parsing-error (program-error) @@ -90,7 +90,7 @@ (&aux (parse-auxiliary-arguments (rest lambda-list))) (&rest (parse-rest-arguments (rest lambda-list))) (otherwise - (warn "Keyword ~A is implementation dependent.~@ + (warn "Keyword ~A is implementation dependent.~@ The parsing may not work properly." head) (skip-until-next-lambda-list-keyword (rest lambda-list)) @@ -112,7 +112,7 @@ (&aux (parse-auxiliary-arguments (rest lambda-list))) (&rest (parse-rest-arguments (rest lambda-list))) (otherwise - (warn "Keyword ~A is implementation dependent.~@ + (warn "Keyword ~A is implementation dependent.~@ The parsing may not work properly." head) (skip-until-next-lambda-list-keyword (rest lambda-list)) @@ -139,7 +139,7 @@ (error 'lambda-list-parsing-error :item head)) (skip-until-next-lambda-list-keyword (rest lambda-list))) (otherwise - (warn "Keyword ~A is implementation dependent.~@ + (warn "Keyword ~A is implementation dependent.~@ The parsing may not work properly." head) (skip-until-next-lambda-list-keyword (rest lambda-list)) @@ -165,7 +165,7 @@ (&aux (parse-auxiliary-arguments (rest lambda-list))) (&rest (error 'lambda-list-parsing-error :item head)) (otherwise - (warn "Keyword ~A is implementation dependent.~@ + (warn "Keyword ~A is implementation dependent.~@ The parsing may not work properly." head) (skip-until-next-lambda-list-keyword (rest lambda-list)) @@ -187,7 +187,7 @@ (&aux (error 'lambda-list-parsing-error :item head)) (&rest (error 'lambda-list-parsing-error :item head)) (otherwise - (warn "Keyword ~A is implementation dependent.~@ + (warn "Keyword ~A is implementation dependent.~@ The parsing may not work properly." head) (skip-until-next-lambda-list-keyword (rest lambda-list)) @@ -210,7 +210,7 @@ (&aux (parse-auxiliary-arguments (rest lambda-list))) (&rest (parse-rest-arguments (rest lambda-list))) (otherwise - (warn "Keyword ~A is implementation dependent.~@ + (warn "Keyword ~A is implementation dependent.~@ The parsing may not work properly." head) (skip-until-next-lambda-list-keyword (rest lambda-list)) @@ -277,7 +277,7 @@ (symbol (make-key-lambda-var-info :name var :type init-value-type :default-value init-value)) - + (cons (destructuring-bind (kwd var) var (etypecase var --- /project/cl-unification/cvsroot/cl-unification/match-block.lisp 2009/12/17 16:41:38 1.10 +++ /project/cl-unification/cvsroot/cl-unification/match-block.lisp 2011/02/24 20:44:12 1.11 @@ -57,7 +57,7 @@ (declare (ignorable ,@(mapcar #'first (generate-var-bindings)))) ,@forms) - + ;; Yes. The above is sligthly wasteful. (unification-failure (uf) @@ -123,7 +123,7 @@ (declare (ignorable ,@(mapcar #'first (generate-var-bindings)))) ,@forms) - + ;; Yes. The above is sligthly wasteful. (unification-failure (uf) @@ -176,7 +176,7 @@ (template (if (variablep template) `',template ; Logical variables are ; special-cased. - template)) + template)) ) (flet ((generate-var-bindings () (loop for v in template-vars --- /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2011/02/11 17:49:38 1.7 +++ /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2011/02/24 20:44:12 1.8 @@ -292,7 +292,7 @@ (t `',spec))) ||# - + (defmethod make-template ((kind null) (spec symbol)) --- /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/02/24 20:16:01 1.10 +++ /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/02/24 20:44:12 1.11 @@ -440,7 +440,7 @@ :key-variable-test #'valid-template-p :rest-variable-test #'valid-template-p ) - + (let* ((n-vars (list-length vars)) (n-optionals (list-length optionals)) (env (unify (subseq a 0 (min ll (list-length vars))) @@ -489,7 +489,7 @@ :key-variable-test #'valid-template-p :rest-variable-test #'valid-template-p ) - + (let ((n-vars (list-length vars)) (n-optionals (list-length optionals)) ) @@ -963,7 +963,7 @@ ;; 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)

1 0

[cl-unification-cvs] CVS cl-unification/test
by rbrown 24 Feb '11

24 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification/test In directory cl-net:/tmp/cvs-serv17584/test Modified Files: unification-tests.lisp Log Message: unifier.lisp: Allow vectors to unify with sequence templates. test/unification-tests.lisp: new test to verify the change --- /project/cl-unification/cvsroot/cl-unification/test/unification-tests.lisp 2011/02/11 20:15:40 1.4 +++ /project/cl-unification/cvsroot/cl-unification/test/unification-tests.lisp 2011/02/24 20:16:02 1.5 @@ -99,6 +99,8 @@ (test t (unify:environment-p (unify #C(0 1) #T(complex #C(0 1))))) (test '(42 T) (v? '?x (unify #T(number ?x) 42)) :multiple-values t) + (test '(42 T) (v? '?x (unify #(0 1 42 3 4 5) #T(sequence 0 1 ?x 3 4 5))) + :multiple-values t) (test-error (unify 42 #T(float 42.0)) :condition-type 'unification-failure

1 0

[cl-unification-cvs] CVS cl-unification
by rbrown 24 Feb '11

24 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv17584 Modified Files: ChangeLog unifier.lisp Log Message: unifier.lisp: Allow vectors to unify with sequence templates. test/unification-tests.lisp: new test to verify the change --- /project/cl-unification/cvsroot/cl-unification/ChangeLog 2011/02/16 16:30:04 1.10 +++ /project/cl-unification/cvsroot/cl-unification/ChangeLog 2011/02/24 20:16:01 1.11 @@ -1,3 +1,8 @@ +2011-02-24 Robert Brown <robert.brown(a)gmail.com> + + * unifier.lisp: Allow vectors to unify with sequence templates. + * test/unification-tests.lisp: new test to verify the change + 2011-02-16 Robert Brown <robert.brown(a)gmail.com> * cl-unification.asd: Add support for asdf:test-system. --- /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/02/11 17:49:38 1.9 +++ /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/02/24 20:16:01 1.10 @@ -476,7 +476,7 @@ :format-arguments (list a b))) -(defmethod unify ((a vector) (b vector-template) +(defmethod unify ((a vector) (b sequence-template) &optional (env (make-empty-environment)) &key &allow-other-keys) (let ((template-lambda-list (sequence-template-lambda-list b))

1 0

[cl-unification-cvs] CVS cl-unification
by rbrown 16 Feb '11

16 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv17348 Modified Files: ChangeLog Log Message: Add entry for cl-unification-test.asd. --- /project/cl-unification/cvsroot/cl-unification/ChangeLog 2011/01/18 14:53:20 1.9 +++ /project/cl-unification/cvsroot/cl-unification/ChangeLog 2011/02/16 16:30:04 1.10 @@ -1,3 +1,9 @@ +2011-02-16 Robert Brown <robert.brown(a)gmail.com> + + * cl-unification.asd: Add support for asdf:test-system. + + * cl-unification-test.asd: File added. + 2011-01-18 author <author(a)paniscia.local> * unifier.lisp:

1 0

[cl-unification-cvs] CVS cl-unification
by rbrown 16 Feb '11

16 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv17076 Modified Files: cl-unification.asd Added Files: cl-unification-test.asd Log Message: Add cl-unification-test.asd Make (asdf:test-system 'cl-unification) work. --- /project/cl-unification/cvsroot/cl-unification/cl-unification.asd 2009/04/17 22:42:46 1.3 +++ /project/cl-unification/cvsroot/cl-unification/cl-unification.asd 2011/02/16 16:22:57 1.4 @@ -16,6 +16,7 @@ (asdf:defsystem :cl-unification :author "Marco Antoniotti" + :in-order-to ((test-op (test-op :cl-unification-test))) :serial t :components ((:file "unification-package") (:file "variables") --- /project/cl-unification/cvsroot/cl-unification/cl-unification-test.asd 2011/02/16 16:22:57 NONE +++ /project/cl-unification/cvsroot/cl-unification/cl-unification-test.asd 2011/02/16 16:22:57 1.1 ;;;; cl-unification-test.asd (in-package #:asdf) ;; Tests implemented using the ptester framework are run at *load* time, so ;; we tell ASDF that loading a file containing ptester code is never done. ;; This causes ASDF to run all the tests whenever ASDF:LOAD-SYSTEM or ;; ASDF:TEST-SYSTEM is called with argument CL-UNIFICATION-TEST. (defclass ptester-source-file (cl-source-file) () (:documentation "A Common Lisp source file containing ptester code.")) (defmethod operation-done-p ((operation load-op) (component ptester-source-file)) nil) (in-package #:common-lisp-user) (defpackage #:cl-unification-test-system (:use #:common-lisp #:asdf)) (in-package #:cl-unification-test-system) (defsystem #:cl-unification-test :depends-on (:cl-unification :ptester) :components ((:module "test" :components ((:ptester-source-file "unification-tests")))))

1 0

[cl-unification-cvs] CVS cl-unification/test
by rbrown 11 Feb '11

11 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification/test In directory cl-net:/tmp/cvs-serv24800/test Modified Files: unification-tests.lisp Log Message: Make sure that classes referenced in #T forms are defined before the forms are read. This fixes compilation of file unification-tests.lisp. --- /project/cl-unification/cvsroot/cl-unification/test/unification-tests.lisp 2011/02/11 17:49:39 1.3 +++ /project/cl-unification/cvsroot/cl-unification/test/unification-tests.lisp 2011/02/11 20:15:40 1.4 @@ -108,6 +108,8 @@ ) +(eval-when (:compile-toplevel :load-toplevel :execute) + (defclass test1 () ((a :initarg :a :accessor a) (b :initarg :b :accessor b))) @@ -115,6 +117,8 @@ (defstruct s-root a) (defstruct (s-child (:include s-root)) b) +) + (with-tests (:name "advanced templates unification") (test '(a T) (v? '?x (unify #2A((1 #T(symbol ?x) 3) (_ _ _))

1 0

[cl-unification-cvs] CVS cl-unification/test
by rbrown 11 Feb '11

11 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification/test In directory cl-net:/tmp/cvs-serv12304/test Modified Files: unification-tests.lisp Log Message: Use *unify-string-case-sensitive-p* consistently. Change the documentation. templates-hierarchy.lisp: Fix stream argument to print-object. --- /project/cl-unification/cvsroot/cl-unification/test/unification-tests.lisp 2009/04/15 10:24:28 1.2 +++ /project/cl-unification/cvsroot/cl-unification/test/unification-tests.lisp 2011/02/11 17:49:39 1.3 @@ -1,12 +1,14 @@ ;;;; -*- Mode: Lisp -*- ;;;; unification-tests.lisp -- -;;;; CL-UNIFICATION test suite. Requires Franz's util.test package. +;;;; CL-UNIFICATION test suite. Requires ptester, the public version of +;;;; Franz's util.test package. -(in-package "UNIFY.TESTS") +(defpackage "IT.UNIMIB.DISCO.MA.CL.EXT.DACF.UNIFICATION.TESTS" + (:use "CL" "UNIFY" "PTESTER") + (:nicknames "CL.EXT.DACF.UNIFICATION.TESTS" "UNIFY.TESTS")) -(use-package "UNIFY") -(use-package "UTIL.TEST") +(in-package "UNIFY.TESTS") (with-tests (:name "basic constant unification") (test t (unify:environment-p (unify 42 42))) @@ -38,7 +40,7 @@ (test-error (unify "I am a string" "I am A string") :condition-type 'unification-failure) - (test t (let ((*unify-string-case-insensitive-p* t)) + (test t (let ((*unify-string-case-sensitive-p* nil)) (unify:environment-p (unify "I am a string" "I am A string")))) )

1 0

[cl-unification-cvs] CVS cl-unification/docs/html
by rbrown 11 Feb '11

11 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification/docs/html In directory cl-net:/tmp/cvs-serv12304/docs/html Modified Files: string-template-class.html unification-dictionary.html unify-function.html usci-variable.html Log Message: Use *unify-string-case-sensitive-p* consistently. Change the documentation. templates-hierarchy.lisp: Fix stream argument to print-object. --- /project/cl-unification/cvsroot/cl-unification/docs/html/string-template-class.html 2004/11/17 22:19:56 1.1.1.1 +++ /project/cl-unification/cvsroot/cl-unification/docs/html/string-template-class.html 2011/02/11 17:49:39 1.2 @@ -122,7 +122,7 @@ <h2>Affected By:</h2> - <p>The value of the variable *UNIFY-STRING-CASE-INSENSITIVE-P*.</p> + <p>The value of the variable *UNIFY-STRING-CASE-SENSITIVE-P*.</p> <h2>Exceptional Situations:</h2> --- /project/cl-unification/cvsroot/cl-unification/docs/html/unification-dictionary.html 2005/05/20 16:27:05 1.2 +++ /project/cl-unification/cvsroot/cl-unification/docs/html/unification-dictionary.html 2011/02/11 17:49:39 1.3 @@ -38,7 +38,7 @@ <ul> <li><a href="unify-package.html"><i>Package</i> <b>CL.EXT.DACF.UNIFICATION</b></a> <li><a href="unify-function.html"><i>Generic function</i> <b>UNIFY</b></a> - <li><a href="usci-variable.html"><i>Variable</i> <b>*UNIFY-STRING-CASE-INSENSITIVE*</b></a> + <li><a href="usci-variable.html"><i>Variable</i> <b>*UNIFY-STRING-CASE-SENSITIVE*</b></a> <li><a href="template-class.html"><i>Class</i> <b>TEMPLATE</b></a> <li><a href="expression-template-class.html"><i>Class</i> <b>EXPRESSION-TEMPLATE</b></a> --- /project/cl-unification/cvsroot/cl-unification/docs/html/unify-function.html 2004/11/17 22:19:55 1.1.1.1 +++ /project/cl-unification/cvsroot/cl-unification/docs/html/unify-function.html 2011/02/11 17:49:39 1.2 @@ -163,7 +163,7 @@ </p> <p>Two strings unify only is they are "equal", under the following - condition. If the variable *UNIFY-STRING-CASE-INSENSITIVE-P* is NIL + condition. If the variable *UNIFY-STRING-CASE-SENSITIVE-P* is T (the default) then the two strings <i>s1</i> and <i>s2</i> are compared using STRING=, otherwise they are compared using STRING-EQUAL. </p> @@ -335,7 +335,7 @@ <h2>See Also:</h2> <p>MAKE-EMPTY-ENVIRONMENT, UNIFICATION-FAILURE, - *UNIFY-STRING-CASE-INSENSITIVE-P*, OCCURS-IN-P, + *UNIFY-STRING-CASE-SENSITIVE-P*, OCCURS-IN-P, *OCCURENCE-CHECK-P*.</p> <h2>Notes:</h2> --- /project/cl-unification/cvsroot/cl-unification/docs/html/usci-variable.html 2004/11/17 22:19:55 1.1.1.1 +++ /project/cl-unification/cvsroot/cl-unification/docs/html/usci-variable.html 2011/02/11 17:49:39 1.2 @@ -1,6 +1,6 @@ <html> <head> - <title>CL Unification: Variable *UNIFY-STRING-CASE-INSENSITIVE-P*</title> + <title>CL Unification: Variable *UNIFY-STRING-CASE-SENSITIVE-P*</title> <link rel="stylesheet" href="main.css"> </head> @@ -11,7 +11,7 @@ <td colspan="3"> <div class="header" style="font-family:=Verdana,Arial,Helvetica; font-size: 18px; color: #41286f;"> - <strong><i>CL Unification: Variable *UNIFY-STRING-CASE-INSENSITIVE-P*</title></i></strong> + <strong><i>CL Unification: Variable *UNIFY-STRING-CASE-SENSITIVE-P*</title></i></strong> <div class="navigation"> <a href="index.html" class="navigation-link">Home</a> | <a href="unification-package.html" class="navigation-link">Previous</a> @@ -33,7 +33,7 @@ <div class="content"> <div class="text" style="padding-top: 10px;"> - <h1><i>Variable</i> <strong>*UNIFY-STRING-CASE-INSENSITIVE-P*</strong></h1> + <h1><i>Variable</i> <strong>*UNIFY-STRING-CASE-SENSITIVE-P*</strong></h1> <h2>Package:</h2> @@ -56,9 +56,9 @@ <h2>Description:</h2> - <p>The value of *UNIFY-STRING-CASE-INSENSITIVE-P* controls the + <p>The value of *UNIFY-STRING-CASE-SENSITIVE-P* controls the behavior of the UNIFY method with signature <code>(<i>string</i> <i>string</i>)</code>. - If NIL (the default), the method will use STRING= to test for + If T (the default), the method will use STRING= to test for equality of the two strings. Otherwise, the UNIFY method will use STRING-EQUAL.</p> <h2>Affected By:</h2>

1 0

[cl-unification-cvs] CVS cl-unification
by rbrown 11 Feb '11

11 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv12304 Modified Files: templates-hierarchy.lisp unification-package.lisp unifier.lisp Log Message: Use *unify-string-case-sensitive-p* consistently. Change the documentation. templates-hierarchy.lisp: Fix stream argument to print-object. --- /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2009/12/17 16:43:12 1.6 +++ /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2011/02/11 17:49:38 1.7 @@ -106,7 +106,7 @@ (:method ((x t)) nil)) -(defmethod print-object ((template template) (stream stream)) +(defmethod print-object ((template template) stream) (format stream "#T~S" (template-spec template))) --- /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2009/12/17 16:43:51 1.7 +++ /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2011/02/11 17:49:38 1.8 @@ -21,7 +21,7 @@ "TEMPLATE-SPEC") (:export - "*UNIFY-STRING-CASE-INSENSITIVE-P*" + "*UNIFY-STRING-CASE-SENSITIVE-P*" "UNIFY" "FIND-VARIABLE-VALUE" "V?" --- /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/01/18 14:50:17 1.8 +++ /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/02/11 17:49:38 1.9 @@ -91,7 +91,7 @@ Two CHARACTERs A and B unify if and only if they satisfy either #'CHAR= or #'CHAR-EQUAL. The choice of which of test to perform (#'CHAR= or #'CHAR-EQUAL) is made according to the value of the variable -*UNIFY-STRING-CASE-INSENSITIVE-P*, which defaults to NIL. +*UNIFY-STRING-CASE-SENSITIVE-P*, which defaults to T. If A and B unify then an unmodified environment ENV is returned, otherwise an error of type UNIFICATION-FAILURE is signaled." (cond ((and case-sensitive (char= a b)) @@ -113,12 +113,12 @@ Two strings A and B unify if and only if they satisfy either #'STRING= or #'STRING-EQUAL. The choice of which of test to perform (#'STRING= or #'STRING-EQUAL) is made according to the value of the variable -*UNIFY-STRING-CASE-INSENSITIVE-P*, which defaults to NIL. +*UNIFY-STRING-CASE-SENSITIVE-P*, which defaults to T. If A and B unify then an unmodified environment ENV is returned, otherwise an error of type UNIFICATION-FAILURE is signaled." (cond ((and case-sensitive (string= a b)) env) - ((string-equal a b) + ((and (not case-sensitive) (string-equal a b)) env) (t (error 'unification-failure

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 18 Jan '11

18 Jan '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv18250 Modified Files: README Log Message: Copyright dates updated. --- /project/cl-unification/cvsroot/cl-unification/README 2008/07/13 13:30:28 1.4 +++ /project/cl-unification/cvsroot/cl-unification/README 2011/01/18 14:55:22 1.5 @@ -1,6 +1,6 @@ CL-UNIFICATION -Marco Antoniotti (c) 2004-2008 +Marco Antoniotti (c) 2004-2011 The directory containing this file you are reading should contain the code and the documentation of the CL-UNIFICATION package.

1 0