Remove unnecessary requires which caused bizarre errors
This commit is contained in:
parent
646bc0ecab
commit
ad537cce84
|
@ -7,11 +7,11 @@
|
||||||
syntax/stx (prefix-in c: scheme/contract)
|
syntax/stx (prefix-in c: scheme/contract)
|
||||||
syntax/parse
|
syntax/parse
|
||||||
(env type-environments type-name-env type-alias-env lexical-env)
|
(env type-environments type-name-env type-alias-env lexical-env)
|
||||||
(prefix-in t: (combine-in "base-types-extra.ss" "base-types.ss")) (only-in "colon.ss" :)
|
|
||||||
scheme/match
|
scheme/match
|
||||||
(for-template scheme/base "base-types-extra.ss" "colon.ss")
|
(for-template scheme/base "colon.ss")
|
||||||
(for-template (prefix-in t: "base-types-extra.ss")
|
;; needed for tests
|
||||||
(prefix-in t: (only-in "base-types.ss" Vectorof))))
|
(combine-in (prefix-in t: "base-types-extra.ss") "colon.ss")
|
||||||
|
(for-template (prefix-in t: "base-types-extra.ss")))
|
||||||
|
|
||||||
(define-struct poly (name vars) #:prefab)
|
(define-struct poly (name vars) #:prefab)
|
||||||
|
|
||||||
|
@ -87,8 +87,7 @@
|
||||||
|
|
||||||
(define-splicing-syntax-class latent-filter
|
(define-splicing-syntax-class latent-filter
|
||||||
#:description "latent filter"
|
#:description "latent filter"
|
||||||
(pattern (~seq t:expr @:id pe:path-elem ...)
|
(pattern (~seq t:expr (~describe "@" (~datum @)) pe:path-elem ...)
|
||||||
#:fail-unless (eq? (syntax-e #'@) '@) "expected @"
|
|
||||||
#:attr type (parse-type #'t)
|
#:attr type (parse-type #'t)
|
||||||
#:attr path (attribute pe.pe))
|
#:attr path (attribute pe.pe))
|
||||||
(pattern t:expr
|
(pattern t:expr
|
||||||
|
@ -99,8 +98,8 @@
|
||||||
(parameterize ([current-orig-stx stx])
|
(parameterize ([current-orig-stx stx])
|
||||||
(syntax-parse
|
(syntax-parse
|
||||||
stx
|
stx
|
||||||
#:literals (t:Class t:Refinement t:Instance t:Tuple t:List cons t:pred t:-> : case-lambda
|
#:literals (t:Class t:Refinement t:Instance t:List cons t:pred t:-> : case-lambda
|
||||||
t:Vectorof t:mu t:Rec t:U t:All t:Opaque t:Parameter quote)
|
t:Rec t:U t:All t:Opaque t:Parameter quote)
|
||||||
[t
|
[t
|
||||||
#:declare t (3d Type?)
|
#:declare t (3d Type?)
|
||||||
(attribute t.datum)]
|
(attribute t.datum)]
|
||||||
|
@ -153,7 +152,7 @@
|
||||||
[_ (tc-error/stx
|
[_ (tc-error/stx
|
||||||
ty
|
ty
|
||||||
"Component of case-lambda type was not a function clause")]))))]
|
"Component of case-lambda type was not a function clause")]))))]
|
||||||
[((~and kw t:Vectorof) t)
|
#;[((~and kw t:Vectorof) t)
|
||||||
(add-type-name-reference #'kw)
|
(add-type-name-reference #'kw)
|
||||||
(make-Vector (parse-type #'t))]
|
(make-Vector (parse-type #'t))]
|
||||||
[((~and kw t:Rec) x:id t)
|
[((~and kw t:Rec) x:id t)
|
||||||
|
@ -290,11 +289,11 @@
|
||||||
(tc-error "Opaque: bad syntax")]
|
(tc-error "Opaque: bad syntax")]
|
||||||
[(t:U . rest)
|
[(t:U . rest)
|
||||||
(tc-error "Union: bad syntax")]
|
(tc-error "Union: bad syntax")]
|
||||||
[(t:Vectorof . rest)
|
#;[(t:Vectorof . rest)
|
||||||
(tc-error "Vectorof: bad syntax")]
|
(tc-error "Vectorof: bad syntax")]
|
||||||
[((~and (~datum mu) t:mu) . rest)
|
[((~and (~datum mu) t:Rec) . rest)
|
||||||
(tc-error "mu: bad syntax")]
|
(tc-error "mu: bad syntax")]
|
||||||
[(t:mu . rest)
|
[(t:Rec . rest)
|
||||||
(tc-error "Rec: bad syntax")]
|
(tc-error "Rec: bad syntax")]
|
||||||
[(t ... t:-> . rest)
|
[(t ... t:-> . rest)
|
||||||
(tc-error "->: bad syntax")]
|
(tc-error "->: bad syntax")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user