From 04768213fe957d73573cb422ac95ed94447eb48a Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 2 Oct 2004 02:48:32 +0000 Subject: [PATCH] read-one-special changed to read-special original commit: f155bff971fe1bb1b6ce7d66fac9d81c051711e9 --- collects/framework/collapsed-snipclass.ss | 12 +++++------- collects/framework/private/comment-box.ss | 5 ++--- collects/framework/private/number-snip.ss | 4 ++-- collects/framework/private/scheme.ss | 12 +++++------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/collects/framework/collapsed-snipclass.ss b/collects/framework/collapsed-snipclass.ss index 3d8fe25f..bef8c03d 100644 --- a/collects/framework/collapsed-snipclass.ss +++ b/collects/framework/collapsed-snipclass.ss @@ -8,19 +8,17 @@ (define simple-sexp-snip% (class* snip% (readable-snip<%>) (init-field left-bracket right-bracket saved-snips) - (define/public (read-one-special index file line col pos) + (define/public (read-special file line col pos) (let ([text (make-object text%)]) (for-each (lambda (s) (send text insert (send s copy) (send text last-position) (send text last-position))) saved-snips) - (values (datum->syntax-object - #f - (read (open-input-text-editor text)) - (list file line col pos 1)) - 1 - #t))) + (datum->syntax-object + #f + (read (open-input-text-editor text)) + (list file line col pos 1)))) (super-instantiate ()))) (define sexp-snipclass% (make-sexp-snipclass% simple-sexp-snip%)) diff --git a/collects/framework/private/comment-box.ss b/collects/framework/private/comment-box.ss index 394446cb..67819000 100644 --- a/collects/framework/private/comment-box.ss +++ b/collects/framework/private/comment-box.ss @@ -123,9 +123,8 @@ [snip (loop (send snip next) snip)] [else acc]))) - (define/public (read-one-special index source line column position) - (raise (make-special-comment - 1))) + (define/public (read-special source line column position) + (raise (make-special-comment "comment"))) (super-instantiate ()) (inherit set-snipclass) (set-snipclass snipclass)))))) \ No newline at end of file diff --git a/collects/framework/private/number-snip.ss b/collects/framework/private/number-snip.ss index f912a0b5..708b99ed 100644 --- a/collects/framework/private/number-snip.ss +++ b/collects/framework/private/number-snip.ss @@ -291,8 +291,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (define/public (read-one-special index file line col pos) - (values number 1 #t)) + (define/public (read-special file line col pos) + number) (define/override get-text (case-lambda diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index 975d2777..1f333c24 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -72,19 +72,17 @@ (define/public (get-saved-snips) saved-snips) (field [sizing-text (format "~a ~a" left-bracket right-bracket)]) - (define/public (read-one-special index file line col pos) + (define/public (read-special file line col pos) (let ([text (make-object text:basic%)]) (for-each (lambda (s) (send text insert (send s copy) (send text last-position) (send text last-position))) saved-snips) - (values (datum->syntax-object - #f - (read (open-input-text-editor text)) - (list file line col pos 1)) - 1 - #t))) + (datum->syntax-object + #f + (read (open-input-text-editor text)) + (list file line col pos 1)))) (define/override get-text (opt-lambda (offset num [flattened? #f])