From 6c3c0940adbac22c089407d0ba7875792d3521a8 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Thu, 9 Feb 2017 12:21:18 -0800 Subject: [PATCH] rename some identifiers --- .../basic-demo-2/colorer.rkt | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/beautiful-racket-demo/basic-demo-2/colorer.rkt b/beautiful-racket-demo/basic-demo-2/colorer.rkt index 08d4a4f..f2028fc 100644 --- a/beautiful-racket-demo/basic-demo-2/colorer.rkt +++ b/beautiful-racket-demo/basic-demo-2/colorer.rkt @@ -3,16 +3,21 @@ (provide basic-colorer) (define (basic-colorer port) - (define (handle-lexer-error exn) - (define exn-srclocs (exn:fail:read-srclocs exn)) - (srcloc-token (token 'ERROR) (car exn-srclocs))) - (define srcloc-tok (with-handlers ([exn:fail:read? handle-lexer-error]) - (basic-lexer port))) + (define (handle-lexer-error excn) + (define excn-srclocs (exn:fail:read-srclocs excn)) + (srcloc-token (token 'ERROR) (car excn-srclocs))) + (define srcloc-tok + (with-handlers ([exn:fail:read? handle-lexer-error]) + (basic-lexer port))) (match srcloc-tok [(? eof-object?) (values srcloc-tok 'eof #f #f #f)] [else - (match-define (srcloc-token (token-struct type val _ _ _ _ _) - (srcloc _ _ _ pos span)) srcloc-tok) + (match-define + (srcloc-token + (token-struct type val _ _ _ _ _) + (srcloc _ _ _ posn span)) srcloc-tok) + (define start posn) + (define end (+ start span)) (match-define (list cat paren) (match type ['STRING '(string #f)] @@ -24,4 +29,4 @@ ["(" '(parenthesis |(|)] [")" '(parenthesis |)|)] [else '(no-color #f)])])) - (values val cat paren pos (+ pos span))])) \ No newline at end of file + (values val cat paren start end)])) \ No newline at end of file