Skip to content

Commit

Permalink
get rid of checked exceptions
Browse files Browse the repository at this point in the history
  • Loading branch information
@richhickey
richhickey committed Mar 21, 2011
1 parent 0245f15 commit 8fda34e
Show file tree
Hide file tree
Showing 58 changed files with 2,066 additions and 1,926 deletions.
52 changes: 26 additions & 26 deletions src/jvm/clojure/lang/AFn.java
View file
Expand Up @@ -14,7 +14,7 @@

public abstract class AFn implements IFn {

public Object call() throws Exception{
public Object call() {
return invoke();
}

Expand All @@ -25,116 +25,116 @@ public void run(){
}
catch(Exception e)
{
throw new RuntimeException(e);
throw Util.runtimeException(e);
}
}



public Object invoke() throws Exception{
public Object invoke() {
return throwArity(0);
}

public Object invoke(Object arg1) throws Exception{
public Object invoke(Object arg1) {
return throwArity(1);
}

public Object invoke(Object arg1, Object arg2) throws Exception{
public Object invoke(Object arg1, Object arg2) {
return throwArity(2);
}

public Object invoke(Object arg1, Object arg2, Object arg3) throws Exception{
public Object invoke(Object arg1, Object arg2, Object arg3) {
return throwArity(3);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4) throws Exception{
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4) {
return throwArity(4);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) throws Exception{
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
return throwArity(5);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) throws Exception{
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
return throwArity(6);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7)
throws Exception{
{
return throwArity(7);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8) throws Exception{
Object arg8) {
return throwArity(8);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9) throws Exception{
Object arg8, Object arg9) {
return throwArity(9);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10) throws Exception{
Object arg8, Object arg9, Object arg10) {
return throwArity(10);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11) throws Exception{
Object arg8, Object arg9, Object arg10, Object arg11) {
return throwArity(11);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12) throws Exception{
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12) {
return throwArity(12);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13)
throws Exception{
{
return throwArity(13);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14)
throws Exception{
{
return throwArity(14);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
Object arg15) throws Exception{
Object arg15) {
return throwArity(15);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
Object arg15, Object arg16) throws Exception{
Object arg15, Object arg16) {
return throwArity(16);
}

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
Object arg15, Object arg16, Object arg17) throws Exception{
Object arg15, Object arg16, Object arg17) {
return throwArity(17);
}

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

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

public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20)
throws Exception{
{
return throwArity(20);
}

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

public Object applyTo(ISeq arglist) throws Exception{
public Object applyTo(ISeq arglist) {
return applyToHelper(this, Util.ret1(arglist,arglist = null));
}

static public Object applyToHelper(IFn ifn, ISeq arglist) throws Exception{
static public Object applyToHelper(IFn ifn, ISeq arglist) {
switch(RT.boundedLength(arglist, 20))
{
case 0:
Expand Down
4 changes: 2 additions & 2 deletions src/jvm/clojure/lang/AFunction.java
View file
Expand Up @@ -25,7 +25,7 @@ public IPersistentMap meta(){

public IObj withMeta(final IPersistentMap meta){
return new RestFn(){
protected Object doInvoke(Object args) throws Exception{
protected Object doInvoke(Object args) {
return AFunction.this.applyTo((ISeq) args);
}

Expand Down Expand Up @@ -60,7 +60,7 @@ public int compare(Object o1, Object o2){
}
catch(Exception e)
{
throw new RuntimeException(e);
throw Util.runtimeException(e);
}
}
}
4 changes: 2 additions & 2 deletions src/jvm/clojure/lang/AMapEntry.java
View file
Expand Up @@ -78,7 +78,7 @@ public String toString(){
catch(Exception e)
{
//checked exceptions stink!
throw new RuntimeException(e);
throw Util.runtimeException(e);
}
return sw.toString();
}
Expand Down Expand Up @@ -141,7 +141,7 @@ public Object peek(){
}
public ISeq rseq() throws Exception{
public ISeq rseq() {
return asVector().rseq();
}
*/
Expand Down
4 changes: 2 additions & 2 deletions src/jvm/clojure/lang/APersistentMap.java
View file
Expand Up @@ -173,11 +173,11 @@ public ValSeq withMeta(IPersistentMap meta){
}


public Object invoke(Object arg1) throws Exception{
public Object invoke(Object arg1) {
return valAt(arg1);
}

public Object invoke(Object arg1, Object notFound) throws Exception{
public Object invoke(Object arg1, Object notFound) {
return valAt(arg1, notFound);
}

Expand Down
2 changes: 1 addition & 1 deletion src/jvm/clojure/lang/APersistentSet.java
View file
Expand Up @@ -45,7 +45,7 @@ public ISeq seq(){
return RT.keys(impl);
}

public Object invoke(Object arg1) throws Exception{
public Object invoke(Object arg1) {
return get(arg1);
}

Expand Down
6 changes: 3 additions & 3 deletions src/jvm/clojure/lang/APersistentVector.java
View file
Expand Up @@ -244,7 +244,7 @@ public boolean addAll(int i, Collection c){
}


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

public Object reduce(IFn f) throws Exception{
public Object reduce(IFn f) {
Object ret = v.nth(i);
for(int x = i + 1; x < v.count(); x++)
ret = f.invoke(ret, v.nth(x));
return ret;
}

public Object reduce(IFn f, Object start) throws Exception{
public Object reduce(IFn f, Object start) {
Object ret = f.invoke(start, v.nth(i));
for(int x = i + 1; x < v.count(); x++)
ret = f.invoke(ret, v.nth(x));
Expand Down
6 changes: 3 additions & 3 deletions src/jvm/clojure/lang/ARef.java
View file
Expand Up @@ -53,7 +53,7 @@ public void setValidator(IFn vf){
}
catch(Exception e)
{
throw new RuntimeException(e);
throw Util.runtimeException(e);
}
validator = vf;
}
Expand All @@ -78,7 +78,7 @@ synchronized public IRef removeWatch(Object key){
}
catch(Exception e)
{
throw new RuntimeException(e);
throw Util.runtimeException(e);
}

return this;
Expand All @@ -99,7 +99,7 @@ public void notifyWatches(Object oldval, Object newval){
}
catch(Exception e1)
{
throw new RuntimeException(e1);
throw Util.runtimeException(e1);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/jvm/clojure/lang/AReference.java
View file
Expand Up @@ -27,7 +27,7 @@ synchronized public IPersistentMap meta() {
return _meta;
}

synchronized public IPersistentMap alterMeta(IFn alter, ISeq args) throws Exception {
synchronized public IPersistentMap alterMeta(IFn alter, ISeq args) {
_meta = (IPersistentMap) alter.applyTo(new Cons(_meta, args));
return _meta;
}
Expand Down

0 comments on commit 8fda34e

Please sign in to comment.