CLJ-1745 Revert wrapping of macro exceptions in CompilerException from CLJ-1169

Signed-off-by: Stuart Halloway <[email protected]>

Author: puredanger

src/jvm/clojure/lang/Compiler.java

@@ -6635,16 +6635,6 @@ public static Object macroexpand1(Object x) {
 						// hide the 2 extra params for a macro
 						throw new ArityException(e.actual - 2, e.name);
 					}
-				catch(Throwable e)
-					{
-						if(!(e instanceof CompilerException)) {
-								Integer line = (Integer) LINE.deref();
-								Integer column = (Integer) COLUMN.deref();
-								String source = (String) SOURCE.deref();
-								throw new CompilerException(source, line, column, e);
-						} else
-							throw (CompilerException) e;
-					}
 			}
 		else
 			{

test/clojure/test_clojure/control.clj

@@ -373,7 +373,7 @@
       :a (char 97)))
   (testing "test error on duplicate test constants"
     (is (thrown-with-msg?
-          clojure.lang.Compiler$CompilerException
+          IllegalArgumentException
           #"Duplicate case test constant: 1"
           (eval `(case 0 1 :x 1 :y)))))
   (testing "test correct behaviour on Number truncation"

test/clojure/test_clojure/errors.clj

@@ -48,7 +48,7 @@
                                 ["let .* in %s:\\d+" '(let [a])] 
                                 ["let .* in %s:\\d+" '(let (a))]
                                 ["renamed-with-open .* in %s:\\d+" '(renamed-with-open [a])]]]
-    (is (thrown-with-msg? clojure.lang.Compiler$CompilerException
+    (is (thrown-with-msg? IllegalArgumentException
                           (re-pattern (format msg-regex-str *ns*))
                           (macroexpand form)))))