diff options
Diffstat (limited to 'modules/oop/pf-objects.scm')
| -rw-r--r-- | modules/oop/pf-objects.scm | 80 |
1 files changed, 48 insertions, 32 deletions
diff --git a/modules/oop/pf-objects.scm b/modules/oop/pf-objects.scm index f80a2d2..5b78063 100644 --- a/modules/oop/pf-objects.scm +++ b/modules/oop/pf-objects.scm @@ -13,7 +13,7 @@ py-super-mac py-super py-equal? *class* *self* pyobject? pytype? type object pylist-set! pylist-ref tr - resolve-method + resolve-method rawref )) #| @@ -153,7 +153,8 @@ explicitly tell it to not update etc. (type- meta name parents dict keys)))) (define (create-object class meta goops x) - (aif it #f ;(ref meta '__call__) + (with-fluids ((*make-class* #t)) + (aif it #f ;(ref meta '__call__) (apply it x) (let ((obj (aif it (find-in-class class '__new__ #f) ((it class 'object)) @@ -166,7 +167,7 @@ explicitly tell it to not update etc. (aif it (ref obj '__call__) (apply it x) (error "not a callable object")))) - obj))) + obj)))) (define (make-object class meta goops) (let ((obj (make-p goops))) @@ -288,16 +289,20 @@ explicitly tell it to not update etc. (if (eq? g #t) (aif it (mrefx xx '__getattribute__ '()) (begin - (set xx '__fget__ it) + (mset xx '__fget__ it it) it) (begin - (set xx '__fget__ it) + (if (mc?) + (mset xx '__fget__ it it)) #f)) g) #f))) (if (or (not f) (eq? f not-implemented)) (mrefx xx key l) - (apply f xx key l)))))) + (catch #t + (lambda () ((f xx (fluid-ref *refkind*)) key)) + (lambda x + (mrefx xx key l)))))))) (define-syntax-rule (mref x key l) @@ -320,6 +325,10 @@ explicitly tell it to not update etc. (define-method (ref (x <pyf>) key . l) (mref-py x key l)) (define-method (ref (x <py> ) key . l) (mref-py x key l)) +(define-method (rawref (x <pf> ) key . l) (mref x key l)) +(define-method (rawref (x <p> ) key . l) (mref x key l)) + + (define-method (set (f <procedure>) key val) (set-procedure-property! f key val)) @@ -351,7 +360,7 @@ explicitly tell it to not update etc. (values))) ;; on object x add a binding that key -> val -(define-method (mset (x <pf>) key val) +(define-method (mset (x <pf>) key rval val) (let ((h (slot-ref x 'h)) (s (slot-ref x 'size)) (n (slot-ref x 'n))) @@ -366,33 +375,39 @@ explicitly tell it to not update etc. (define (pkh h) (hash-for-each (lambda x (pk x)) h) h) -(define-method (mset (x <p>) key val) +(define-method (mset (x <p>) key rval val) (begin (hash-set! (slot-ref x 'h) key val) (values))) -(define-syntax-rule (mset-py x key val) - (let* ((v (mref x key (list fail)))) - (if (or (eq? v fail) (not (and (is-a? v <property>) (not (pyclass? x))))) - (let* ((g (mrefx x '__fset__ '(#t))) +(define *make-class* (make-fluid #f)) +(define (mc?) (not (fluid-ref *make-class*))) + +(define-syntax-rule (mset-py x key rval val) + (let* ((xx x) + (v (mref xx key (list fail)))) + (if (or (eq? v fail) + (not (and (is-a? v <property>) + (not (pyclass? xx))))) + (let* ((g (mrefx xx '__fset__ '(#t))) (f (if g (if (eq? g #t) - (let ((class (aif it (mref x '__class__ '()) - it - x))) - (aif it (mrefx x '__setattr__ '()) - (begin - (mset class '__fset__ it) - it) - (begin - (mset class '__fset__ it) - #f))) + (aif it (mrefx xx '__setattr__ '()) + (begin + (mset xx '__fset__ it it) + it) + (begin + (if (mc?) + (mset xx '__fset__ it it)) + #f)) g) #f))) (if (or (eq? f not-implemented) (not f)) - (mset x key val) - (f key val))) - ((slot-ref v 'set) x val)))) + (mset xx key val val) + (catch #t + (lambda () ((f xx (fluid-ref *refkind*)) key rval)) + (lambda x (mset xx key val val))))) + ((slot-ref v 'set) xx val)))) (define-syntax-rule (mklam (mset a ...) val) (if (and (procedure? val) @@ -402,9 +417,9 @@ explicitly tell it to not update etc. (ref val '__call__) #t)) (if (procedure-property val 'py-special) - (mset a ... val) - (mset a ... (object-method val))) - (mset a ... val))) + (mset a ... val val) + (mset a ... val (object-method val))) + (mset a ... val val))) (define-method (set (x <pf>) key val) (mklam (mset x key) val)) (define-method (set (x <p>) key val) (mklam (mset x key) val)) @@ -489,12 +504,12 @@ explicitly tell it to not update etc. ;; x untouched (define-method (fset (x <pf>) key val) (let ((x (mcopy x))) - (mset x key val) + (mset x key val val) x)) (define-method (fset (x <p>) key val) (let ((x (mcopy- x))) - (mset x key val) + (mset x key val val) x)) (define (fset-x obj l val) @@ -702,8 +717,9 @@ explicitly tell it to not update etc. (pylist-set! dict '__class__ meta) (pylist-set! dict '__mro__ (get-mro parents)) dict) - - (create-class meta name parents gen-methods kw)) + + (with-fluids ((*make-class* #t)) + (create-class meta name parents gen-methods kw))) ;; Let's make an object essentially just move a reference |