Fix CTYP-74

Better error with malformed TApp
clojure · Oct 6, 2013 · edeb6cf · edeb6cf
1 parent 20b1682
commit edeb6cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/clojure/clojure/core/typed/parse_unparse.clj b/src/main/clojure/clojure/core/typed/parse_unparse.clj
@@ -519,7 +519,10 @@
 
 (defmethod parse-type-list :default 
   [[n & args :as syn]]
-  (r/TApp-maker (parse-type n) (mapv parse-type args)))
+  (let [op (parse-type n)]
+    (when-not ((some-fn r/Name? r/TypeFn? r/F? r/B? r/Poly?) op)
+      (u/int-error (str "Invalid operator to TApp: " (pr-str (unparse-type op)))))
+    (r/TApp-maker op (mapv parse-type args))))
 
 (defmethod parse-type Cons [l] (parse-type-list l))
 (defmethod parse-type IPersistentList [l] (parse-type-list l))

diff --git a/src/test/clojure/clojure/core/typed/test/core.clj b/src/test/clojure/clojure/core/typed/test/core.clj
@@ -2354,6 +2354,9 @@
 (deftest CTYP-78-finally-expected-test
   (is (check-ns 'clojure.core.typed.test.finally)))
 
+(deftest CTYP-74-malformed-TApp-test
+  (is (u/tc-error-thrown? (parse-type '([Any -> Any])))))
+
 ;(reset-caches)
 
 ;(chk/abstract-result