From 05394aff7eb442a3c8711998caa3e6b3d0e58be8 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Sat, 26 May 2012 10:29:35 -0400 Subject: [PATCH] Remove mred/private/kw.rkt This handled init argument inheritance for class100, but all uses of it have now been removed. --- collects/mred/private/kw.rkt | 65 --------------------------- collects/mred/private/mrcanvas.rkt | 1 - collects/mred/private/mrcontainer.rkt | 1 - collects/mred/private/mritem.rkt | 1 - collects/mred/private/mrpanel.rkt | 1 - collects/mred/private/mrtextfield.rkt | 1 - collects/mred/private/mrtop.rkt | 1 - collects/mred/private/mrwindow.rkt | 1 - collects/mred/private/wxtop.rkt | 1 - 9 files changed, 73 deletions(-) delete mode 100644 collects/mred/private/kw.rkt diff --git a/collects/mred/private/kw.rkt b/collects/mred/private/kw.rkt deleted file mode 100644 index 051c4e951c..0000000000 --- a/collects/mred/private/kw.rkt +++ /dev/null @@ -1,65 +0,0 @@ -(module kw mzscheme - (require mzlib/class100) - - (provide (protect define-keywords - class100*/kw)) - - ;; ---------------- Keyword propagation macros ------------------- - - ;; Since we use class100 to construct the classes that users see, - ;; keywords are not propagated by position automatically. So we use - ;; the class100*/kw macro for every class exported to the user; it - ;; explicitly includes all keywords supported through superclasses. - ;; To avoid writing the same keyword sets over and over, we have - ;; a define-keywords form. - - ;; Arguably, this is making a problem (using `class100' instead of - ;; `class') worse as much as it solves the problem. Or maybe the - ;; problem is trying to hard to make by-position and by-name - ;; initialization work. - - (define-syntax (define-keywords stx) - (syntax-case stx () - [(_ name kw ...) - (with-syntax ([(kw2 ...) - (apply - append - (map (lambda (kw) - (if (identifier? kw) - (syntax-local-value kw) - (list kw))) - (syntax->list #'(kw ...))))]) - #'(define-syntax name '(kw2 ...)))])) - - (define-syntax (class100*/kw stx) - (syntax-case stx () - [(_ base (intf ...) ((base-init ...) keywords post-init ...) . rest) - (let ([kws (syntax-local-value #'keywords)]) - (with-syntax ([super-init (datum->syntax-object - stx - 'super-init - stx)] - [(new-keyword ...) (map car kws)] - [(new-init ...) (datum->syntax-object - stx - kws)]) - #'(let-syntax ([super-init - (lambda (sstx) - (syntax-case sstx () - [(_ arg (... ...)) - (with-syntax ([super-instantiate - (datum->syntax-object - sstx - 'super-instantiate - sstx)] - [(new-kw (... ...)) - (map (lambda (x) - (datum->syntax-object - sstx - x)) - '(new-keyword ...))]) - #'(super-instantiate (arg (... ...)) - [new-kw new-kw] (... ...)))]))]) - (class100* - base (intf ...) (base-init ... new-init ... post-init ...) - . rest))))]))) diff --git a/collects/mred/private/mrcanvas.rkt b/collects/mred/private/mrcanvas.rkt index 6a5ea2f72c..5d225b7a4f 100644 --- a/collects/mred/private/mrcanvas.rkt +++ b/collects/mred/private/mrcanvas.rkt @@ -5,7 +5,6 @@ (prefix-in wx: "kernel.rkt") "lock.rkt" "const.rkt" - "kw.rkt" "helper.rkt" "check.rkt" "wx.rkt" diff --git a/collects/mred/private/mrcontainer.rkt b/collects/mred/private/mrcontainer.rkt index 436b75001d..8ec0be80c5 100644 --- a/collects/mred/private/mrcontainer.rkt +++ b/collects/mred/private/mrcontainer.rkt @@ -7,7 +7,6 @@ "helper.rkt" "const.rkt" "wx.rkt" - "kw.rkt" "check.rkt" "wxcontainer.rkt" "mrwindow.rkt") diff --git a/collects/mred/private/mritem.rkt b/collects/mred/private/mritem.rkt index 0174f4f51c..fe626f234b 100644 --- a/collects/mred/private/mritem.rkt +++ b/collects/mred/private/mritem.rkt @@ -5,7 +5,6 @@ (prefix-in wx: "kernel.rkt") "lock.rkt" "const.rkt" - "kw.rkt" "gdi.rkt" "check.rkt" "helper.rkt" diff --git a/collects/mred/private/mrpanel.rkt b/collects/mred/private/mrpanel.rkt index 875eeefc33..f3e4b08557 100644 --- a/collects/mred/private/mrpanel.rkt +++ b/collects/mred/private/mrpanel.rkt @@ -7,7 +7,6 @@ "check.rkt" "helper.rkt" "wx.rkt" - "kw.rkt" "wxpanel.rkt" "mrwindow.rkt" "mrcontainer.rkt") diff --git a/collects/mred/private/mrtextfield.rkt b/collects/mred/private/mrtextfield.rkt index 79dd2c8c87..1dd0ab7dab 100644 --- a/collects/mred/private/mrtextfield.rkt +++ b/collects/mred/private/mrtextfield.rkt @@ -7,7 +7,6 @@ "check.rkt" "helper.rkt" "wx.rkt" - "kw.rkt" "wxtextfield.rkt" "mrcontainer.rkt" "mritem.rkt" diff --git a/collects/mred/private/mrtop.rkt b/collects/mred/private/mrtop.rkt index 9d286f7e52..d74822a3f8 100644 --- a/collects/mred/private/mrtop.rkt +++ b/collects/mred/private/mrtop.rkt @@ -6,7 +6,6 @@ "lock.rkt" "helper.rkt" "const.rkt" - "kw.rkt" "check.rkt" "wx.rkt" "wxtop.rkt" diff --git a/collects/mred/private/mrwindow.rkt b/collects/mred/private/mrwindow.rkt index 469da2de87..d3cd588925 100644 --- a/collects/mred/private/mrwindow.rkt +++ b/collects/mred/private/mrwindow.rkt @@ -6,7 +6,6 @@ "const.rkt" "check.rkt" "wx.rkt" - "kw.rkt" "wxwindow.rkt" "mrpopup.rkt") diff --git a/collects/mred/private/wxtop.rkt b/collects/mred/private/wxtop.rkt index 1a8baee321..1eb3ee34a8 100644 --- a/collects/mred/private/wxtop.rkt +++ b/collects/mred/private/wxtop.rkt @@ -7,7 +7,6 @@ "lock.rkt" "helper.rkt" "const.rkt" - "kw.rkt" "check.rkt" "wx.rkt" "wxwindow.rkt"