Skip to content

Commit 8fda34e

Browse files
richhickeyrichhickey
committed
get rid of checked exceptions
1 parent 0245f15 commit 8fda34e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2066
-1926
lines changed

‎src/jvm/clojure/lang/AFn.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
public abstract class AFn implements IFn {
1616

17-
public Object call() throws Exception{
17+
public Object call() {
1818
return invoke();
1919
}
2020

@@ -25,116 +25,116 @@ public void run(){
2525
}
2626
catch(Exception e)
2727
{
28-
throw new RuntimeException(e);
28+
throw Util.runtimeException(e);
2929
}
3030
}
3131

3232

3333

34-
public Object invoke() throws Exception{
34+
public Object invoke() {
3535
return throwArity(0);
3636
}
3737

38-
public Object invoke(Object arg1) throws Exception{
38+
public Object invoke(Object arg1) {
3939
return throwArity(1);
4040
}
4141

42-
public Object invoke(Object arg1, Object arg2) throws Exception{
42+
public Object invoke(Object arg1, Object arg2) {
4343
return throwArity(2);
4444
}
4545

46-
public Object invoke(Object arg1, Object arg2, Object arg3) throws Exception{
46+
public Object invoke(Object arg1, Object arg2, Object arg3) {
4747
return throwArity(3);
4848
}
4949

50-
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4) throws Exception{
50+
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4) {
5151
return throwArity(4);
5252
}
5353

54-
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) throws Exception{
54+
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
5555
return throwArity(5);
5656
}
5757

58-
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) throws Exception{
58+
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
5959
return throwArity(6);
6060
}
6161

6262
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7)
63-
throws Exception{
63+
{
6464
return throwArity(7);
6565
}
6666

6767
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
68-
Object arg8) throws Exception{
68+
Object arg8) {
6969
return throwArity(8);
7070
}
7171

7272
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
73-
Object arg8, Object arg9) throws Exception{
73+
Object arg8, Object arg9) {
7474
return throwArity(9);
7575
}
7676

7777
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
78-
Object arg8, Object arg9, Object arg10) throws Exception{
78+
Object arg8, Object arg9, Object arg10) {
7979
return throwArity(10);
8080
}
8181

8282
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
83-
Object arg8, Object arg9, Object arg10, Object arg11) throws Exception{
83+
Object arg8, Object arg9, Object arg10, Object arg11) {
8484
return throwArity(11);
8585
}
8686

8787
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
88-
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12) throws Exception{
88+
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12) {
8989
return throwArity(12);
9090
}
9191

9292
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
9393
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13)
94-
throws Exception{
94+
{
9595
return throwArity(13);
9696
}
9797

9898
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
9999
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14)
100-
throws Exception{
100+
{
101101
return throwArity(14);
102102
}
103103

104104
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
105105
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
106-
Object arg15) throws Exception{
106+
Object arg15) {
107107
return throwArity(15);
108108
}
109109

110110
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
111111
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
112-
Object arg15, Object arg16) throws Exception{
112+
Object arg15, Object arg16) {
113113
return throwArity(16);
114114
}
115115

116116
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
117117
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
118-
Object arg15, Object arg16, Object arg17) throws Exception{
118+
Object arg15, Object arg16, Object arg17) {
119119
return throwArity(17);
120120
}
121121

122122
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
123123
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
124-
Object arg15, Object arg16, Object arg17, Object arg18) throws Exception{
124+
Object arg15, Object arg16, Object arg17, Object arg18) {
125125
return throwArity(18);
126126
}
127127

128128
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
129129
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
130-
Object arg15, Object arg16, Object arg17, Object arg18, Object arg19) throws Exception{
130+
Object arg15, Object arg16, Object arg17, Object arg18, Object arg19) {
131131
return throwArity(19);
132132
}
133133

