Update of /cvsroot/foo/foo/elkfoo/scm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23274/elkfoo/scm
Modified Files:
foops.scm
Log Message:
fixed a reintroduced bug in define-method (mea culpa)
Index: foops.scm
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/scm/foops.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** foops.scm 11 Aug 2004 12:35:11 -0000 1.1
--- foops.scm 8 Apr 2006 00:07:42 -0000 1.2
***************
*** 31,34 ****
--- 31,45 ----
;;
+ ;; we also provide oops in order to prevent loading
+ ;; oops.scm, which would redefine what is defined here
+ ;;
+ ;; as foops.scm is loaded in toplevel.foo, there
+ ;; is no way in foo to use to original oops.scm other than
+ ;; loading it explicitly with the load function
+ ;;
+
+ (provide 'oops)
+
+ ;;
;; global variable used to store an environment stack
;; enabling nested direct method invokation
***************
*** 256,262 ****
(error 'define-method "can't overload static method nonstaticaly"))
(eval `(define ,method
! (lambda ,(oops-form-proper-args-list args)
(apply (hack-procedure-environment!
! (lambda ,args ,@forms)
(car oops-environment-stack))
(list ,@(oops-form-proper-args-list args)))))
--- 267,273 ----
(error 'define-method "can't overload static method nonstaticaly"))
(eval `(define ,method
! (lambda ,args
(apply (hack-procedure-environment!
! (lambda ,(oops-form-proper-args-list args) ,@forms)
(car oops-environment-stack))
(list ,@(oops-form-proper-args-list args)))))
|
