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

Applied changes requested by @rmculpepper for PR #1587

Browse Source
This commit is contained in:
Georges Dupéron 2017-01-22 23:18:19 +01:00
parent 28f1df4cff
commit 73e3f7915b
2 changed files with 86 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/racket-test/tests/stxparse/test.rkt
View File

@ -50,7 +50,7 @@
(terx (1 (2 3)) (_:one _:two) "expected one") (terx (1 (2 3)) (_:one _:two) "expected one")
(terx ((1) 2) (_:one _:two) "expected two") (terx ((1) 2) (_:one _:two) "expected two")
(test-case "datum patterns" ;; datum patterns
(tok () () (tok () ()
'ok 'ok
#:pre [(_) 0] #:post []) #:pre [(_) 0] #:post [])
@ -135,7 +135,7 @@
(terx 1 2 "literal 2") (terx 1 2 "literal 2")
(terx (1 2) 1 "literal 1") (terx (1 2) 1 "literal 1")
(terx (1 2) (1 1) "literal 1")) (terx (1 2) (1 1) "literal 1")
;; literal patterns ;; literal patterns
(test-case "literals: +" (test-case "literals: +"

5
racket/collects/syntax/parse/experimental/template.rkt
View File

@ -4,8 +4,7 @@
racket/syntax racket/syntax
syntax/parse/private/minimatch syntax/parse/private/minimatch
racket/private/stx ;; syntax/stx racket/private/stx ;; syntax/stx
racket/private/sc racket/private/sc)
racket/struct)
syntax/parse/private/residual syntax/parse/private/residual
"private/substitute.rkt") "private/substitute.rkt")
(provide template (provide template
@ -410,7 +409,7 @@ instead of integers and integer vectors.
(and (pair? v) (quotable? (car v)) (quotable? (cdr v))) (and (pair? v) (quotable? (car v)) (quotable? (cdr v)))
(and (vector? v) (andmap quotable? (vector->list v))) (and (vector? v) (andmap quotable? (vector->list v)))
(and (hash? v) (andmap quotable? (hash->list v))) (and (hash? v) (andmap quotable? (hash->list v)))
(and (prefab-struct-key v) (andmap quotable? (struct->list v))))) (and (prefab-struct-key v) (andmap quotable? (cdr (vector->list (struct->vector v)))))))
(define (cons-guide g1 g2) (define (cons-guide g1 g2)
(if (and (eq? g1 '_) (eq? g2 '_)) '_ (cons g1 g2))) (if (and (eq? g1 '_) (eq? g2 '_)) '_ (cons g1 g2)))