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

[cl-unification-cvs] CVS update: cl-unification/docs/html/control-flow.html
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification/docs/html In directory common-lisp.net:/tmp/cvs-serv26398 Modified Files: control-flow.html Log Message: Fixed factorial example. Date: Wed Apr 27 23:04:59 2005 Author: mantoniotti Index: cl-unification/docs/html/control-flow.html diff -u cl-unification/docs/html/control-flow.html:1.1.1.1 cl-unification/docs/html/control-flow.html:1.2 --- cl-unification/docs/html/control-flow.html:1.1.1.1 Wed Nov 17 23:19:55 2004 +++ cl-unification/docs/html/control-flow.html Wed Apr 27 23:04:59 2005 @@ -68,7 +68,7 @@ (defun factorial (x) (<b>match-case</b> (x) (0 1) - (#T(number ?n) (factorial (1- ?n))) + (#T(number ?n) (* ?n (factorial (1- ?n)))) (otherwise (error "Incorrect match for ~S." x)))) </pre> </p>

1 0

[cl-unification-cvs] CVS update: cl-unification/match-block.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv26367 Modified Files: match-block.lisp Log Message: Added IGNORABLE declaration to MATCH macro expansion. This is useful in quieting various compilers. Date: Wed Apr 27 23:04:36 2005 Author: mantoniotti Index: cl-unification/match-block.lisp diff -u cl-unification/match-block.lisp:1.4 cl-unification/match-block.lisp:1.5 --- cl-unification/match-block.lisp:1.4 Wed Apr 27 22:54:05 2005 +++ cl-unification/match-block.lisp Wed Apr 27 23:04:36 2005 @@ -42,7 +42,11 @@ (let* ((,env-var (unify ',template ,object ,substitution)) ,@(generate-var-bindings) ) + (declare (ignorable ,@(mapcar #'first (generate-var-bindings)))) ,@forms) + + ;; Yes. The above is sligthly wasteful. + (unification-failure (uf) (if ,errorp (signal uf)

1 0

[cl-unification-cvs] CVS update: cl-unification/match-block.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv25202 Modified Files: match-block.lisp Log Message: Added acknowledgement to Peter Scott. Date: Wed Apr 27 22:54:05 2005 Author: mantoniotti Index: cl-unification/match-block.lisp diff -u cl-unification/match-block.lisp:1.3 cl-unification/match-block.lisp:1.4 --- cl-unification/match-block.lisp:1.3 Wed Apr 27 22:52:09 2005 +++ cl-unification/match-block.lisp Wed Apr 27 22:54:05 2005 @@ -127,6 +127,9 @@ +;;; match-case -- +;;; Implementation provided by Peter Scott. + (defmacro match-case ((object &key errorp default-substitution) &rest clauses) "MATCH-CASE sets up a CASE-like environment for multiple template matching clauses. The syntax of MATCH-CASE comprises a number of clauses of the form

1 0

[cl-unification-cvs] CVS update: cl-unification/match-block.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv25105 Modified Files: match-block.lisp Log Message: Fixed bug in condition signaling within MATCH-CASE. Date: Wed Apr 27 22:52:09 2005 Author: mantoniotti Index: cl-unification/match-block.lisp diff -u cl-unification/match-block.lisp:1.2 cl-unification/match-block.lisp:1.3 --- cl-unification/match-block.lisp:1.2 Wed Apr 27 22:41:56 2005 +++ cl-unification/match-block.lisp Wed Apr 27 22:52:09 2005 @@ -166,7 +166,8 @@ (if otherwise-clause-present-p (first (last clauses)) (when errorp - `(error 'unification-not-exhaustive)))) + `(error 'unification-non-exhaustive + :format-control "Non exhaustive matching.")))) ) (labels ((generate-matchers (clauses) (if (null clauses)

1 0

[cl-unification-cvs] CVS update: cl-unification/templates-hierarchy.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv24008 Modified Files: templates-hierarchy.lisp Log Message: Fixed bugs in COLLECT-TEMPLATE-VARS for NUMBER-TEMPLATEs. If a variable was present, then the method was not returning a list. The treatment of constants like PI was also incorrect, as the numeric value was returned. Retunrning () seems the right thing to do instead. Date: Wed Apr 27 22:44:25 2005 Author: mantoniotti Index: cl-unification/templates-hierarchy.lisp diff -u cl-unification/templates-hierarchy.lisp:1.1.1.1 cl-unification/templates-hierarchy.lisp:1.2 --- cl-unification/templates-hierarchy.lisp:1.1.1.1 Wed Nov 17 23:19:54 2004 +++ cl-unification/templates-hierarchy.lisp Wed Apr 27 22:44:25 2005 @@ -485,10 +485,13 @@ (let ((template (number-template-number template))) (etypecase template (number ()) - (symbol (cond ((variablep template) template) + (symbol (cond ((and (variablep template) (not (variable-any-p template))) + (list template)) ((and (boundp template) (numberp (symbol-value template))) - (symbol-value template)) + ;; This handles cases like #T(number pi) + ;; It may be too broad, but for the time being it seems ok. + nil) (t (error "Invalid number template ~S." template)))))))

1 0

[cl-unification-cvs] CVS update: cl-unification/match-block.lisp
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv23912 Modified Files: match-block.lisp Log Message: Added MATCH-CASE macro. Slightly modified from the version provided by Peter Scott. Date: Wed Apr 27 22:41:56 2005 Author: mantoniotti Index: cl-unification/match-block.lisp diff -u cl-unification/match-block.lisp:1.1.1.1 cl-unification/match-block.lisp:1.2 --- cl-unification/match-block.lisp:1.1.1.1 Wed Nov 17 23:19:54 2004 +++ cl-unification/match-block.lisp Wed Apr 27 22:41:56 2005 @@ -126,4 +126,59 @@ )) + +(defmacro match-case ((object &key errorp default-substitution) &rest clauses) + "MATCH-CASE sets up a CASE-like environment for multiple template matching clauses. +The syntax of MATCH-CASE comprises a number of clauses of the form + + <clause> ::= <regular-clause> | <default-clause> + <regular-clause> ::= (<template> &body <forms>) + <default-clause> ::= (t &body <forms>) + | (otherwise &body <forms>) +<form> and <forms> are regular Common Lisp forms. +<template> is a unification template. + +The full syntax of MATCHING is + + match-case <object> (&key errorp default-substitution) <clauses> + +Each clause evaluates its forms in an environment where the variables +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 first clause that satisfies the match test. + +If ERRORP is non-NIL then if none of the regular clauses matches, then +an error of type UNIFICATION-NON-EXAUSTIVE is signalled, regardless of +any default clause. Otherwise, the default clause behaves as a +standard CASE default clause. The default value of ERRORP is NIL. +" + (declare (ignore default-substitution)) ; For the time being. + (let* ((object-var (gensym "OBJECT-VAR-")) + (otherwise-clause-present-p + (member (caar (last clauses)) '(t otherwise))) + (non-otherwise-clauses + (if otherwise-clause-present-p + (butlast clauses) + clauses)) + (otherwise-clause + (if otherwise-clause-present-p + (first (last clauses)) + (when errorp + `(error 'unification-not-exhaustive)))) + ) + (labels ((generate-matchers (clauses) + (if (null clauses) + otherwise-clause + (destructuring-bind (pattern &rest body) + (car clauses) + `(handler-case (match (,pattern ,object-var) + ,@body) + (unification-failure () + ,(generate-matchers (cdr clauses)))))))) + `(let ((,object-var ,object)) + ,(generate-matchers non-otherwise-clauses))))) + + ;;; end of file -- math-blocks.lisp --

1 0

[cl-unification-cvs] CVS update: cl-unification/unification.asd
by mantoniotti＠common-lisp.net 27 Apr '05

27 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification In directory common-lisp.net:/tmp/cvs-serv18342 Added Files: unification.asd Log Message: Added unification.asd file. Date: Wed Apr 27 21:31:18 2005 Author: mantoniotti

1 0

[cl-unification-cvs] CVS update: cl-unification/docs/html/links.html
by mantoniotti＠common-lisp.net 21 Apr '05

21 Apr '05

Update of /project/cl-unification/cvsroot/cl-unification/docs/html In directory common-lisp.net:/tmp/cvs-serv5583 Modified Files: links.html Log Message: Fixed, but not completed, the page. Date: Thu Apr 21 17:33:20 2005 Author: mantoniotti Index: cl-unification/docs/html/links.html diff -u cl-unification/docs/html/links.html:1.1.1.1 cl-unification/docs/html/links.html:1.2 --- cl-unification/docs/html/links.html:1.1.1.1 Wed Nov 17 23:19:55 2004 +++ cl-unification/docs/html/links.html Thu Apr 21 17:33:20 2005 @@ -1,6 +1,6 @@ <html> <head> - <title>CLRFI: COMMON LISP Requests for Improvements Links</title> + <title>CL Unification Links</title> <link rel="stylesheet" href="main.css"> </head> @@ -11,12 +11,10 @@ <td colspan="3"> <div class="header" style="font-family:=Verdana,Arial,Helvetica; font-size: 18px; color: #41286f;"> - <strong><i>CLRFI: Common Lisp Requests for Improvements Links</i><string> + <strong><i>CL Unification Links</i><string> <div class="navigation"> <a href="index.html" class="navigation-link">Home</a> - | <a href="doc.html" class="navigation-link">Documents</a> - | <a href="faq.html" class="navigation-link">FAQ</a> - | <a href="clrfis.html" class="navigation-link">CLRFI listing</a> + | <a href="downloads.html" class="navigation-link">Downloads</a> | <a href="links.html" class="navigation-link-selected">Links</a> </div> </div> @@ -35,26 +33,11 @@ <h1>Links</h1> - <p>Here are some links which are pertinent to the CLRFI project.</p> + <p>Here are some links which are pertinent to the + <strong>CL-UNIFICATION</strong> project.</p> - <ul> - <li><a href="http://srfi.schemers.org">SRFI</a></li> - - <li>Local <strong>Common Lisp</strong> user communities - <ul> - <li><a href="http://www.lispnyc.org">LispNYC</a></li> - <li><a href="http://www.jugtouch.com/~rss/lisp">CRACL</a></li> - </ul> - </li> + <p>...</p> - <li>Software Repositories - <ul> - <li><a href="http://www.common-lisp.net">common-lisp.net</a></li> - <li>...</li> - </ul> - </li> - <li>...</li> - </ul> <!-- ;;; Copyright (c) 2004 Marco Antoniotti, All rigths reserved. @@ -92,6 +75,10 @@ </p> <ul> + <li><strong>2005-04-20</strong><br> + Fixed (but not completed) the page. + </li> + <li><strong>2004-04-12</strong><br> Started the site. </li>

1 0