From 03bf7b58e6cf45b76b317369aa476443236658f9 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 26 Sep 2015 09:22:21 -0400
Subject: - Both method declarations & method definitions in classes can now
 include declarations of which exceptions they throw.

---
 src/lux/analyser/host.clj | 30 ++++++++++++++++++------------
 src/lux/compiler/host.clj |  6 ++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/lux/analyser/host.clj b/src/lux/analyser/host.clj
index 6c15c8bbc..9d295edda 100644
--- a/src/lux/analyser/host.clj
+++ b/src/lux/analyser/host.clj
@@ -414,8 +414,8 @@
 (defn ^:private analyse-field [field]
   (|case field
     [_ (&/$FormS (&/$Cons [_ (&/$TextS ?field-name)]
-                          (&/$Cons [_ (&/$TextS ?field-type)]
-                                   (&/$Cons [_ (&/$TupleS ?field-modifiers)]
+                          (&/$Cons [_ (&/$TupleS ?field-modifiers)]
+                                   (&/$Cons [_ (&/$TextS ?field-type)]
                                             (&/$Nil)))))]
     (|do [=field-modifiers (analyse-modifiers ?field-modifiers)]
       (return {:name ?field-name
@@ -428,12 +428,14 @@
 (defn ^:private analyse-method [analyse owner-class method]
   (|case method
     [idx [_ (&/$FormS (&/$Cons [_ (&/$TextS method-name)]
-                               (&/$Cons [_ (&/$TupleS method-inputs)]
-                                        (&/$Cons [_ (&/$TextS method-output)]
-                                                 (&/$Cons [_ (&/$TupleS method-modifiers)]
-                                                          (&/$Cons method-body
-                                                                   (&/$Nil)))))))]]
+                               (&/$Cons [_ (&/$TupleS method-modifiers)]
+                                        (&/$Cons [_ (&/$TupleS method-exs)]
+                                                 (&/$Cons [_ (&/$TupleS method-inputs)]
+                                                          (&/$Cons [_ (&/$TextS method-output)]
+                                                                   (&/$Cons method-body
+                                                                            (&/$Nil))))))))]]
     (|do [=method-modifiers (analyse-modifiers method-modifiers)
+          =method-exs (&/map% extract-text method-exs)
           =method-inputs (&/map% (fn [minput]
                                    (|case minput
                                      [_ (&/$FormS (&/$Cons [_ (&/$SymbolS "" input-name)]
@@ -455,6 +457,7 @@
                                                     =method-inputs)))]
       (return {:name method-name
                :modifiers =method-modifiers
+               :exceptions =method-exs
                :inputs (&/|map &/|second =method-inputs)
                :output method-output
                :body =method-body}))
@@ -465,14 +468,17 @@
 (defn ^:private analyse-method-decl [method]
   (|case method
     [_ (&/$FormS (&/$Cons [_ (&/$TextS method-name)]
-                          (&/$Cons [_ (&/$TupleS inputs)]
-                                   (&/$Cons [_ (&/$TextS output)]
-                                            (&/$Cons [_ (&/$TupleS modifiers)]
-                                                     (&/$Nil))))))]
+                          (&/$Cons [_ (&/$TupleS modifiers)]
+                                   (&/$Cons [_ (&/$TupleS method-exs)]
+                                            (&/$Cons [_ (&/$TupleS inputs)]
+                                                     (&/$Cons [_ (&/$TextS output)]
+                                                              (&/$Nil)))))))]
     (|do [=inputs (&/map% extract-text inputs)
-          =modifiers (analyse-modifiers modifiers)]
+          =modifiers (analyse-modifiers modifiers)
+          =method-exs (&/map% extract-text method-exs)]
       (return {:name method-name
                :modifiers =modifiers
+               :exceptions =method-exs
                :inputs =inputs
                :output output}))
     
diff --git a/src/lux/compiler/host.clj b/src/lux/compiler/host.clj
index 89f830561..b4858d789 100644
--- a/src/lux/compiler/host.clj
+++ b/src/lux/compiler/host.clj
@@ -419,7 +419,9 @@
                         (&host/->type-signature (:output method)))]
     (&/with-writer (.visitMethod class-writer (&host/modifiers->int (:modifiers method))
                                  (:name method)
-                                 signature nil nil)
+                                 signature
+                                 nil
+                                 (->> (:exceptions method) &/->seq (into-array java.lang.String)))
       (|do [^MethodVisitor =method &/get-writer
             :let [_ (.visitCode =method)]
             _ (compile (:body method))
@@ -432,7 +434,7 @@
 (defn ^:private compile-method-decl [class-writer method]
   (|let [signature (str "(" (&/fold str "" (&/|map &host/->type-signature (:inputs method))) ")"
                         (&host/->type-signature (:output method)))]
-    (.visitMethod class-writer (&host/modifiers->int (:modifiers method)) (:name method) signature nil nil)))
+    (.visitMethod class-writer (&host/modifiers->int (:modifiers method)) (:name method) signature nil (->> (:exceptions method) &/->seq (into-array java.lang.String)))))
 
 (let [clo-field-sig (&host/->type-signature "java.lang.Object")
       <init>-return "V"]
-- 
cgit v1.2.3