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