February 2011 - cl-unification-cvs@common-lisp.net

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv2765 Modified Files: unifier.lisp Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/02/24 20:44:12 1.11 +++ /project/cl-unification/cvsroot/cl-unification/unifier.lisp 2011/02/26 09:22:33 1.12 @@ -3,6 +3,8 @@ ;;; unifier.lisp ;;; General CL structures unifier. +;;;; See file COPYING for copyright licensing information. + (in-package "CL.EXT.DACF.UNIFICATION") ; DACF = Data And Control Flow. (defgeneric unify (a b &optional env &key &allow-other-keys)

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv2727 Modified Files: unification-package.lisp Log Message: Exported a few more symbols. --- /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2011/02/11 17:49:38 1.8 +++ /project/cl-unification/cvsroot/cl-unification/unification-package.lisp 2011/02/26 09:22:10 1.9 @@ -3,8 +3,8 @@ ;;;; unification-package.lisp -- ;;;; Package definition for the CL-UNIFICATION library. ;;;; -;;;; Copyright (c) 2004-2009 Marco Antoniotti -;;;; See file COPYING for licensing information. +;;;; Copyright (c) 2004-2011 Marco Antoniotti +;;;; See file COPYING for copyright licensing information. (defpackage "IT.UNIMIB.DISCO.MA.CL.EXT.DACF.UNIFICATION" (:use "CL") @@ -16,17 +16,9 @@ The package also has the \"UNIFY\" nickname.") (:export - "MAKE-TEMPLATE" - "TEMPLATEP" - "TEMPLATE-SPEC") - - (:export "*UNIFY-STRING-CASE-SENSITIVE-P*" "UNIFY" - "FIND-VARIABLE-VALUE" - "V?" - "MAKE-EMPTY-ENVIRONMENT" "APPLY-SUBSTITUTION" "UNIFICATION-FAILURE" @@ -35,7 +27,29 @@ (:export "ENVIRONMENT" - "ENVIRONMENT-P") + "ENVIRONMENT-P" + "MAKE-EMPTY-ENVIRONMENT" + "EMPTY-ENVIRONMENT-P" + "MAKE-SHARED-ENVIRONMENT" + "COPY-ENVIRONMENT" + + "PUSH-FRAME" + "POP-FRAME" + + "BINDING-VARIABLE" + "BINDING-VALUE" + + "EXTEND-ENVIRONMENT" + "FILL-ENVIRONMENT" + "FILL-ENVIRONMENT*" + + "FIND-VARIABLE-VALUE" + "V?" + + "NEW-VAR" + "VARIABLEP" + "VARIABLE-ANY-P" + ) (:export "MATCH" @@ -50,6 +64,14 @@ "UNIFY-EQUATIONS" "UNIFY-EQUATIONS*") + (:export + "MAKE-TEMPLATE" + "TEMPLATEP" + "TEMPLATE-SPEC" + + "COLLECT-TEMPLATE-VARS" + ) + #+cl-ppcre (:export "REGULAR-EXPRESSION"

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv2693 Modified Files: templates-hierarchy.lisp Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2011/02/24 20:44:12 1.8 +++ /project/cl-unification/cvsroot/cl-unification/templates-hierarchy.lisp 2011/02/26 09:21:14 1.9 @@ -2,6 +2,8 @@ ;;;; templates-hierarchy.lisp -- +;;;; See file COPYING for copyright licensing information. + (in-package "CL.EXT.DACF.UNIFICATION") ; DACF = Data And Control Flow. ;;; Templates.

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv2661 Modified Files: substitutions.lisp Log Message: Changed some environment functions and improved the DUMP-* ones. --- /project/cl-unification/cvsroot/cl-unification/substitutions.lisp 2011/01/18 14:48:02 1.6 +++ /project/cl-unification/cvsroot/cl-unification/substitutions.lisp 2011/02/26 09:20:45 1.7 @@ -4,6 +4,8 @@ ;;;; General CL structures unifier. ;;;; Substitution definitions. Mostly a rehash of the usual SICP stuff. +;;;; See file COPYING for copyright licensing information. + (in-package "CL.EXT.DACF.UNIFICATION") ; DACF = Data And Control Flow. ;;;--------------------------------------------------------------------------- @@ -113,10 +115,23 @@ (make-environment :frames (list (make-frame)))) (defun copy-environment (env) + (declare (type environment env)) (make-environment :frames (copy-list (environment-frames env)))) -(defun make-shared-environment (env) - (make-environment :frames (environment-frames env))) +(defun make-shared-environment (env &optional (pushp nil)) + (declare (type environment env)) + (make-environment :frames (if pushp + (cons (make-frame) (environment-frames env)) + (environment-frames env)))) + +(defun push-frame (env) + (declare (type environment env)) + (push (make-frame) (environment-frames env))) + +(defun push-frame (env) + (declare (type environment env)) + (pop (environment-frames env))) + (defun empty-environment-p (env) (declare (type environment env)) @@ -187,13 +202,20 @@ (defun dump-frame (f &optional (out *standard-output*)) (declare (type frame f)) - (terpri out) (loop for (var . value) in (frame-bindings f) - do (format out "~A~VT= ~A~%" var 8 value)) + do (format out "~&~A~VT= ~A~%" var 8 value)) ) (defun dump-environment (env &optional (out *standard-output*)) (declare (type environment env)) - (map nil #'(lambda (f) (dump-frame f out)) (environment-frames env))) + (if (empty-environment-p env) + (format out ">>> Empty unify environment ~S.~%" env) + (loop initially (format out ">>> Dumping unify environment ~S.~%" env) + for fr in (environment-frames env) + for fr-n downfrom (list-length (environment-frames env)) + do (format out ">>> Frame ~D:~%" fr-n) + do (dump-frame fr out) + do (terpri out) + ))) ;;;; end of file -- substitutions.lisp --

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv32600 Modified Files: match-block.lisp Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/match-block.lisp 2011/02/24 20:44:12 1.11 +++ /project/cl-unification/cvsroot/cl-unification/match-block.lisp 2011/02/26 09:19:01 1.12 @@ -3,6 +3,8 @@ ;;;; match-block.lisp -- ;;;; Various macros built on top of the unifier: MATCH, MATCHING and MATCH-CASE. +;;;; See file COPYING for copyright licensing information. + (in-package "UNIFY") (defun clean-unify-var-name (v)

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv32574 Modified Files: lambda-list-parsing.lisp Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/lambda-list-parsing.lisp 2011/02/24 20:44:12 1.3 +++ /project/cl-unification/cvsroot/cl-unification/lambda-list-parsing.lisp 2011/02/26 09:18:17 1.4 @@ -2,6 +2,8 @@ ;;; lambda-list-parsing.lisp -- +;;;; See file COPYING for copyright licensing information. + (in-package "UNIFY")

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv32541 Modified Files: cl-unification.system Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/cl-unification.system 2011/02/24 20:44:12 1.5 +++ /project/cl-unification/cvsroot/cl-unification/cl-unification.system 2011/02/26 09:17:43 1.6 @@ -3,6 +3,8 @@ ;;;; cl-unification.system -- ;;;; MK:DEFSYSTEM system file. +;;;; See file COPYING for copyright licensing information. + (mk:defsystem "CL-UNIFICATION" :source-extension "lisp" :components ("unification-package"

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv32480 Modified Files: cl-unification.asd Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/cl-unification.asd 2011/02/16 16:22:57 1.4 +++ /project/cl-unification/cvsroot/cl-unification/cl-unification.asd 2011/02/26 09:15:27 1.5 @@ -3,6 +3,8 @@ ;;;; cl-unification.asd -- ;;;; ASDF system file. +;;;; See file COPYING for copyright licensing information. + ;;;;=========================================================================== ;;;; Simple stuff that should be built in ASDF.

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv32457 Modified Files: cl-unification-lib.asd Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/cl-unification-lib.asd 2009/04/17 22:39:06 1.1 +++ /project/cl-unification/cvsroot/cl-unification/cl-unification-lib.asd 2011/02/26 09:15:08 1.2 @@ -2,6 +2,8 @@ ;;;; cl-unification-lib.asd -- ;;;; ASDF system file. +;;;; +;;;; See file COPYING for copyright and licensing information. (asdf:defsystem :cl-unification-lib :author "Marco Antoniotti"

1 0

[cl-unification-cvs] CVS cl-unification
by mantoniotti 26 Feb '11

26 Feb '11

Update of /project/cl-unification/cvsroot/cl-unification In directory cl-net:/tmp/cvs-serv31385 Modified Files: apply-substitution.lisp Log Message: Minor changes (added COPYING information and other minutiae). --- /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp 2011/02/24 20:44:12 1.5 +++ /project/cl-unification/cvsroot/cl-unification/apply-substitution.lisp 2011/02/26 09:13:56 1.6 @@ -1,8 +1,10 @@ -;;; -*- Mode: Lisp -*- +;;;; -*- Mode: Lisp -*- -;;; substitutions.lisp -;;; General CL structures unifier. -;;; Substitution definitions. +;;;; apply-substitutions.lisp -- +;;;; General CL structures unifier. +;;;; Substitution definitions. +;;;; +;;;; See the file COPYING for copyright and licensing information. (in-package "CL.EXT.DACF.UNIFICATION") ; DACF = Data And Control Flow. @@ -80,4 +82,4 @@ (apply-substitution substitution term)) -;;; end of file -- apply-substitutions.lisp -- +;;;; end of file -- apply-substitutions.lisp --

1 0