Mercurial Hosting > luan
diff core/src/luan/LuanJavaFunction.java @ 408:1b38de2b1845
merge LuanTableImpl into LuanTable
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Wed, 29 Apr 2015 13:15:17 -0600 |
parents | ba8b0aae6453 |
children | 3ffe8ba5b297 |
line wrap: on
line diff
--- a/core/src/luan/LuanJavaFunction.java Wed Apr 29 13:01:00 2015 -0600 +++ b/core/src/luan/LuanJavaFunction.java Wed Apr 29 13:15:17 2015 -0600 @@ -201,7 +201,7 @@ for( int i=0; i<a.length; i++ ) { a[i] = Array.get(obj,i); } - return new LuanTableImpl(new ArrayList<Object>(Arrays.asList(a))); + return new LuanTable(new ArrayList<Object>(Arrays.asList(a))); } }; @@ -397,22 +397,22 @@ if( obj instanceof List ) { @SuppressWarnings("unchecked") List<Object> list = (List<Object>)obj; - return new LuanTableImpl(list); + return new LuanTable(list); } if( obj instanceof Map ) { @SuppressWarnings("unchecked") Map<Object,Object> map = (Map<Object,Object>)obj; - return new LuanTableImpl(map); + return new LuanTable(map); } if( obj instanceof Set ) { @SuppressWarnings("unchecked") Set<Object> set = (Set<Object>)obj; - return new LuanTableImpl(set); + return new LuanTable(set); } Class cls = obj.getClass(); if( cls.isArray() && !cls.getComponentType().isPrimitive() ) { Object[] a = (Object[])obj; - return new LuanTableImpl(Arrays.asList(a)); + return new LuanTable(Arrays.asList(a)); } return obj; } @@ -423,8 +423,8 @@ private static final ArgConverter ARG_MAP = new ArgConverter() { public Object convert(Object obj) { - if( obj instanceof LuanTableImpl ) { - LuanTableImpl t = (LuanTableImpl)obj; + if( obj instanceof LuanTable ) { + LuanTable t = (LuanTable)obj; return t.asMap(); } return obj; @@ -436,8 +436,8 @@ private static final ArgConverter ARG_LIST = new ArgConverter() { public Object convert(Object obj) { - if( obj instanceof LuanTableImpl ) { - LuanTableImpl t = (LuanTableImpl)obj; + if( obj instanceof LuanTable ) { + LuanTable t = (LuanTable)obj; if( t.isList() ) return t.asList(); } @@ -450,8 +450,8 @@ private static final ArgConverter ARG_SET = new ArgConverter() { public Object convert(Object obj) { - if( obj instanceof LuanTableImpl ) { - LuanTableImpl t = (LuanTableImpl)obj; + if( obj instanceof LuanTable ) { + LuanTable t = (LuanTable)obj; if( t.isSet() ) return t.asSet(); } @@ -464,8 +464,8 @@ private static final ArgConverter ARG_COLLECTION = new ArgConverter() { public Object convert(Object obj) { - if( obj instanceof LuanTableImpl ) { - LuanTableImpl t = (LuanTableImpl)obj; + if( obj instanceof LuanTable ) { + LuanTable t = (LuanTable)obj; if( t.isList() ) return t.asList(); if( t.isSet() ) @@ -486,8 +486,8 @@ } public Object convert(Object obj) { - if( obj instanceof LuanTableImpl ) { - LuanTableImpl t = (LuanTableImpl)obj; + if( obj instanceof LuanTable ) { + LuanTable t = (LuanTable)obj; if( t.isList() ) { try { return t.asList().toArray(a);