misc-deps
/
racket-ansi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change signature of find-mark.

This commit is contained in:
Tony Garnock-Jones 2014-12-27 17:15:18 -05:00
parent 8af07c0abd
commit 02b037b42e
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rmacs/rope.rkt
View File

@ -249,10 +249,7 @@
(define (find-mark r mtype (define (find-mark r mtype
#:forward? [forward? #t] #:forward? [forward? #t]
#:position [start-pos (if forward? 0 (rope-size r))]) #:position [start-pos (if forward? 0 (rope-size r))])
(define maybe-pos+val (find-mark* r forward? mtype start-pos)) (find-mark* r forward? mtype start-pos))
(if maybe-pos+val
(values (car maybe-pos+val) (cdr maybe-pos+val))
(values #f #f)))
(define (find-mark-pos r mtype (define (find-mark-pos r mtype
#:forward? [forward? #t] #:forward? [forward? #t]
@ -433,6 +430,14 @@
(check-equal? (rope-size (empty-rope)) 0) (check-equal? (rope-size (empty-rope)) 0)
(define-syntax-rule (find-mark/values arg ...)
(match (find-mark arg ...)
[(cons p v) (values p v)]
[#f (values #f #f)]))
(define mtype1 (mark-type "Mark1" 'left))
(define mtype2 (mark-type "Mark2" 'right))
(define (test-with-pieces string-pieces) (define (test-with-pieces string-pieces)
(define rope-pieces (map string->rope string-pieces)) (define rope-pieces (map string->rope string-pieces))
(define text (string-append* string-pieces)) (define text (string-append* string-pieces))
@ -452,31 +457,28 @@
(check-equal? (rope->string r) text) (check-equal? (rope->string r) text)
(loop (- n 1) r))) (loop (- n 1) r)))
(define mtype1 (mark-type "Mark1" 'left))
(define mtype2 (mark-type "Mark2" 'right))
(let*-values (((r) (set-mark (rope-concat rope-pieces) mtype1 9 "original")) (let*-values (((r) (set-mark (rope-concat rope-pieces) mtype1 9 "original"))
((_) (check-equal? (rope->string r) text)) ((_) (check-equal? (rope->string r) text))
((pos val) (find-mark r mtype1)) ((pos val) (find-mark/values r mtype1))
((_) (check-equal? pos 9)) ((_) (check-equal? pos 9))
((_) (check-equal? val "original")) ((_) (check-equal? val "original"))
((r) (clear-mark r mtype1 pos)) ((r) (clear-mark r mtype1 pos))
((_) (check-equal? (find-all-marks/type r mtype1) (hash))) ((_) (check-equal? (find-all-marks/type r mtype1) (hash)))
((pos val) (find-mark r mtype1)) ((pos val) (find-mark/values r mtype1))
((_) (check-false pos)) ((_) (check-false pos))
((_) (check-false val)) ((_) (check-false val))
((r) (set-mark r mtype1 9 "second")) ((r) (set-mark r mtype1 9 "second"))
((pos val) (find-mark r mtype1)) ((pos val) (find-mark/values r mtype1))
((_) (check-equal? pos 9)) ((_) (check-equal? pos 9))
((_) (check-equal? val "second")) ((_) (check-equal? val "second"))
((r) (set-mark r mtype1 6 "first")) ((r) (set-mark r mtype1 6 "first"))
((r) (set-mark r mtype2 6 "third")) ((r) (set-mark r mtype2 6 "third"))
((_) (check-equal? (find-all-marks/type r mtype1) (hash 6 "first" 9 "second"))) ((_) (check-equal? (find-all-marks/type r mtype1) (hash 6 "first" 9 "second")))
((_) (check-equal? (find-all-marks/type r mtype2) (hash 6 "third"))) ((_) (check-equal? (find-all-marks/type r mtype2) (hash 6 "third")))
((pos val) (find-mark r mtype1 #:forward? #f)) ((pos val) (find-mark/values r mtype1 #:forward? #f))
((_) (check-equal? pos 9)) ((_) (check-equal? pos 9))
((_) (check-equal? val "second")) ((_) (check-equal? val "second"))
((pos val) (find-mark r mtype1)) ((pos val) (find-mark/values r mtype1))
((_) (check-equal? pos 6)) ((_) (check-equal? pos 6))
((_) (check-equal? val "first")) ((_) (check-equal? val "first"))
((l r) (rope-split r pos)) ((l r) (rope-split r pos))