fixing cherrying

This commit is contained in:
Spencer Florence 2015-03-30 23:18:59 -04:00
parent e2edacaae9
commit 478800bdea
3 changed files with 9 additions and 10 deletions

View File

@ -5,7 +5,7 @@
"syntax-color-lib" "compiler-lib")) "syntax-color-lib" "compiler-lib"))
(define build-deps (define build-deps
'("racket-doc" "scribble-lib" "typed-racket-doc" "htdp-lib" '("racket-doc" "scribble-lib" "typed-racket-doc" "htdp-lib"
"net-doc" "scribble-doc")) "net-doc" "scribble-doc" "at-exp-lib"))
(define raco-commands (define raco-commands
'(("cover" (submod cover/raco main) "a code coverage tool" 30))) '(("cover" (submod cover/raco main) "a code coverage tool" 30)))

View File

@ -48,11 +48,12 @@
(with-input-from-file f (with-input-from-file f
(thunk (thunk
(define lexer (define lexer
(with-handlers ([exn:fail:read? (const racket-lexer)]) (maybe-wrap-lexer
(define f (read-language)) (with-handlers ([exn:fail:read? (const racket-lexer)])
(if f (define f (read-language))
(f 'color-lexer racket-lexer) (if f
racket-lexer))) (f 'color-lexer racket-lexer)
racket-lexer))))
(define irrelevant? (make-irrelevant? lexer f submods)) (define irrelevant? (make-irrelevant? lexer f submods))
(define file-length (string-length (file->string f))) (define file-length (string-length (file->string f)))
(define cache (define cache
@ -62,8 +63,6 @@
[else (raw-covered? i c)])))) [else (raw-covered? i c)]))))
cache))) cache)))
<<<<<<< HEAD
=======
(define (maybe-wrap-lexer lexer) (define (maybe-wrap-lexer lexer)
(if (procedure-arity-includes? lexer 3) (if (procedure-arity-includes? lexer 3)
lexer lexer
@ -71,7 +70,6 @@
(define-values (a b c d e) (lexer in)) (define-values (a b c d e) (lexer in))
(values a b c d e 0 #f)))) (values a b c d e 0 #f))))
>>>>>>> e051103... fixing lexer
;; Lexer(in the sence of color:text<%>) InputPort (Maybe (Listof Symbol)) -> (Natural -> Boolean) ;; Lexer(in the sence of color:text<%>) InputPort (Maybe (Listof Symbol)) -> (Natural -> Boolean)
;; builds a function that determines if a given location in that port is irrelivent. ;; builds a function that determines if a given location in that port is irrelivent.
(define (make-irrelevant? lexer f submods) (define (make-irrelevant? lexer f submods)

View File

@ -3,7 +3,8 @@
;; for every .rkt file in those directories it loads ;; for every .rkt file in those directories it loads
;; tests that file and checks its coverage against an ;; tests that file and checks its coverage against an
;; .rktl file of the same name ;; .rktl file of the same name
(require (only-in "../main.rkt" test-files! clear-coverage! get-test-coverage irrelevant-submodules) (require (only-in "../main.rkt" test-files! clear-coverage! get-test-coverage irrelevant-submodules
make-covered?)
"../private/file-utils.rkt" "../private/file-utils.rkt"
racket/runtime-path rackunit) racket/runtime-path rackunit)