From 48b70747528d45f3ec81220b9f55a7ddbf7b5f7d Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Thu, 26 Aug 2010 12:10:48 -0400 Subject: [PATCH] More "~n" -> "\n" changes original commit: 8e0f8dd39c3744472b450021f003f9cbe8cbcb62 --- collects/tests/typed-scheme/succeed/apply-dots-list.rkt | 4 ++-- collects/typed-scheme/env/global-env.rkt | 2 +- collects/typed-scheme/env/type-alias-env.rkt | 2 +- collects/typed-scheme/env/type-name-env.rkt | 2 +- collects/typed-scheme/infer/infer-unit.rkt | 2 +- collects/typed-scheme/typecheck/tc-app-helper.rkt | 4 ++-- collects/typed-scheme/typecheck/tc-lambda-unit.rkt | 4 ++-- collects/typed-scheme/types/printer.rkt | 2 +- collects/typed-scheme/types/subtype.rkt | 2 +- collects/typed-scheme/utils/utils.rkt | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/collects/tests/typed-scheme/succeed/apply-dots-list.rkt b/collects/tests/typed-scheme/succeed/apply-dots-list.rkt index ec5c25fe..cd1b832f 100644 --- a/collects/tests/typed-scheme/succeed/apply-dots-list.rkt +++ b/collects/tests/typed-scheme/succeed/apply-dots-list.rkt @@ -10,14 +10,14 @@ (let aux ([tests tests] [num-passed 0]) (if (null? tests) - (printf "~a tests passed.~n" num-passed) + (printf "~a tests passed.\n" num-passed) (let ((test (car tests))) (let ((actual ((car test))) (expected (cadr test)) (msg (caddr test))) (if (equal? actual expected) (aux (cdr tests) (+ num-passed 1)) - (printf "Test failed: ~a. Expected ~a, got ~a.~n" + (printf "Test failed: ~a. Expected ~a, got ~a.\n" msg expected actual))))))) (apply check-all tests) ; Works in untyped, but not in typed diff --git a/collects/typed-scheme/env/global-env.rkt b/collects/typed-scheme/env/global-env.rkt index 369f6cfd..b22f47c2 100644 --- a/collects/typed-scheme/env/global-env.rkt +++ b/collects/typed-scheme/env/global-env.rkt @@ -39,7 +39,7 @@ ;; add a single type to the mapping ;; identifier type -> void (define (register-type/undefined id type) - ;(printf "register-type/undef ~a~n" (syntax-e id)) + ;(printf "register-type/undef ~a\n" (syntax-e id)) (if (free-id-table-ref the-mapping id (lambda _ #f)) (void (tc-error/expr #:stx id "Duplicate type annotation for ~a" (syntax-e id))) (free-id-table-set! the-mapping id (box type)))) diff --git a/collects/typed-scheme/env/type-alias-env.rkt b/collects/typed-scheme/env/type-alias-env.rkt index 0d1b6298..05547eec 100644 --- a/collects/typed-scheme/env/type-alias-env.rkt +++ b/collects/typed-scheme/env/type-alias-env.rkt @@ -27,7 +27,7 @@ ;; add a name to the mapping ;; identifier type-stx -> void (define (register-type-alias id stx) - ;(printf "registering type ~a~n~a~n" (syntax-e id) id) + ;(printf "registering type ~a\n~a\n" (syntax-e id) id) (mapping-put! id (make-unresolved stx #f))) (define (register-resolved-type-alias id ty) diff --git a/collects/typed-scheme/env/type-name-env.rkt b/collects/typed-scheme/env/type-name-env.rkt index c741b552..47b553db 100644 --- a/collects/typed-scheme/env/type-name-env.rkt +++ b/collects/typed-scheme/env/type-name-env.rkt @@ -24,7 +24,7 @@ ;; add a name to the mapping ;; identifier Type -> void (define (register-type-name id [type #t]) - ;(printf "registering type ~a~n~a~n" (syntax-e id) id) + ;(printf "registering type ~a\n~a\n" (syntax-e id) id) (mapping-put! id type)) ;; add a bunch of names to the mapping diff --git a/collects/typed-scheme/infer/infer-unit.rkt b/collects/typed-scheme/infer/infer-unit.rkt index 9f1cc668..c177d37c 100644 --- a/collects/typed-scheme/infer/infer-unit.rkt +++ b/collects/typed-scheme/infer/infer-unit.rkt @@ -525,7 +525,7 @@ (match v [(c S X T) (let ([var (hash-ref h (or variable X) Constant)]) - ;(printf "variance was: ~a~nR was ~a~nX was ~a~nS T ~a ~a~n" var R (or variable X) S T) + ;(printf "variance was: ~a\nR was ~a\nX was ~a\nS T ~a ~a\n" var R (or variable X) S T) (evcase var [Constant S] [Covariant S] diff --git a/collects/typed-scheme/typecheck/tc-app-helper.rkt b/collects/typed-scheme/typecheck/tc-app-helper.rkt index d829d632..42492eea 100644 --- a/collects/typed-scheme/typecheck/tc-app-helper.rkt +++ b/collects/typed-scheme/typecheck/tc-app-helper.rkt @@ -94,7 +94,7 @@ "\n")) (tc-error/expr #:return (ret (Un)) (string-append - "Polymorphic " fcn-string " could not be applied to arguments:~n" + "Polymorphic " fcn-string " could not be applied to arguments:\n" (domain-mismatches t msg-doms msg-rests msg-drests msg-rngs argtypes #f #f #:expected expected) (if (not (for/and ([t (apply append (map fv/list msg-doms))]) (memq t msg-vars))) (string-append "Type Variables: " (stringify msg-vars) "\n") @@ -113,7 +113,7 @@ "\n")) (tc-error/expr #:return (ret (Un)) (string-append - "Polymorphic " fcn-string " could not be applied to arguments:~n" + "Polymorphic " fcn-string " could not be applied to arguments:\n" (domain-mismatches t msg-doms msg-rests msg-drests msg-rngs argtypes #f #f #:expected expected) (if (not (for/and ([t (apply append (map fv/list msg-doms))]) (memq t msg-vars))) (string-append "Type Variables: " (stringify msg-vars) "\n") diff --git a/collects/typed-scheme/typecheck/tc-lambda-unit.rkt b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt index b213cce5..4cd62e40 100644 --- a/collects/typed-scheme/typecheck/tc-lambda-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt @@ -251,7 +251,7 @@ ns))] [ty (extend-tvars tvars (maybe-loop form formals bodies (ret expected*)))]) - ;(printf "plambda: ~a ~a ~a ~n" literal-tvars new-tvars ty) + ;(printf "plambda: ~a ~a ~a \n" literal-tvars new-tvars ty) t)] [(tc-result1: (and t (PolyDots-names: (list ns ... dvar) expected*))) (let-values @@ -278,7 +278,7 @@ [tvars (let* ([ty (extend-tvars tvars (tc/mono-lambda/type formals bodies #f))]) - ;(printf "plambda: ~a ~a ~a ~n" literal-tvars new-tvars ty) + ;(printf "plambda: ~a ~a ~a \n" literal-tvars new-tvars ty) (make-Poly tvars ty))])] [(tc-result1: t) (unless (check-below (tc/plambda form formals bodies #f) t) diff --git a/collects/typed-scheme/types/printer.rkt b/collects/typed-scheme/types/printer.rkt index 4a621008..d92c6cc1 100644 --- a/collects/typed-scheme/types/printer.rkt +++ b/collects/typed-scheme/types/printer.rkt @@ -187,7 +187,7 @@ #;[(Poly-unsafe: n b) (fp "(unsafe-poly ~a ~a ~a)" (Type-seq c) n b)] [(Poly-names: names body) - #;(fprintf (current-error-port) "POLY SEQ: ~a~n" (Type-seq body)) + #;(fprintf (current-error-port) "POLY SEQ: ~a\n" (Type-seq body)) (fp "(All ~a ~a)" names body)] #;[(PolyDots-unsafe: n b) (fp "(unsafe-polydots ~a ~a ~a)" (Type-seq c) n b)] [(PolyDots-names: (list names ... dotted) body) diff --git a/collects/typed-scheme/types/subtype.rkt b/collects/typed-scheme/types/subtype.rkt index 6b2c0994..140cdce2 100644 --- a/collects/typed-scheme/types/subtype.rkt +++ b/collects/typed-scheme/types/subtype.rkt @@ -378,7 +378,7 @@ [((Hashtable: _ _) (HashtableTop:)) A0] ;; subtyping on structs follows the declared hierarchy [((Struct: nm (? Type? parent) flds proc _ _ _ _) other) - ;(printf "subtype - hierarchy : ~a ~a ~a~n" nm parent other) + ;(printf "subtype - hierarchy : ~a ~a ~a\n" nm parent other) (subtype* A0 parent other)] ;; Promises are covariant [((Struct: (== promise-sym) _ (list t) _ _ _ _ _) (Struct: (== promise-sym) _ (list t*) _ _ _ _ _)) (subtype* A0 t t*)] diff --git a/collects/typed-scheme/utils/utils.rkt b/collects/typed-scheme/utils/utils.rkt index 47c621d1..e855edc8 100644 --- a/collects/typed-scheme/utils/utils.rkt +++ b/collects/typed-scheme/utils/utils.rkt @@ -115,7 +115,7 @@ at least theoretically. (when (last-time) (error #f "Timing already started")) (last-time (current-process-milliseconds)) - (printf "Starting ~a at ~a~n" msg (last-time)))]) + (printf "Starting ~a at ~a\n" msg (last-time)))]) (syntax-rules () [(_ msg) (begin @@ -125,7 +125,7 @@ at least theoretically. [old (last-time)] [diff (- t old)]) (last-time t) - (printf "Timing ~a at ~a@~a~n" msg diff t)))])) + (printf "Timing ~a at ~a@~a\n" msg diff t)))])) (values (lambda _ #'(void)) (lambda _ #'(void))))) ;; custom printing