Mercurial Hosting > luan
diff core/src/luan/modules/JavaLuan.java @ 578:60c549d43988
remove LuanState.exception()
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Tue, 14 Jul 2015 17:40:48 -0600 |
parents | 4723d22062ce |
children | 859c0dedc8b6 |
line wrap: on
line diff
--- a/core/src/luan/modules/JavaLuan.java Mon Jul 13 20:53:02 2015 -0600 +++ b/core/src/luan/modules/JavaLuan.java Tue Jul 14 17:40:48 2015 -0600 @@ -43,7 +43,7 @@ private static void checkJava(LuanState luan) throws LuanException { if( !luan.hasJava() ) - throw luan.exception("Java isn't allowed"); + throw new LuanException(luan,"Java isn't allowed"); } static final Object FAIL = new Object(); @@ -94,7 +94,7 @@ if( i != null ) { return Array.get(obj,i); } -// throw luan.exception("invalid member '"+key+"' for java array: "+obj); +// throw new LuanException(luan,"invalid member '"+key+"' for java array: "+obj); } else if( key instanceof String ) { String name = (String)key; if( "instanceof".equals(name) ) { @@ -110,7 +110,7 @@ //System.out.println("invalid member '"+key+"' for java object: "+obj); if( canReturnFail ) return FAIL; - throw luan.exception( "invalid index for java "+cls+" in '"+luan.context()+"'" ); + throw new LuanException(luan, "invalid index for java "+cls+" in '"+luan.context()+"'" ); } private static Object member(Object obj,List<Member> members) throws LuanException { @@ -156,7 +156,7 @@ return; } } -// throw luan.exception("invalid member '"+key+"' for: "+obj); +// throw new LuanException(luan,"invalid member '"+key+"' for: "+obj); } else { cls = obj.getClass(); if( cls.isArray() ) { @@ -165,7 +165,7 @@ Array.set(obj,i,value); return; } -// throw luan.exception("invalid member '"+key+"' for java array: "+obj); +// throw new LuanException(luan,"invalid member '"+key+"' for java array: "+obj); } else if( key instanceof String ) { String name = (String)key; List<Member> members = getMembers(cls,name); @@ -177,7 +177,7 @@ } } } - throw luan.exception( "invalid index for java "+cls+" in '"+luan.context()+"'" ); + throw new LuanException(luan, "invalid index for java "+cls+" in '"+luan.context()+"'" ); } private static void setMember(Object obj,List<Member> members,Object value) { @@ -378,7 +378,7 @@ return fn.rawCall(luan,args); } catch(IllegalArgumentException e) {} } - throw luan.exception("no method matched args: "+Arrays.asList(args)); + throw new LuanException(luan,"no method matched args: "+Arrays.asList(args)); } } @@ -415,7 +415,7 @@ if( !cls.isInstance(v) ) { String got = v.getClass().getSimpleName(); String expected = cls.getSimpleName(); - throw luan.exception("bad argument #1 ("+expected+" expected, got "+got+")"); + throw new LuanException(luan,"bad argument #1 ("+expected+" expected, got "+got+")"); } return v; }