From 3c966bc297d63821e97c3944bc4de01eb560a837 Mon Sep 17 00:00:00 2001 From: Sorawee Porncharoenwase Date: Sun, 22 Mar 2020 16:34:20 -0700 Subject: [PATCH] Unbreak syntax/to-string tests It's still unclear what the specification of syntax->string regarding whitespace before closing parens should be. The implementation also has not dealt with the issue. This PR therefore removes whitespace before closing parens from the tests. Once the discussion at https://github.com/racket/racket/issues/3071#issuecomment-601984438 has reached a conclusion and implemented, we can add these tests back. --- pkgs/racket-test/tests/syntax/to-string.rkt | 78 ++++++++++----------- racket/collects/syntax/to-string.rkt | 4 ++ 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/pkgs/racket-test/tests/syntax/to-string.rkt b/pkgs/racket-test/tests/syntax/to-string.rkt index 57b6e7a330..6c76ad195a 100644 --- a/pkgs/racket-test/tests/syntax/to-string.rkt +++ b/pkgs/racket-test/tests/syntax/to-string.rkt @@ -8,116 +8,114 @@ (check-equal? (syntax->string #'(a 'b #(a b c) c)) "a 'b #(a b c) c") (check-equal? (syntax->string #'((a b _ d))) "(a b _ d)") -(check-equal? (syntax->string #'(( a b ))) "( a b )") +(check-equal? (syntax->string #'(( a b))) "( a b)") ; we can't find where . is, default to earliest position -(check-equal? (syntax->string #'(( a b . c ))) "( a b . c )") +(check-equal? (syntax->string #'(( a b . c))) "( a b . c)") ;; quote tests (check-equal? (syntax->string #'('a)) "'a") (check-equal? (syntax->string #'(' a)) "' a") (check-equal? (syntax->string #'((quote a))) "(quote a)") -(check-equal? (syntax->string #'(( quote a ))) "( quote a )") +(check-equal? (syntax->string #'(( quote a))) "( quote a)") (check-equal? (syntax->string #'((quote a b))) "(quote a b)") -(check-equal? (syntax->string #'(( quote a b ))) "( quote a b )") +(check-equal? (syntax->string #'(( quote a b))) "( quote a b)") (check-equal? (syntax->string #'((quote . a))) "(quote . a)") -(check-equal? (syntax->string #'(( quote . a ))) "( quote . a )") +(check-equal? (syntax->string #'(( quote . a))) "( quote . a)") (check-equal? (syntax->string #'((quote a b . c))) "(quote a b . c)") -(check-equal? (syntax->string #'(( quote a b . c ))) "( quote a b . c )") +(check-equal? (syntax->string #'(( quote a b . c))) "( quote a b . c)") ;; unquote tests (check-equal? (syntax->string #'(,a)) ",a") (check-equal? (syntax->string #'(, a)) ", a") (check-equal? (syntax->string #'((unquote a))) "(unquote a)") -(check-equal? (syntax->string #'(( unquote a ))) "( unquote a )") +(check-equal? (syntax->string #'(( unquote a))) "( unquote a)") (check-equal? (syntax->string #'((unquote a b))) "(unquote a b)") -(check-equal? (syntax->string #'(( unquote a b ))) "( unquote a b )") +(check-equal? (syntax->string #'(( unquote a b))) "( unquote a b)") (check-equal? (syntax->string #'((unquote . a))) "(unquote . a)") -(check-equal? (syntax->string #'(( unquote . a ))) "( unquote . a )") +(check-equal? (syntax->string #'(( unquote . a))) "( unquote . a)") (check-equal? (syntax->string #'((unquote a b . c))) "(unquote a b . c)") -(check-equal? (syntax->string #'(( unquote a b . c ))) "( unquote a b . c )") +(check-equal? (syntax->string #'(( unquote a b . c))) "( unquote a b . c)") ;; quasiquote tests (check-equal? (syntax->string #'(`a)) "`a") (check-equal? (syntax->string #'(` a)) "` a") (check-equal? (syntax->string #'((quasiquote a))) "(quasiquote a)") -(check-equal? (syntax->string #'(( quasiquote a ))) "( quasiquote a )") +(check-equal? (syntax->string #'(( quasiquote a))) "( quasiquote a)") (check-equal? (syntax->string #'((quasiquote a b))) "(quasiquote a b)") -(check-equal? (syntax->string #'(( quasiquote a b ))) "( quasiquote a b )") +(check-equal? (syntax->string #'(( quasiquote a b))) "( quasiquote a b)") (check-equal? (syntax->string #'((quasiquote . a))) "(quasiquote . a)") -(check-equal? (syntax->string #'(( quasiquote . a ))) "( quasiquote . a )") +(check-equal? (syntax->string #'(( quasiquote . a))) "( quasiquote . a)") (check-equal? (syntax->string #'((quasiquote a b . c))) "(quasiquote a b . c)") -(check-equal? (syntax->string #'(( quasiquote a b . c ))) "( quasiquote a b . c )") +(check-equal? (syntax->string #'(( quasiquote a b . c))) "( quasiquote a b . c)") ;; unquote-splicing tests (check-equal? (syntax->string #'(,@a)) ",@a") (check-equal? (syntax->string #'(,@ a)) ",@ a") (check-equal? (syntax->string #'((unquote-splicing a))) "(unquote-splicing a)") -(check-equal? (syntax->string #'(( unquote-splicing a ))) "( unquote-splicing a )") +(check-equal? (syntax->string #'(( unquote-splicing a))) "( unquote-splicing a)") (check-equal? (syntax->string #'((unquote-splicing a b))) "(unquote-splicing a b)") -(check-equal? (syntax->string #'(( unquote-splicing a b ))) "( unquote-splicing a b )") +(check-equal? (syntax->string #'(( unquote-splicing a b))) "( unquote-splicing a b)") (check-equal? (syntax->string #'((unquote-splicing . a))) "(unquote-splicing . a)") -(check-equal? (syntax->string #'(( unquote-splicing . a ))) "( unquote-splicing . a )") +(check-equal? (syntax->string #'(( unquote-splicing . a))) "( unquote-splicing . a)") (check-equal? (syntax->string #'((unquote-splicing a b . c))) "(unquote-splicing a b . c)") -(check-equal? (syntax->string #'(( unquote-splicing a b . c ))) "( unquote-splicing a b . c )") +(check-equal? (syntax->string #'(( unquote-splicing a b . c))) "( unquote-splicing a b . c)") ;; syntax tests (check-equal? (syntax->string #'(#'a)) "#'a") (check-equal? (syntax->string #'(#' a)) "#' a") (check-equal? (syntax->string #'((syntax a))) "(syntax a)") -(check-equal? (syntax->string #'(( syntax a ))) "( syntax a )") +(check-equal? (syntax->string #'(( syntax a))) "( syntax a)") (check-equal? (syntax->string #'((syntax a b))) "(syntax a b)") -(check-equal? (syntax->string #'(( syntax a b ))) "( syntax a b )") +(check-equal? (syntax->string #'(( syntax a b))) "( syntax a b)") (check-equal? (syntax->string #'((syntax . a))) "(syntax . a)") -(check-equal? (syntax->string #'(( syntax . a ))) "( syntax . a )") +(check-equal? (syntax->string #'(( syntax . a))) "( syntax . a)") (check-equal? (syntax->string #'((syntax a b . c))) "(syntax a b . c)") -(check-equal? (syntax->string #'(( syntax a b . c ))) "( syntax a b . c )") +(check-equal? (syntax->string #'(( syntax a b . c))) "( syntax a b . c)") ;; quasisyntax tests (check-equal? (syntax->string #'(#`a)) "#`a") (check-equal? (syntax->string #'(#` a)) "#` a") (check-equal? (syntax->string #'((quasisyntax a))) "(quasisyntax a)") -(check-equal? (syntax->string #'(( quasisyntax a ))) "( quasisyntax a )") +(check-equal? (syntax->string #'(( quasisyntax a))) "( quasisyntax a)") (check-equal? (syntax->string #'((quasisyntax a b))) "(quasisyntax a b)") -(check-equal? (syntax->string #'(( quasisyntax a b ))) "( quasisyntax a b )") +(check-equal? (syntax->string #'(( quasisyntax a b))) "( quasisyntax a b)") (check-equal? (syntax->string #'((quasisyntax . a))) "(quasisyntax . a)") -(check-equal? (syntax->string #'(( quasisyntax . a ))) "( quasisyntax . a )") +(check-equal? (syntax->string #'(( quasisyntax . a))) "( quasisyntax . a)") (check-equal? (syntax->string #'((quasisyntax a b . c))) "(quasisyntax a b . c)") -(check-equal? (syntax->string #'(( quasisyntax a b . c ))) "( quasisyntax a b . c )") +(check-equal? (syntax->string #'(( quasisyntax a b . c))) "( quasisyntax a b . c)") ;; unsyntax tests (check-equal? (syntax->string #'(#,a)) "#,a") (check-equal? (syntax->string #'(#, a)) "#, a") (check-equal? (syntax->string #'((unsyntax a))) "(unsyntax a)") -(check-equal? (syntax->string #'(( unsyntax a ))) "( unsyntax a )") +(check-equal? (syntax->string #'(( unsyntax a))) "( unsyntax a)") (check-equal? (syntax->string #'((unsyntax a b))) "(unsyntax a b)") -(check-equal? (syntax->string #'(( unsyntax a b ))) "( unsyntax a b )") +(check-equal? (syntax->string #'(( unsyntax a b))) "( unsyntax a b)") (check-equal? (syntax->string #'((unsyntax . a))) "(unsyntax . a)") -(check-equal? (syntax->string #'(( unsyntax . a ))) "( unsyntax . a )") +(check-equal? (syntax->string #'(( unsyntax . a))) "( unsyntax . a)") (check-equal? (syntax->string #'((unsyntax a b . c))) "(unsyntax a b . c)") -(check-equal? (syntax->string #'(( unsyntax a b . c ))) "( unsyntax a b . c )") +(check-equal? (syntax->string #'(( unsyntax a b . c))) "( unsyntax a b . c)") ;; unsyntax tests (check-equal? (syntax->string #'(#,a)) "#,a") (check-equal? (syntax->string #'(#, a)) "#, a") (check-equal? (syntax->string #'((unsyntax a))) "(unsyntax a)") -(check-equal? (syntax->string #'(( unsyntax a ))) "( unsyntax a )") +(check-equal? (syntax->string #'(( unsyntax a))) "( unsyntax a)") (check-equal? (syntax->string #'((unsyntax a b))) "(unsyntax a b)") -(check-equal? (syntax->string #'(( unsyntax a b ))) "( unsyntax a b )") +(check-equal? (syntax->string #'(( unsyntax a b))) "( unsyntax a b)") (check-equal? (syntax->string #'((unsyntax . a))) "(unsyntax . a)") -(check-equal? (syntax->string #'(( unsyntax . a ))) "( unsyntax . a )") +(check-equal? (syntax->string #'(( unsyntax . a))) "( unsyntax . a)") (check-equal? (syntax->string #'((unsyntax a b . c))) "(unsyntax a b . c)") -(check-equal? (syntax->string #'(( unsyntax a b . c ))) "( unsyntax a b . c )") +(check-equal? (syntax->string #'(( unsyntax a b . c))) "( unsyntax a b . c)") ;; unsyntax-splicing tests (check-equal? (syntax->string #'(#,@a)) "#,@a") (check-equal? (syntax->string #'(#,@ a)) "#,@ a") (check-equal? (syntax->string #'((unsyntax-splicing a))) "(unsyntax-splicing a)") -(check-equal? (syntax->string #'(( unsyntax-splicing a ))) "( unsyntax-splicing a )") +(check-equal? (syntax->string #'(( unsyntax-splicing a))) "( unsyntax-splicing a)") (check-equal? (syntax->string #'((unsyntax-splicing a b))) "(unsyntax-splicing a b)") -(check-equal? (syntax->string #'(( unsyntax-splicing a b ))) "( unsyntax-splicing a b )") +(check-equal? (syntax->string #'(( unsyntax-splicing a b))) "( unsyntax-splicing a b)") (check-equal? (syntax->string #'((unsyntax-splicing . a))) "(unsyntax-splicing . a)") -(check-equal? (syntax->string #'(( unsyntax-splicing . a ))) "( unsyntax-splicing . a )") +(check-equal? (syntax->string #'(( unsyntax-splicing . a))) "( unsyntax-splicing . a)") (check-equal? (syntax->string #'((unsyntax-splicing a b . c))) "(unsyntax-splicing a b . c)") -(check-equal? (syntax->string #'(( unsyntax-splicing a b . c ))) "( unsyntax-splicing a b . c )") - - +(check-equal? (syntax->string #'(( unsyntax-splicing a b . c))) "( unsyntax-splicing a b . c)") diff --git a/racket/collects/syntax/to-string.rkt b/racket/collects/syntax/to-string.rkt index 530a6334ed..dfc75a25b7 100644 --- a/racket/collects/syntax/to-string.rkt +++ b/racket/collects/syntax/to-string.rkt @@ -64,6 +64,10 @@ (hash-has-key? quotes-table (syntax-e (car (syntax-e c)))) (eq? (syntax-span (car (syntax-e c))) (string-length (get-quote c)))) + ;; The above conditions detect the shorthand form of quote and friends + ;; The shorthand form will read, for instance, '
+ ;; as (quote ), so the result is guaranteed to be a syntax list + ;; with exactly two elements in it. (advance c init-line!) (printf (get-quote c)) (set! col (+ col (string-length (get-quote c))))