Skip to content

fix subtyping between struct descriptor types & has-struct-property #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2021
Merged

fix subtyping between struct descriptor types & has-struct-property #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions typed-racket-lib/typed-racket/types/subtype.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,8 @@
(cons portable-fixnum? -NonNegFixnum)
(cons values -Nat)))

(define (valid-prop-name? name properties)
(and (free-id-set-member? properties name) (Struct-Property? (lookup-id-type/lexical name))))

(define-rep-switch (subtype-cases A (#:switch t1) t2 obj)
;; NOTE: keep these in alphabetical order
Expand Down Expand Up @@ -1201,12 +1203,8 @@
[(StructTop: (Struct: nm2 _ _ _ _ _ _))
#:when (free-identifier=? nm1 nm2)
A]
[(Has-Struct-Property: prop-name)
(cond
[(free-id-set-member? properties prop-name)
(match (lookup-id-type/lexical prop-name)
[(? Struct-Property?) A])]
[else #f])]
[(Has-Struct-Property: prop-name) #:when (valid-prop-name? prop-name properties)
A]
[(Val-able: (? (negate struct?) _)) #f]
;; subtyping on structs follows the declared hierarchy
[_ (cond
Expand All @@ -1223,6 +1221,11 @@
[(case: StructType (StructType: t1*))
(match t2
[(StructTypeTop:) A]
[(Has-Struct-Property: prop-name)
(match t1*
[(Struct: _ _ _ _ _ _ properties) #:when (valid-prop-name? prop-name properties)
A]
[else #f])]
[_ (continue<: A t1 t2 obj)])]
[(case: Syntax (Syntax: elem1))
(match t2
Expand Down
13 changes: 6 additions & 7 deletions typed-racket-test/succeed/structs-has-subtype.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@
(: prop-ins-to-num-ref (Some (X) (-> (Has-Struct-Property prop-ins-to-num) (-> X Number) : X) ))
(define-values (prop-ins-to-num prop-ins-to-num? prop-ins-to-num-ref) (make-struct-type-property 'prop-ins-to-num))

;; (: bar? : Any -> Boolean : (Has-Struct-Property prop-ins-to-num))
;; (define bar? prop-ins-to-num?)


; (struct (X Y) helloworld ([x : Y] [y : Y]) #:property prop-ins-to-num (cons 20 40))

(struct posn ([x : Integer] [y : Integer]) #:property prop-ins-to-num (λ ([self : posn])
20))
(struct posn ([x : Integer] [y : Integer])
#:property prop-ins-to-num
(λ ([self : posn])
20))

(: p1 posn)
(define p1 (posn 100 200))
(posn-x p1)

(prop-ins-to-num-ref struct:posn)
(: val Number)
(define val ((prop-ins-to-num-ref p1) p1))