From 70955d55403f6231c22fcfca3767979e25627423 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 17 Dec 2010 19:45:09 -0500 Subject: [PATCH] Split mred/private/wxme/private into two files. --- collects/mred/private/wxme/editor-admin.rkt | 1 + collects/mred/private/wxme/editor-canvas.rkt | 1 + collects/mred/private/wxme/editor-data.rkt | 1 + .../mred/private/wxme/editor-snip-class.rkt | 1 + collects/mred/private/wxme/editor-snip.rkt | 1 + collects/mred/private/wxme/editor.rkt | 1 + collects/mred/private/wxme/mline.rkt | 3 +- collects/mred/private/wxme/pasteboard.rkt | 1 + collects/mred/private/wxme/private.rkt | 52 ----------------- collects/mred/private/wxme/stream.rkt | 1 + collects/mred/private/wxme/style.rkt | 1 + collects/mred/private/wxme/text.rkt | 1 + collects/mred/private/wxme/undo.rkt | 1 + collects/racket/snip/private/private.rkt | 56 +++++++++++++++++++ collects/racket/snip/private/snip.rkt | 2 +- 15 files changed, 70 insertions(+), 54 deletions(-) create mode 100644 collects/racket/snip/private/private.rkt diff --git a/collects/mred/private/wxme/editor-admin.rkt b/collects/mred/private/wxme/editor-admin.rkt index 285d2d459d..d3a701fbdc 100644 --- a/collects/mred/private/wxme/editor-admin.rkt +++ b/collects/mred/private/wxme/editor-admin.rkt @@ -3,6 +3,7 @@ "../syntax.ss" racket/snip "private.ss" + racket/snip/private/private (only-in "cycle.ss" popup-menu%)) (provide editor-admin%) diff --git a/collects/mred/private/wxme/editor-canvas.rkt b/collects/mred/private/wxme/editor-canvas.rkt index 5554221046..a12cbeeba5 100644 --- a/collects/mred/private/wxme/editor-canvas.rkt +++ b/collects/mred/private/wxme/editor-canvas.rkt @@ -5,6 +5,7 @@ "editor.ss" "editor-admin.ss" "private.ss" + racket/snip/private/private (only-in "cycle.ss" popup-menu%) (only-in "../helper.ss" queue-window-callback) "wx.ss") diff --git a/collects/mred/private/wxme/editor-data.rkt b/collects/mred/private/wxme/editor-data.rkt index 2505f39771..a36182e43e 100644 --- a/collects/mred/private/wxme/editor-data.rkt +++ b/collects/mred/private/wxme/editor-data.rkt @@ -5,6 +5,7 @@ "../syntax.ss" racket/snip/private/snip-flags "private.ss" + racket/snip/private/private "style.ss" racket/snip/private/load-one (only-in "cycle.ss" diff --git a/collects/mred/private/wxme/editor-snip-class.rkt b/collects/mred/private/wxme/editor-snip-class.rkt index 5a9c5a706e..05aa7c88db 100644 --- a/collects/mred/private/wxme/editor-snip-class.rkt +++ b/collects/mred/private/wxme/editor-snip-class.rkt @@ -5,6 +5,7 @@ "../syntax.ss" racket/snip/private/snip-flags "private.ss" + racket/snip/private/private "style.ss" racket/snip (only-in "cycle.ss" diff --git a/collects/mred/private/wxme/editor-snip.rkt b/collects/mred/private/wxme/editor-snip.rkt index 97f435e14b..538079b6a2 100644 --- a/collects/mred/private/wxme/editor-snip.rkt +++ b/collects/mred/private/wxme/editor-snip.rkt @@ -2,6 +2,7 @@ (require scheme/class "../syntax.ss" "private.ss" + racket/snip/private/private "const.ss" racket/snip racket/snip/private/snip-flags diff --git a/collects/mred/private/wxme/editor.rkt b/collects/mred/private/wxme/editor.rkt index 010632c855..74c99bbbea 100644 --- a/collects/mred/private/wxme/editor.rkt +++ b/collects/mred/private/wxme/editor.rkt @@ -4,6 +4,7 @@ scheme/file "../syntax.ss" "private.ss" + racket/snip/private/private "style.ss" racket/snip racket/snip/private/snip-flags diff --git a/collects/mred/private/wxme/mline.rkt b/collects/mred/private/wxme/mline.rkt index 2194ec3797..f3f2809b11 100644 --- a/collects/mred/private/wxme/mline.rkt +++ b/collects/mred/private/wxme/mline.rkt @@ -4,7 +4,8 @@ "const.ss" racket/snip racket/snip/private/snip-flags - "private.ss") + "private.ss" + racket/snip/private/private) (provide create-mline (struct-out mline) diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt index bf15a50be0..1cb11b0848 100644 --- a/collects/mred/private/wxme/pasteboard.rkt +++ b/collects/mred/private/wxme/pasteboard.rkt @@ -5,6 +5,7 @@ "../syntax.ss" "const.ss" "private.ss" + racket/snip/private/private "editor.ss" "editor-data.rkt" "undo.ss" diff --git a/collects/mred/private/wxme/private.rkt b/collects/mred/private/wxme/private.rkt index ddfd3642e3..852ad3b138 100644 --- a/collects/mred/private/wxme/private.rkt +++ b/collects/mred/private/wxme/private.rkt @@ -3,44 +3,11 @@ (provide (all-defined-out)) -;; snip% and editor% -(define-local-member-name - s-admin) - -;; snip% -(define-local-member-name - s-prev set-s-prev - s-next set-s-next - s-count - s-style set-s-style - s-line set-s-line - s-snipclass set-s-snipclass - s-flags set-s-flags - s-dtext get-s-dtext - s-buffer get-s-buffer - str-w set-str-w - s-set-flags - do-copy-to) - -;; string-snip% -(define-local-member-name - insert-with-offset) - -;; snip-class% -(define-local-member-name - get-s-required? - s-read) - ;; editor-data% (define-local-member-name get-s-dataclass get-s-next) -;; standard-snip-class-list%, editor-data-class-list% -(define-local-member-name - reset-header-flags - find-by-map-position) - ;; editor% (define-local-member-name s-offscreen @@ -111,25 +78,6 @@ do-get-canvas do-scroll-to) -;; editor-stream% -(define-local-member-name - get-sl - get-dl - set-sl - set-dl - add-sl - add-dl - set-s-sll - get-s-sll - get-s-scl - get-s-bdl - get-s-style-count - set-s-style-count - do-reading-version - do-map-position - do-get-header-flag - do-set-header-flag) - ;; editor-stream-in% (define-local-member-name set-s-read-format diff --git a/collects/mred/private/wxme/stream.rkt b/collects/mred/private/wxme/stream.rkt index 6b59c5f2b5..2828e01c46 100644 --- a/collects/mred/private/wxme/stream.rkt +++ b/collects/mred/private/wxme/stream.rkt @@ -2,6 +2,7 @@ (require scheme/class "../syntax.ss" "private.ss" + racket/snip/private/private racket/snip "editor-data.rkt" (only-in "cycle.ss" diff --git a/collects/mred/private/wxme/style.rkt b/collects/mred/private/wxme/style.rkt index ba66187fd1..186851b848 100644 --- a/collects/mred/private/wxme/style.rkt +++ b/collects/mred/private/wxme/style.rkt @@ -6,6 +6,7 @@ "../syntax.ss" "cycle.ss" "private.ss" + racket/snip/private/private "symbol-predicates.rkt") (provide mult-color<%> diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt index 88794f917d..03f02bb6db 100644 --- a/collects/mred/private/wxme/text.rkt +++ b/collects/mred/private/wxme/text.rkt @@ -7,6 +7,7 @@ "const.ss" "mline.ss" "private.ss" + racket/snip/private/private "editor.ss" "editor-data.rkt" "undo.ss" diff --git a/collects/mred/private/wxme/undo.rkt b/collects/mred/private/wxme/undo.rkt index e76906d760..f8c3625845 100644 --- a/collects/mred/private/wxme/undo.rkt +++ b/collects/mred/private/wxme/undo.rkt @@ -1,6 +1,7 @@ #lang scheme/base (require scheme/class "private.ss" + racket/snip/private/private racket/snip racket/snip/private/snip-flags) diff --git a/collects/racket/snip/private/private.rkt b/collects/racket/snip/private/private.rkt new file mode 100644 index 0000000000..59bc66ca06 --- /dev/null +++ b/collects/racket/snip/private/private.rkt @@ -0,0 +1,56 @@ +#lang scheme/base +(require scheme/class) + +(provide (all-defined-out)) + +;; standard-snip-class-list%, editor-data-class-list% +(define-local-member-name + reset-header-flags + find-by-map-position) + +;; snip% and editor% +(define-local-member-name + s-admin) + +;; snip% +(define-local-member-name + s-prev set-s-prev + s-next set-s-next + s-count + s-style set-s-style + s-line set-s-line + s-snipclass set-s-snipclass + s-flags set-s-flags + s-dtext get-s-dtext + s-buffer get-s-buffer + str-w set-str-w + s-set-flags + do-copy-to) + +;; string-snip% +(define-local-member-name + insert-with-offset) + +;; snip-class% +(define-local-member-name + get-s-required? + s-read) + +;; editor-stream% +(define-local-member-name + get-sl + get-dl + set-sl + set-dl + add-sl + add-dl + set-s-sll + get-s-sll + get-s-scl + get-s-bdl + get-s-style-count + set-s-style-count + do-reading-version + do-map-position + do-get-header-flag + do-set-header-flag) diff --git a/collects/racket/snip/private/snip.rkt b/collects/racket/snip/private/snip.rkt index 34111ac492..377b5021c2 100644 --- a/collects/racket/snip/private/snip.rkt +++ b/collects/racket/snip/private/snip.rkt @@ -5,7 +5,7 @@ "load-one.rkt" racket/draw/private/syntax mred/private/wxme/style - mred/private/wxme/private + "private.rkt" racket/draw) (provide snip%