mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Remove method slot keyword-formals? introduced in 765f1d49

Browse source 
* module/oop/goops.scm (method-keyword-formals?): Remov method slot
      keyword-formals? as well as exported procedure method-keyword-formals?
      introduced in 765f1d49 by partially reverting that commit.
This commit is contained in:
Mikael Djurfeldt 2024-11-24 15:26:08 +01:00
parent d619da8c35
commit 05de7e3e61
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
module/oop/goops.scm
View file

@ -136,7 +136,7 @@
class-slots class-slots
generic-function-name generic-function-name
generic-function-methods method-generic-function generic-function-methods method-generic-function
method-specializers method-formals method-keyword-formals? method-specializers method-formals
primitive-generic-generic enable-primitive-generic! primitive-generic-generic enable-primitive-generic!
method-procedure accessor-method-slot-definition method-procedure accessor-method-slot-definition
make find-method get-keyword)) make find-method get-keyword))
@ -1053,7 +1053,6 @@ slots as we go."
specializers specializers
procedure procedure
formals formals
keyword-formals?
body body
make-procedure) make-procedure)
(define-standard-class <accessor-method> (<method>) (define-standard-class <accessor-method> (<method>)
@ -1158,7 +1157,6 @@ function."
(#:specializers specializers ()) (#:specializers specializers ())
(#:procedure procedure #f) (#:procedure procedure #f)
(#:formals formals ()) (#:formals formals ())
(#:keyword-formals? keyword-formals? #f)
(#:body body ()) (#:body body ())
(#:make-procedure make-procedure #f)))) (#:make-procedure make-procedure #f))))
((memq <class> (class-precedence-list class)) ((memq <class> (class-precedence-list class))
@ -2116,7 +2114,7 @@ function."
;;; This section of helpers is used by both the method and method* syntax ;;; This section of helpers is used by both the method and method* syntax
;;; ;;;
(eval-when (expand load eval) (eval-when (expand load eval)
;; parse-formals METHOD-FORMALS ;; parse-formals METHOD-FORMALS
;; ;;
;; return (FORMALS SPECIALIZERS KEYWORD-FORMALS) ;; return (FORMALS SPECIALIZERS KEYWORD-FORMALS)
@ -2309,7 +2307,6 @@ function."
;; The cons* is needed to get the value of each ;; The cons* is needed to get the value of each
;; specializer. ;; specializer.
#:formals 'formals ;might be improper #:formals 'formals ;might be improper
#:keyword-formals? #f
#:body '(body0 body1 ...) #:body '(body0 body1 ...)
#:make-procedure make-procedure #:make-procedure make-procedure
#:procedure procedure))))))))) #:procedure procedure)))))))))
@ -2334,7 +2331,6 @@ function."
#:formals (if (null? 'keyword-formals) #:formals (if (null? 'keyword-formals)
'formals ;might be improper 'formals ;might be improper
(append 'formals 'keyword-formals)) (append 'formals 'keyword-formals))
#:keyword-formals? (not (null? 'keyword-formals))
#:body '(body0 body1 ...) #:body '(body0 body1 ...)
#:make-procedure make-procedure #:make-procedure make-procedure
#:procedure procedure))))))))) #:procedure procedure)))))))))
@ -2457,9 +2453,6 @@ function."
(define-method (method-formals (m <method>)) (define-method (method-formals (m <method>))
(slot-ref m 'formals)) (slot-ref m 'formals))
(define-method (method-keyword-formals? (m <method>))
(slot-ref m 'keyword-formals?))
;;; ;;;
;;; Slots ;;; Slots
;;; ;;;
@ -3013,7 +3006,6 @@ var{initargs}."
(slot-set! method 'procedure (slot-set! method 'procedure
(get-keyword #:procedure initargs #f)) (get-keyword #:procedure initargs #f))
(slot-set! method 'formals (get-keyword #:formals initargs '())) (slot-set! method 'formals (get-keyword #:formals initargs '()))
(slot-set! method 'keyword-formals? (get-keyword #:keyword-formals? initargs #f))
(slot-set! method 'body (get-keyword #:body initargs '())) (slot-set! method 'body (get-keyword #:body initargs '()))
(slot-set! method 'make-procedure (get-keyword #:make-procedure initargs #f))) (slot-set! method 'make-procedure (get-keyword #:make-procedure initargs #f)))