diff options
| author | Eduardo Julian | 2016-01-04 17:47:41 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2016-01-04 17:47:41 -0400 |
| commit | c52036b75a692a0def3fedb7f175134d8dfb0f5b (patch) | |
| tree | 7f4fb56fdb8cea058f9b2fc3b81de76dada7f08d /src/lux/analyser/host.clj | |
| parent | 46a8d84e3f48396d68db2f854644b7b83c3a102c (diff) | |
- Switched from TupleT to ProdT (implementation-wise).
Diffstat (limited to 'src/lux/analyser/host.clj')
| -rw-r--r-- | src/lux/analyser/host.clj | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lux/analyser/host.clj b/src/lux/analyser/host.clj index 5a85fbe66..25f7852dc 100644 --- a/src/lux/analyser/host.clj +++ b/src/lux/analyser/host.clj @@ -723,9 +723,10 @@ _ (check-method-completion all-supers =methods) =captured &&env/captured-vars :let [=fields (&/|map (fn [^objects idx+capt] - (&/T (str &c!base/closure-prefix (aget idx+capt 0)) - (&/|list) - captured-slot-type)) + (|let [[idx _] idx+capt] + (&/T (str &c!base/closure-prefix idx) + (&/|list) + captured-slot-type))) (&/enumerate =captured))] :let [sources (&/|map captured-source =captured)] _ (compile-token (&/V &&/$jvm-class (&/T class-decl super-class interfaces (&/|list) =fields =methods =captured (&/Some$ =ctor-args)))) @@ -737,13 +738,17 @@ (defn analyse-jvm-try [analyse exo-type ?body ?catches+?finally] (|do [:let [[?catches ?finally] ?catches+?finally] - =catches (&/map% (fn [[?ex-class ?ex-arg ?catch-body]] - (|do [=catch-body (&&env/with-local ?ex-arg (&type/Data$ ?ex-class &/Nil$) + =catches (&/map% (fn [_catch_] + (|do [:let [[?ex-class ?ex-arg ?catch-body] _catch_] + =catch-body (&&env/with-local ?ex-arg (&type/Data$ ?ex-class &/Nil$) (&&/analyse-1 analyse exo-type ?catch-body)) idx &&env/next-local-idx] (return (&/T ?ex-class idx =catch-body)))) ?catches) - :let [catched-exceptions (&/|map #(aget ^objects % 0) =catches)] + :let [catched-exceptions (&/|map (fn [=catch] + (|let [[_c-class _ _] =catch] + _c-class)) + =catches)] =body (with-catches catched-exceptions (&&/analyse-1 analyse exo-type ?body)) =finally (|case ?finally |