suzanne.soy/gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parsing for when dot produces numbers in scientific notation

Browse Source 
closes PR 14748
also, Rackety

original commit: e946fed565348ddb65fb7fb8e4d9fe604c5208c8
This commit is contained in:
Robby Findler 2014-09-23 16:56:00 -05:00
parent 25851cb537
commit 382b050c4e
1 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pkgs/gui-pkgs/gui-lib/mrlib/private/dot.rkt
View File

@ -180,12 +180,15 @@
(join (parse-node line) (join (parse-node line)
(loop))] (loop))]
[(regexp-match #rx"^edge" line) [(regexp-match #rx"^edge" line)
(join (parse-edge line) (join (parse-edge draw-edges possibly-update-max-y line)
(loop))] (loop))]
[(regexp-match #rx"stop" line) [(regexp-match #rx"stop" line)
void] void]
[else [else
(error 'parse-file "didn't recognize line:\n ~s" line)]))))) (error 'mrlib/private/dot "didn't recognize line:\n ~s" line)])))))
(define (possibly-update-max-y y)
(set! max-y (max y max-y)))
(define (join p1 p2) (define (join p1 p2)
(cond (cond
@ -223,31 +226,6 @@
(set! max-y (max (+ y h) max-y)) (set! max-y (max (+ y h) max-y))
void)) void))
(define (parse-edge line)
(define (give-up)
(error 'redex "could not parse edge line:\n ~s\n" line))
(let* ([m (regexp-match #rx"edge ([^ ]+) ([^ ]+) ([0-9]+) (.*)$" line)]
[_ (unless m (give-up))]
[from (list-ref m 1)]
[to (list-ref m 2)]
[point-count (string->number (list-ref m 3))]
[rest (list-ref m 4)]
[points
(let loop ([pts point-count]
[rest rest])
(if (zero? pts)
'()
(let* ([m (regexp-match #rx"^([-0-9.]+) ([-0-9.]+) (.*)$" rest)]
[_ (unless m (give-up))]
[x (string->number (list-ref m 1))]
[y (string->number (list-ref m 2))])
(set! max-y (max y max-y))
(cons (list x y)
(loop (- pts 1)
(list-ref m 3))))))])
(λ (dc left top right bottom dx dy)
(draw-edges dc dx dy points))))
;; chomp : string -> (values string (union #f string)) ;; chomp : string -> (values string (union #f string))
;; returns the first word at the beginning of the string ;; returns the first word at the beginning of the string
;; and the remainder of the string (or #f is there is no more) ;; and the remainder of the string (or #f is there is no more)
@ -274,7 +252,7 @@
(values (list-ref m 1) (values (list-ref m 1)
#f))] #f))]
[else [else
(error 'chomp "~s" s)])])]))) (error 'mrlib/private/dot "~s" s)])])])))
(define (draw-edges dc dx dy raw-points) (define (draw-edges dc dx dy raw-points)
(let ([points (map (λ (x) (list (inches->pixels (car x)) (let ([points (map (λ (x) (list (inches->pixels (car x))
@ -302,5 +280,42 @@
(values positions (values positions
max-y)) max-y))
(define (parse-edge draw-edges possibly-update-max-y line)
(define (give-up)
(error 'mrlib/private/dot "could not parse edge line:\n ~s\n" line))
(define m (regexp-match #rx"edge ([^ ]+) ([^ ]+) ([0-9]+) (.*)$" line))
(unless m (give-up))
(define from (list-ref m 1))
(define to (list-ref m 2))
(define point-count (string->number (list-ref m 3)))
(define rest (list-ref m 4))
(define points
(let loop ([pts point-count]
[rest rest])
(cond
[(zero? pts) '()]
[else
(define m (regexp-match #rx"^([-0-9e.]+) ([-0-9e.]+) (.*)$" rest))
(unless m (give-up))
(define x (string->number (list-ref m 1)))
(define y (string->number (list-ref m 2)))
(unless x (give-up))
(unless y (give-up))
(possibly-update-max-y y)
(cons (list x y)
(loop (- pts 1)
(list-ref m 3)))])))
(λ (dc left top right bottom dx dy)
(draw-edges dc dx dy points)))
(module+ test
(parse-edge
void
void
(string-append
"edge s0 s2 13 1.4555 4.7222 1.1487 4.6131 0.81639 4.4528 0.56944 4.2222 0.15175 3.8322"
" 3.7007e-17 3.6409 0 3.0694 0 3.0694 0 3.0694 0 2.0972 0 1.1469 1.2205 0.56102 1.7932 0.33843"
" solid black")))
(define (pixels->inches x) (/ x 72)) (define (pixels->inches x) (/ x 72))
(define (inches->pixels x) (* x 72)) (define (inches->pixels x) (* x 72))