April 2009 - cl-unification-cvs@common-lisp.net

[cl-unification-cvs] CVS cl-unification
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv28962 Modified Files: ChangeLog Log Message: ChangeLog updated. --- /project/cl-unification/cvsroot/cl-unification/ChangeLog 2009/04/15 14:33:35 1.6 +++ /project/cl-unification/cvsroot/cl-unification/ChangeLog 2009/04/17 22:44:17 1.7 @@ -1,3 +1,71 @@ +2009-04-18 author <author(a)Macintosh-9.local> + + * cl-unification.system, cl-unification.asd: + System definitions files (.asd and .system) modified in order to make + dependency form CL-PPCRE optional. + + * lib-dependent/cl-ppcre-template.system: File added. + + * lib-dependent/cl-ppcre-template.lisp: + Removed REQUIRE of CL-PPCRE. Too brittle. + + * cl-unification-lib.asd: File added. + +2009-04-17 author <author(a)Macintosh-9.local> + + * unification-package.lisp: + Added a few exports and changed the actual package name (i.e., I put + my money where my mouth is; the "published" package name is now a + nickname). + + * apply-substitution.lisp: + Fixed a couple of snags. APPLY-SUBSTITUTION was not applied + recursively and it was barfing on numbers. + Current version is still incomplete, but it serves as a template for + further development. + +2009-04-15 author <author(a)Macintosh-9.local> + + * ChangeLog: ChangeLog updated. + + * lib-dependent/cl-ppcre-template.lisp, test/unification-tests.lisp: + Modified Files: + test/unification-tests.lisp + Added Files: + lib-dependent/cl-ppcre-template.lisp + + The cl-ppcre-template reuses E. Weitz's wonderful CL-PPCRE library + to provide a seamless (YMMV) reuse of regular expressions within + CL-UNIFICATION. + + * templates-hierarchy.lisp: Added LAMBDA-TEMPLATE. + + * substitutions.lisp: + Added some functionality to extract all variables and/or all values + from an environment or a frame. + + * match-block.lisp: + Added MATCHF (whose name may change) to simplify the + 'destructuring-bind'-like syntax and behavior of the matching + facilities. + + * COPYING: Dates updated. + + * unifier.lisp: + Major API change to 'unify'. It now accepts keywords. Old code + shouls not be affected, but new code is now more flexible. Look the + the STRING and (new) CHARACTER methods to see how this change is + affecting the code. + + * variables.lisp: Some 'diff' unfathomable change happened. + + * unification-package.lisp: Added exports of a few symbols. + + * cl-unification.system, cl-unification.asd: + Fixed a few snags and added "lib-dependent" module. + + * apply-substitution.lisp: Added some functionality and comments. + 2009-04-15 author <author(a)paniscia.pd.disco.unimib.it> * lib-dependent/cl-ppcre-template.lisp, test/unification-tests.lisp:

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv28885 Modified Files: cl-unification.system Log Message: System definitions files (.asd and .system) modified in order to make dependency form CL-PPCRE optional. --- /project/cl-unification/cvsroot/cl-unification/cl-unification.system 2009/04/15 10:09:43 1.3 +++ /project/cl-unification/cvsroot/cl-unification/cl-unification.system 2009/04/17 22:42:50 1.4 @@ -4,21 +4,21 @@ ;;;; MK:DEFSYSTEM system file. (mk:defsystem "CL-UNIFICATION" - :source-extension "lisp" - :components ("unification-package" - "variables" - "substitutions" - "lambda-list-parsing" - "templates-hierarchy" - "unifier" - "match-block" - "apply-substitution" - (:module "lib-dependent" - :depends-on ("templates-hierarchy" "unifier") - :components ( - #+cl-ppcre - (:file "cl-ppcre-template") - )) - )) + :source-extension "lisp" + :components ("unification-package" + "variables" + "substitutions" + "lambda-list-parsing" + "templates-hierarchy" + "unifier" + "match-block" + "apply-substitution" + (:module "lib-dependent" + :depends-on ("templates-hierarchy" "unifier") + :components ((:subsystem "cl-ppcre-template" + :non-required-p t + ) + )) + )) ;;; end of file -- cl-unification.system --

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv28862 Modified Files: cl-unification.asd Log Message: System definitions files (.asd and .system) modified in order to make dependency form CL-PPCRE optional. --- /project/cl-unification/cvsroot/cl-unification/cl-unification.asd 2009/04/15 10:06:40 1.2 +++ /project/cl-unification/cvsroot/cl-unification/cl-unification.asd 2009/04/17 22:42:46 1.3 @@ -3,22 +3,38 @@ ;;;; cl-unification.asd -- ;;;; ASDF system file. -(asdf:defsystem cl-unification - :author "Marco Antoniotti" - :serial t - :components ((:file "unification-package") - (:file "variables") - (:file "substitutions") - (:file "lambda-list-parsing") - (:file "templates-hierarchy") - (:file "unifier") - (:file "match-block") - (:file "apply-substitution") - (:module "lib-dependent" - :depends-on ("templates-hierarchy" "unifier") - :components ( - #+cl-ppcre - (:file "cl-ppcre-template") - )))) +;;;;=========================================================================== +;;;; Simple stuff that should be built in ASDF. + +(defpackage "CL-UNIFICATION-SYSTEM" (:use "CL" "ASDF")) + +(in-package "CL-UNIFICATION-SYSTEM") + +(defclass asdf-system-definition-file (asdf:cl-source-file) ()) +(defmethod source-file-type ((c asdf-system-definition-file) (s module)) "asd") + + +(asdf:defsystem :cl-unification + :author "Marco Antoniotti" + :serial t + :components ((:file "unification-package") + (:file "variables") + (:file "substitutions") + (:file "lambda-list-parsing") + (:file "templates-hierarchy") + (:file "unifier") + (:file "match-block") + (:file "apply-substitution") + #+asdf-with-optional-dependencies + (:module "lib-dependent" + :pathname "lib-dependent" + :depends-on ("templates-hierarchy" "unifier") + :components ((:file "cl-ppcre-template" + :depends-on (cl-ppcre)) + )) + #-asdf-with-optional-dependencies + (asdf-system-definition-file + "cl-unification-lib") + )) ;;;; end of file -- cl-unification.asd --

1 0

[cl-unification-cvs] CVS cl-unification/lib-dependent
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification/lib-dependent In directory cl-net:/tmp/cvs-serv28811 Added Files: cl-ppcre-template.system Log Message: File added. --- /project/cl-unification/cvsroot/cl-unification/lib-dependent/cl-ppcre-template.system 2009/04/17 22:41:34 NONE +++ /project/cl-unification/cvsroot/cl-unification/lib-dependent/cl-ppcre-template.system 2009/04/17 22:41:34 1.1 ;;;; -*- Mode: Lisp -*- ;;;; cl-ppcre-template.system -- ;;;; MK system file. (mk:defsystem "CL-PPCRE-TEMPLATE" :author "Marco Antoniotti" :non-required-p t :components ((:file "cl-ppcre-template")) :depends-on ("CL-PPCRE")) ;;;; end of file -- cl-ppcre-template.system --

1 0

[cl-unification-cvs] CVS cl-unification/lib-dependent
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification/lib-dependent In directory cl-net:/tmp/cvs-serv28352 Modified Files: cl-ppcre-template.lisp Log Message: Removed REQUIRE of CL-PPCRE. Too brittle. --- /project/cl-unification/cvsroot/cl-unification/lib-dependent/cl-ppcre-template.lisp 2009/04/15 10:24:28 1.1 +++ /project/cl-unification/cvsroot/cl-unification/lib-dependent/cl-ppcre-template.lisp 2009/04/17 22:40:29 1.2 @@ -5,8 +5,6 @@ (in-package "CL.EXT.DACF.UNIFICATION") ; DACF = Data And Control Flow. -(require "CL-PPCRE") - ;;;; REGEXP Templates. ;;;; Another extension of the type specifier language.

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv26484 Added Files: cl-unification-lib.asd Log Message: File added. --- /project/cl-unification/cvsroot/cl-unification/cl-unification-lib.asd 2009/04/17 22:39:06 NONE +++ /project/cl-unification/cvsroot/cl-unification/cl-unification-lib.asd 2009/04/17 22:39:06 1.1 ;;;; -*- Mode: Lisp -*- ;;;; cl-unification-lib.asd -- ;;;; ASDF system file. (asdf:defsystem :cl-unification-lib :author "Marco Antoniotti" :components ((:module "lib-dependent" :components ((:file "cl-ppcre-template")))) :depends-on (cl-ppcre cl-unification)) ;;;; end of file -- cl-unification-lib.asd --

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv19172 Modified Files: unification-package.lisp Log Message: Added a few exports and changed the actual package name (i.e., I put my money where my mouth is; the "published" package name is now a nickname). --- /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2009/04/15 10:10:25 1.5 +++ /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2009/04/17 07:53:58 1.6 @@ -1,7 +1,14 @@ -;;; -*- Mode: Lisp -*- +;;;; -*- Mode: Lisp -*- -(defpackage "CL.EXT.DACF.UNIFICATION" (:use "CL") - (:nicknames "UNIFY") +;;;; unification-package.lisp -- +;;;; Package definition for the CL-UNIFICATION library. +;;;; +;;;; Copyright (c) 2004-2009 Marco Antoniotti +;;;; See file COPYING for licensing information. + + +(defpackage "IT.UNIMIB.DISCO.MA.CL.EXT.DACF.UNIFICATION" (:use "CL") + (:nicknames "CL.EXT.DACF.UNIFICATION" "UNIFY" "unify") (:documentation "The CL.EXT.DACF.UNIFICATION Package. This package contains all the definitions necessary for the general @@ -40,6 +47,11 @@ "UNIFY*" "UNIFY-EQUATIONS" "UNIFY-EQUATIONS*") + + #+cl-ppcre + (:export + "REGULAR-EXPRESSION" + "REGEXP") ) -;;; end of file -- unification-package.lisp -- +;;;; end of file -- unification-package.lisp --

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 17 Apr '09

17 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv19119 Modified Files: apply-substitution.lisp Log Message: Fixed a couple of snags. APPLY-SUBSTITUTION was not applied recursively and it was barfing on numbers. Current version is still incomplete, but it serves as a template for further development. --- /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp 2009/04/15 10:05:58 1.3 +++ /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp 2009/04/17 07:52:25 1.4 @@ -17,6 +17,11 @@ (defgeneric apply-substitution (substitution item &optional exclude-vars)) +(defmethod apply-substitution ((s environment) (n number) &optional exclude-vars) + (declare (ignore exclude-vars)) + n) + + (defmethod apply-substitution ((substitution environment) (s symbol) &optional (exclude-vars ())) (declare (type list exclude-vars)) @@ -26,7 +31,7 @@ s (multiple-value-bind (val foundp) (find-variable-value s substitution) - (cond (foundp val) + (cond (foundp (apply-substitution substitution val exclude-vars)) (t (warn "~S is a free variable in the current environment." s) s))))

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 15 Apr '09

15 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv2895 Modified Files: ChangeLog Log Message: ChangeLog updated. --- /project/cl-unification/cvsroot/cl-unification/ChangeLog 2008/07/13 13:36:42 1.5 +++ /project/cl-unification/cvsroot/cl-unification/ChangeLog 2009/04/15 14:33:35 1.6 @@ -1,3 +1,85 @@ +2009-04-15 author <author(a)paniscia.pd.disco.unimib.it> + + * lib-dependent/cl-ppcre-template.lisp, test/unification-tests.lisp: + Modified Files: + test/unification-tests.lisp + Added Files: + lib-dependent/cl-ppcre-template.lisp + + The cl-ppcre-template reuses E. Weitz's wonderful CL-PPCRE library + to provide a seamless (YMMV) reuse of regular expressions within + CL-UNIFICATION. + + * templates-hierarchy.lisp: Added LAMBDA-TEMPLATE. + + * substitutions.lisp: + Added some functionality to extract all variables and/or all values + from an environment or a frame. + + * match-block.lisp: + Added MATCHF (whose name may change) to simplify the + 'destructuring-bind'-like syntax and behavior of the matching + facilities. + + * COPYING: Dates updated. + + * unifier.lisp: + Major API change to 'unify'. It now accepts keywords. Old code + shouls not be affected, but new code is now more flexible. Look the + the STRING and (new) CHARACTER methods to see how this change is + affecting the code. + + * variables.lisp: Some 'diff' unfathomable change happened. + + * unification-package.lisp: Added exports of a few symbols. + + * cl-unification.system, cl-unification.asd: + Fixed a few snags and added "lib-dependent" module. + + * apply-substitution.lisp: Added some functionality and comments. + +2008-07-13 author <author(a)paniscia.pd.disco.unimib.it> + + * ChangeLog: Changelog updated. + + * ACKNOWLEDGEMENTS: + Added credits to a few people. Missing ones should bug the maintainer :) + + * README: Copyright dates updated. + + * unification.asd, unification.system: Cleaning up. + Committing in . + + Removed Files: + unification.asd unification.system + + * templates-hierarchy-saved.lisp: Clenaing up. + Committing in . + + Removed Files: + templates-hierarchy-saved.lisp + + * INSTALLATION: Instructions updated. + + * COPYING: Copyright dates updated. + + * test/unification-tests.lisp: Added file. + + * substitutions.lisp, templates-hierarchy.lisp, unification-package.lisp, variables.lisp: + Some modification added. Exported symbols and reverted + reader macro #T to construct template instances at read time. + Added MAKE-LOAD-FORM method for templates which should fix problem with + SBCL. + + Committing in . + + Modified Files: + substitutions.lisp templates-hierarchy.lisp + unification-package.lisp variables.lisp + + * cl-unification.system: + Added explicit :source-extension to accomodate Allegro CL. + 2008-07-13 author <author(a)Macintosh.local> * ACKNOWLEDGEMENTS:

1 0

[cl-unification-cvs] CVS cl-unification/lib-dependent
by mantoniotti 15 Apr '09

15 Apr '09

Update of /project/cl-unification/cvsroot/cl-unification/lib-dependent In directory cl-net:/tmp/cvs-serv30009/lib-dependent Added Files: cl-ppcre-template.lisp Log Message: Modified Files: test/unification-tests.lisp Added Files: lib-dependent/cl-ppcre-template.lisp The cl-ppcre-template reuses E. Weitz's wonderful CL-PPCRE library to provide a seamless (YMMV) reuse of regular expressions within CL-UNIFICATION. --- /project/cl-unification/cvsroot/cl-unification/lib-dependent/cl-ppcre-template.lisp 2009/04/15 10:24:28 NONE +++ /project/cl-unification/cvsroot/cl-unification/lib-dependent/cl-ppcre-template.lisp 2009/04/15 10:24:28 1.1 ;;;; -*- Mode: Lisp -*- ;;;; cl-ppcre-template.lisp -- ;;;; REGEXP template dependent on CL-PPCRE. (in-package "CL.EXT.DACF.UNIFICATION") ; DACF = Data And Control Flow. (require "CL-PPCRE") ;;;; REGEXP Templates. ;;;; Another extension of the type specifier language. ;;;; A template can also be ;;;; ;;;; <template> ::= #| templates from template-hierarchy.lisp |# ;;;; | <regexp template> ;;;; ;;;; Hairier REGEXP template spec syntax: ;;;; ;;;; (regexp|regular-expression) <REGEXP> &optional <unification vars> &rest <keys> ;;;; ;;;; where ;;;; ;;;; <REGEXP> ::= <a CL-PPCRE regexp string or tree> ;;;; <unification vars> ::= '(' <variable>* ')' ;;;; <keys> ::= <CL-PPCRE (constant) keys to be passed to CL-PPCRE:CREATE-SCANNER> (defclass regular-expression-template (string-template) ((scanner :reader scanner) (regexp :reader regular-expression) (vars :reader variables :reader registers :type list) ) (:documentation "The Regular Expression Template. A template for matching strings using regular expressions. The actual matching is done thankes to the CL-PPCRE library.") ) (defgeneric regular-expression-template-p (x) (:method ((x regular-expression-template)) t) (:method ((x t)) nil)) (defmethod make-template ((kind (eql 'regexp)) (spec cons)) (make-instance 'regular-expression-template :spec spec)) (defmethod make-template ((kind (eql 'regular-expression)) (spec cons)) (make-template 'regexp spec)) (defmethod initialize-instance :after ((re-t regular-expression-template) &key) (destructuring-bind (re-kwd regexp &optional vars &rest keys) (template-spec re-t) (declare (ignore re-kwd)) (multiple-value-bind (scanner reg-names) (let ((cl-ppcre:*allow-named-registers* t)) (apply #'cl-ppcre:create-scanner regexp keys)) (declare (ignorable reg-names)) (setf (slot-value re-t 'scanner) scanner (slot-value re-t 'regexp) regexp (slot-value re-t 'vars) vars ; Maybe will merge with REG-NAMES... ) ))) #| (defmethod initialize-instance :after ((re-t regular-expression-template) &key) ;; FIX: handling of CL-PPCRE:CREATE-SCANNER keywords. This can be ;; done by using the "harier" syntax of SPEC (see above). (destructuring-bind (re-kwd regexp &optional vars &rest keys) (template-spec re-t) (declare (ignore re-kwd) (ignorable regexp vars keys)) (multiple-value-bind (scanner reg-names) (let ((cl-ppcre:*allow-named-registers* t)) (cl-ppcre:create-scanner (second (template-spec re-t)))) (declare (ignorable reg-names)) (setf (slot-value re-t 'scanner) scanner (slot-value re-t 'regexp) (second (template-spec re-t)) ; For the time being just stored and ; used for debugging. ) ))) |# ;;;;--------------------------------------------------------------------------- ;;;; Implementation. ;;; Unification. (defmethod unify ((ret1 regular-expression-template) (ret2 regular-expression-template) &optional (env (make-empty-environment)) &key &allow-other-keys) (if (eq ret1 ret2) env ;; I could UNIFY the result of the CL-PPCRE:PARSE-STRINGs. (error 'unification-failure :format-control "Do not know how unify the two ~ regular-expression templates: ~S and ~S." :format-arguments (list ret1 ret2)))) (defmethod unify ((re-t regular-expression-template) (s string) &optional (env (make-empty-environment)) &key (start 0) end &allow-other-keys) (declare (type (integer 0 #.most-positive-fixnum) start) (type (or null (integer 0 #.most-positive-fixnum)) end)) (let ((end (or end (length s)))) (declare (type (integer 0 #.most-positive-fixnum) end)) (multiple-value-bind (m-start m-end r-starts r-ends) (cl-ppcre:scan (scanner re-t) s :start start :end end) ;; Maybe SCAN-TO-STRINGS would be simpler to use... (declare (type (integer 0 #.most-positive-fixnum) m-start m-end) (type (vector (integer 0 #.most-positive-fixnum)) r-starts r-ends)) (unless (and (= start m-start) (= m-end end)) (error 'unification-failure :format-control "String ~S cannot be matched against ~ regular expression ~S." :format-arguments (list s (regular-expression re-t)))) (let ((vars (variables re-t))) (if (null vars) env (loop for r-start across r-starts for r-end across r-ends for r-string of-type string = (subseq s r-start r-end) for v in vars for result-env = (var-unify v r-string env) then (var-unify v r-string result-env) finally (return result-env)))) ))) (defmethod unify ((s string) (re-t regular-expression-template) &optional (env (make-empty-environment)) &key (start 0) end &allow-other-keys) (unify re-t s env :start start :end end)) ;;;; end of file -- cl-ppcre-template.lisp --

1 0