--- cl-contextl-0.30.orig/cx-layered-function-macros.lisp +++ cl-contextl-0.30/cx-layered-function-macros.lisp @@ -25,7 +25,7 @@ (defining-layer layer) layer)) -(defun prepare-layered-method-body (form layer-arg body) +(defun prepare-layered-method-body (name form layer-arg body) (loop for (first . rest) on body count (stringp first) into nof-seen-strings while (or (stringp first) @@ -35,16 +35,17 @@ finally (when (> nof-seen-strings 1) (error "Too many documentation strings in ~S." form)) - (return (nconc declarations - `((flet ((call-next-layered-method (&rest args) - (declare (dynamic-extent args)) - (if args - (apply #'call-next-method ,layer-arg args) - (call-next-method)))) - (declare (inline call-next-layered-method) - #-lispworks - (ignorable (function call-next-layered-method))) - ,first ,@rest)))))) + (return `(,@declarations + (block ,(if (consp name) (second name) name) + (flet ((call-next-layered-method (&rest args) + (declare (dynamic-extent args)) + (if args + (apply #'call-next-method ,layer-arg args) + (call-next-method)))) + (declare (inline call-next-layered-method) + #-lispworks + (ignorable (function call-next-layered-method))) + ,first ,@rest)))))) (defmacro define-layered-function (name (&rest args) &body options) (let ((definer (get-layered-function-definer-name name))) @@ -63,7 +64,7 @@ (layer-arg layer qualifiers args method-body) (parse-method-body option (cdr option)) `(:method ,@qualifiers ((,layer-arg ,(prepare-layer layer)) ,@args) - ,@(prepare-layered-method-body option layer-arg method-body))) + ,@(prepare-layered-method-body name option layer-arg method-body))) else collect option)) (declaim (inline ,name)) (defun ,name (&rest ,rest-arg) @@ -79,4 +80,4 @@ (parse-method-body form body) `(defmethod ,(get-layered-function-definer-name name) ,@qualifiers ((,layer-arg ,(prepare-layer layer)) ,@args) - ,@(prepare-layered-method-body form layer-arg method-body)))) + ,@(prepare-layered-method-body name form layer-arg method-body)))) --- cl-contextl-0.30.orig/debian/copyright +++ cl-contextl-0.30/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Peter Van Eynde pvaneynd@debian.org on +Fri, 20 Jan 2006 08:52:56 +0100 + +The upstream homepage is http://common-lisp.net/project/closer/ +with assorted darcs repositories. + +Copyright: + +Copyright (c) 2005 Pascal Costanza + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + --- cl-contextl-0.30.orig/debian/rules +++ cl-contextl-0.30/debian/rules @@ -0,0 +1,57 @@ +#!/usr/bin/make -f +# MAde with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + + + # Add here commands to compile the package. + #make CFLAGS="-O2 -g -Wall" + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. +# -rm -f `find . -name "*~"` +# -rm -rf debian/tmp debian/files* core debian/substvars + + dh_clean + +# Build architecture-independent files here. +binary-arch: build +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-indep: build +# dh_testversion + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + dh_installdocs + dh_install + dh_lisp + dh_installchangelogs + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- cl-contextl-0.30.orig/debian/control +++ cl-contextl-0.30/debian/control @@ -0,0 +1,22 @@ +Source: cl-contextl +Section: libs +Priority: optional +Build-Depends: debhelper (>= 4.0) +Build-Depends-Indep: dh-lisp +Maintainer: Peter Van Eynde +Standards-Version: 3.7.2.0 + +Package: cl-contextl +Architecture: all +Depends: ${misc:Depends}, cl-closer-mop (>= 0.31-1), cl-lw-compat +Description: context orientation for Common Lisp + ContextL provides the Common Lisp Object System with functionality + for context orientation. It allows the definition of context-specific + methods or class slots, so that methods act differently depending on + the dynamic context they are executed in. + . + It further allows developers to rebind places (e.g. slots of objects) + dynamically using the "dletf" framework that has previously been + present in AspectL. + . + Homepage: http://common-lisp.net/project/closer/contextl.html --- cl-contextl-0.30.orig/debian/install +++ cl-contextl-0.30/debian/install @@ -0,0 +1 @@ +*.lisp *.asd usr/share/common-lisp/source/contextl/ --- cl-contextl-0.30.orig/debian/changelog +++ cl-contextl-0.30/debian/changelog @@ -0,0 +1,38 @@ +cl-contextl (0.30-1) unstable; urgency=low + + * updated standard version, now real changes + * updated watch file + * Updated upstream, with some extra bugfixes done afterwards. + * move debhelper to build-depends + + -- Peter Van Eynde Tue, 24 Oct 2006 18:04:04 +0200 + +cl-contextl (0.21-3) unstable; urgency=low + + [ René van Bevern ] + * debian/install: install to /usr/share/c-l/contextl/ rather than lw-aspectl/ + + -- Peter Van Eynde Mon, 13 Feb 2006 16:55:58 +0100 + +cl-contextl (0.21-2) unstable; urgency=low + + [René van Bevern] + * fix watch file to not check for AspectL but ContextL versions + * debian/control: + + add missing dependency on cl-closer-mop 0.31 + + add missing dependency on cl-lw-compat + + rewrote package description + + -- Peter Van Eynde Tue, 7 Feb 2006 09:36:03 +0100 + +cl-contextl (0.21-1) unstable; urgency=low + + * New upstream + + -- Peter Van Eynde Fri, 3 Feb 2006 21:31:55 +0100 + +cl-contextl (0.2-1) unstable; urgency=low + + * First upload. + + -- Peter Van Eynde Fri, 20 Jan 2006 09:02:39 +0100 --- cl-contextl-0.30.orig/debian/watch +++ cl-contextl-0.30/debian/watch @@ -0,0 +1,5 @@ +version=2 + +http://common-lisp.net/project/closer/ftp/contextl[-_]([0-9.]*)\.tar\.gz + + --- cl-contextl-0.30.orig/debian/compat +++ cl-contextl-0.30/debian/compat @@ -0,0 +1 @@ +4 --- cl-contextl-0.30.orig/debian/README.debian +++ cl-contextl-0.30/debian/README.debian @@ -0,0 +1,3 @@ +This package is build using darcs-buildpackage and the darcs archives can be +downloaded from http://cl-debian.alioth.debian.org/repository/pvaneynd/ + --- cl-contextl-0.30.orig/contextl.asd +++ cl-contextl-0.30/contextl.asd @@ -1,7 +1,7 @@ (asdf:defsystem #:contextl :name "ContextL" :author "Pascal Costanza" - :version "0.2" + :version "0.3" :licence " Copyright (c) 2005,2006 Pascal Costanza