From cd181f9d90a42c168ffff261c3c6dfc3f23b61ef Mon Sep 17 00:00:00 2001
From: Andrew Kent <andmkent@iu.edu>
Date: Sun, 5 Nov 2017 21:10:58 -0500
Subject: [PATCH] check-below use props if with-refinements on

---
 .../typed-racket/typecheck/check-below.rkt    | 42 +++++++++---------
 .../succeed/refinements-expected-type1.rkt    | 43 +++++++++++++++++++
 2 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 typed-racket-test/succeed/refinements-expected-type1.rkt

diff --git a/typed-racket-lib/typed-racket/typecheck/check-below.rkt b/typed-racket-lib/typed-racket/typecheck/check-below.rkt
index 597b6f36..c3cc322f 100644
--- a/typed-racket-lib/typed-racket/typecheck/check-below.rkt
+++ b/typed-racket-lib/typed-racket/typecheck/check-below.rkt
@@ -107,21 +107,29 @@
 
 
     [((tc-result1: t1 p1 o1) (tc-result1: t2 p2 o2))
+     (define (perform-check!)
+       (cond
+         [(not (subtype t1 t2 o1))
+          (expected-but-got t2 t1)]
+         [(and (not (prop-set-better? p1 p2))
+               (object-better? o1 o2))
+          (type-mismatch p2 p1 "mismatch in proposition")]
+         [(and (prop-set-better? p1 p2)
+               (not (object-better? o1 o2)))
+          (type-mismatch (print-object o2) (print-object o1) "mismatch in object")]
+         [(and (not (prop-set-better? p1 p2))
+               (not (object-better? o1 o2)))
+          (type-mismatch (format "`~a' and `~a'" p2 (print-object o2))
+                         (format "`~a' and `~a'" p1 (print-object o1))
+                         "mismatch in proposition and object")])
+       (ret t2 (fix-props p2 p1) (fix-object o2 o1)))
      (cond
-       [(not (subtype t1 t2 o1))
-        (expected-but-got t2 t1)]
-       [(and (not (prop-set-better? p1 p2))
-             (object-better? o1 o2))
-        (type-mismatch p2 p1 "mismatch in proposition")]
-       [(and (prop-set-better? p1 p2)
-             (not (object-better? o1 o2)))
-        (type-mismatch (print-object o2) (print-object o1) "mismatch in object")]
-       [(and (not (prop-set-better? p1 p2))
-             (not (object-better? o1 o2)))
-        (type-mismatch (format "`~a' and `~a'" p2 (print-object o2))
-                       (format "`~a' and `~a'" p1 (print-object o1))
-                       "mismatch in proposition and object")])
-     (ret t2 (fix-props p2 p1) (fix-object o2 o1))]
+       [(with-refinements?)
+        (with-naively-extended-lexical-env
+            [#:props (list (-is-type o1 t1)
+                           (-or (PropSet-thn p1) (PropSet-els p1)))]
+          (perform-check!))]
+       [else (perform-check!)])]
 
     ;; case where expected is like (Values a ... a) but got something else
     [((tc-results: _ #f) (tc-results: _ (? RestDots?)))
@@ -134,12 +142,6 @@
      (fix-results expected)]
 
     ;; case where both have no '...', or both have '...'
-    ;; NOTE: we ignore the propsets and objects... not sure
-    ;;       why---maybe there's an assumption that users
-    ;;       can't specify props/objects for multiple values?
-    ;;       seems like we should add some checks to this doesn't
-    ;;       turn into an error in the future that we can't fix w/o
-    ;;       breaking programs that relied on it being broken.
     [((tc-results: tcrs1 db1)
       (tc-results: tcrs2 db2))
      (cond
diff --git a/typed-racket-test/succeed/refinements-expected-type1.rkt b/typed-racket-test/succeed/refinements-expected-type1.rkt
new file mode 100644
index 00000000..d6a1411a
--- /dev/null
+++ b/typed-racket-test/succeed/refinements-expected-type1.rkt
@@ -0,0 +1,43 @@
+;; see Typed Racket GH issue #640
+#lang typed/racket #:with-refinements
+
+(: lyst : (-> ([arg : Integer])
+              (Refine [result : (List Integer)]
+                      (= (car result) arg))))
+(define (lyst arg)
+  (define result (list arg))
+  (assert (= (car result) arg))
+  result)
+
+(: lyst-car : (-> ([lyst : (List Integer)])
+                  (Refine [result : Integer]
+                          (= result (car lyst)))))
+(define (lyst-car lst)
+  (car lst))
+
+(: lyst+ : (-> ([a : (List Integer)]
+                [b : (List Integer)])
+               (Refine [result : (List Integer)]
+                       (= (car result) (+ (car a) (car b))))))
+(define (lyst+ a b)
+  (lyst (+ (lyst-car a) (lyst-car b))))
+
+(: lyst1+ : (-> ([a : (List Integer)]
+                 [b : (List Integer)])
+                (Refine [result : (List Integer)]
+                        (= (car result) (+ (car a) (car b))))))
+(define (lyst1+ a b)
+  (define res (lyst (+ (lyst-car a) (lyst-car b))))
+  res)
+
+
+(: lyst2+ : (-> ([a : (List Integer)]
+                 [b : (List Integer)])
+                (values (Refine [result : (List Integer)]
+                                (= (car result) (+ (car a) (car b))))
+                        (Refine [result : (List Integer)]
+                                (= (car result) (+ (car a) (car b)))))))
+(define (lyst2+ a b)
+  (values (lyst (+ (lyst-car a) (lyst-car b)))
+          (lyst (+ (lyst-car a) (lyst-car b)))))
+