134134
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
135135
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
136136
Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20)
137-
throws Exception{
137+
{
138138
return throwArity(20);
139139
}
140140

@@ -143,15 +143,15 @@ public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object
143143
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
144144
Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20,
145145
Object... args)
146-
throws Exception{
146+
{
147147
return throwArity(21);
148148
}
149149

150-
public Object applyTo(ISeq arglist) throws Exception{
150+
public Object applyTo(ISeq arglist) {
151151
return applyToHelper(this, Util.ret1(arglist,arglist = null));
152152
}
153153

154-
static public Object applyToHelper(IFn ifn, ISeq arglist) throws Exception{
154+
static public Object applyToHelper(IFn ifn, ISeq arglist) {
155155
switch(RT.boundedLength(arglist, 20))
156156
{
157157
case 0:

‎src/jvm/clojure/lang/AFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public IPersistentMap meta(){
2525

2626
public IObj withMeta(final IPersistentMap meta){
2727
return new RestFn(){
28-
protected Object doInvoke(Object args) throws Exception{
28+
protected Object doInvoke(Object args) {
2929
return AFunction.this.applyTo((ISeq) args);
3030
}
3131

@@ -60,7 +60,7 @@ public int compare(Object o1, Object o2){
6060
}
6161
catch(Exception e)
6262
{
63-
throw new RuntimeException(e);
63+
throw Util.runtimeException(e);
6464
}
6565
}
6666
}

‎src/jvm/clojure/lang/AMapEntry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public String toString(){
7878
catch(Exception e)
7979
{
8080
//checked exceptions stink!
81-
throw new RuntimeException(e);
81+
throw Util.runtimeException(e);
8282
}
8383
return sw.toString();
8484
}
@@ -141,7 +141,7 @@ public Object peek(){
141141
}
142142
143143
144-
public ISeq rseq() throws Exception{
144+
public ISeq rseq() {
145145
return asVector().rseq();
146146
}
147147
*/

‎src/jvm/clojure/lang/APersistentMap.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@ public ValSeq withMeta(IPersistentMap meta){
173173
}
174174

175175

176-
public Object invoke(Object arg1) throws Exception{
176+
public Object invoke(Object arg1) {
177177
return valAt(arg1);
178178
}
179179

180-
public Object invoke(Object arg1, Object notFound) throws Exception{
180+
public Object invoke(Object arg1, Object notFound) {
181181
return valAt(arg1, notFound);
182182
}
183183

‎src/jvm/clojure/lang/APersistentSet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public ISeq seq(){
4545
return RT.keys(impl);
4646
}
4747

48-
public Object invoke(Object arg1) throws Exception{
48+
public Object invoke(Object arg1) {
4949
return get(arg1);
5050
}
5151

‎src/jvm/clojure/lang/APersistentVector.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public boolean addAll(int i, Collection c){
244244
}
245245

246246

247-
public Object invoke(Object arg1) throws Exception{
247+
public Object invoke(Object arg1) {
248248
if(Util.isInteger(arg1))
249249
return nth(((Number) arg1).intValue());
250250
throw new IllegalArgumentException("Key must be integer");
@@ -445,14 +445,14 @@ public APersistentVector.Seq withMeta(IPersistentMap meta){
445445
return new APersistentVector.Seq(meta, v, i);
446446
}
447447

448-
public Object reduce(IFn f) throws Exception{
448+
public Object reduce(IFn f) {
449449
Object ret = v.nth(i);
450450
for(int x = i + 1; x < v.count(); x++)
451451
ret = f.invoke(ret, v.nth(x));
452452
return ret;
453453
}
454454

455-
public Object reduce(IFn f, Object start) throws Exception{
455+
public Object reduce(IFn f, Object start) {
456456
Object ret = f.invoke(start, v.nth(i));
457457
for(int x = i + 1; x < v.count(); x++)
458458
ret = f.invoke(ret, v.nth(x));

‎src/jvm/clojure/lang/ARef.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void setValidator(IFn vf){
5353
}
5454
catch(Exception e)
5555
{
56-
throw new RuntimeException(e);
56+
throw Util.runtimeException(e);
5757
}
5858
validator = vf;
5959
}
@@ -78,7 +78,7 @@ synchronized public IRef removeWatch(Object key){
7878
}
7979
catch(Exception e)
8080
{
81-
throw new RuntimeException(e);
81+
throw Util.runtimeException(e);
8282
}
8383

8484
return this;
@@ -99,7 +99,7 @@ public void notifyWatches(Object oldval, Object newval){
9999
}
100100
catch(Exception e1)
101101
{
102-
throw new RuntimeException(e1);
102+
throw Util.runtimeException(e1);
103103
}
104104
}
105105
}

‎src/jvm/clojure/lang/AReference.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ synchronized public IPersistentMap meta() {
2727
return _meta;
2828
}
2929

30-
synchronized public IPersistentMap alterMeta(IFn alter, ISeq args) throws Exception {
30+
synchronized public IPersistentMap alterMeta(IFn alter, ISeq args) {
3131
_meta = (IPersistentMap) alter.applyTo(new Cons(_meta, args));
3232
return _meta;
3333
}

0 commit comments

Comments
 (0)