suzanne.soy/phc-graph
1
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in invariants implementation (phantom type Target had no fields, and therefore its polymorphic argument was ignored). Used more precise tests (test that a ⊏ b rather than a ⊑ b for the invariant types.)

Browse Source
This commit is contained in:
Georges Dupéron 2017-03-27 00:39:02 +02:00
parent 2c2190a9f6
commit 6c9a7a95d9
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
invariants-phantom.hl.rkt
View File

@ -371,8 +371,8 @@ relates two nodes in the graph.
@chunk[<cycles> @chunk[<cycles>
(struct ε () #:transparent) (struct ε () #:transparent)
(struct (T) Target () #:transparent) (struct (T) Target ([x : T]) #:transparent)
(struct (T) NonTarget Target ([x : T]) #:transparent) (struct (T) NonTarget Target () #:transparent)
(define-type-expander Cycle (define-type-expander Cycle
(syntax-parser (syntax-parser
@ -432,14 +432,16 @@ Two sorts of paths inside (in)equality constraints:
@subsection{Putting it all together} @subsection{Putting it all together}
@chunk[<check-a-stronger-b> @chunk[<check-a-stronger-b>
(define-syntax (check-a-stronger-or-same-b stx) (define-syntax (check-a-stronger-than-b stx)
(syntax-case stx () (syntax-case stx ()
[(_ stronger weaker) [(_ stronger weaker)
(syntax/top-loc stx (syntax/top-loc stx
(check-ann (ann witness-value stronger) (begin (check-ann (ann witness-value stronger)
weaker))])) weaker)
(check-not-tc
(ann (ann witness-value weaker) stronger))))]))
(define-syntax (check-a-same-b stx) (define-syntax (check-a-same-as-b stx)
(syntax-case stx () (syntax-case stx ()
[(_ a b) [(_ a b)
(syntax/top-loc stx (syntax/top-loc stx
@ -450,6 +452,8 @@ Two sorts of paths inside (in)equality constraints:
@chunk[<*> @chunk[<*>
(require (for-syntax phc-toolkit/untyped (require (for-syntax phc-toolkit/untyped
syntax/parse)) syntax/parse))
(provide Invariants ≡)
<witness-value> <witness-value>
<grouping-invariants> <grouping-invariants>
@ -464,20 +468,20 @@ Two sorts of paths inside (in)equality constraints:
(ann witness-value (Invariants)) ;; No invariants (ann witness-value (Invariants)) ;; No invariants
(ann witness-value (Invariants (≡ (_ a) (_ a b c)))) (ann witness-value (Invariants (≡ (_ a) (_ a b c))))
(check-a-stronger-or-same-b (Invariants (≡ (_ a) (_ a b c))) (check-a-stronger-than-b (Invariants (≡ (_ a) (_ a b c)))
(Invariants)) (Invariants))
(check-a-same-b (Invariants (≡ (_ a) (_ a b c))) (check-a-same-as-b (Invariants (≡ (_ a) (_ a b c)))
(Invariants (≡ (_ a b c) (_ a)))) (Invariants (≡ (_ a b c) (_ a))))
(check-a-stronger-or-same-b (Invariants (≡ (_) (_ b c)) (check-a-stronger-than-b (Invariants (≡ (_) (_ b c))
(≡ (_) (_ b d))) (≡ (_) (_ b d)))
(Invariants (≡ (_) (_ b c)))) (Invariants (≡ (_) (_ b c))))
(check-a-stronger-or-same-b (Invariants (≡ (_) (_ b d)) (check-a-stronger-than-b (Invariants (≡ (_) (_ b d))
(≡ (_) (_ b c))) (≡ (_) (_ b c)))
(Invariants (≡ (_) (_ b c)))) (Invariants (≡ (_) (_ b c))))
(check-a-stronger-or-same-b (Invariants (≡ (_) (check-a-stronger-than-b (Invariants (≡ (_)
(_ b d a b d ↙ a b (d)))) (_ b d a b d ↙ a b (d))))
(Invariants (≡ (_) (Invariants (≡ (_)
(_ b d ↙ a b (d))))))] (_ b d ↙ a b (d))))))]