Mercurial Hosting > luan
changeset 445:cc7d246bda2a
minor
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Mon, 04 May 2015 15:43:36 -0600 |
| parents | e45bcaf6f5fe |
| children | bbad2d06f728 |
| files | core/src/luan/LuanJavaFunction.java core/src/luan/modules/Luan.luan |
| diffstat | 2 files changed, 2 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
diff -r e45bcaf6f5fe -r cc7d246bda2a core/src/luan/LuanJavaFunction.java --- a/core/src/luan/LuanJavaFunction.java Mon May 04 14:59:01 2015 -0600 +++ b/core/src/luan/LuanJavaFunction.java Mon May 04 15:43:36 2015 -0600 @@ -237,25 +237,7 @@ return "ARG_SAME"; } }; -/* - private static final ArgConverter ARG_BOOLEAN = new ArgConverter() { - public Object convert(LuanState luan,Object obj) { - return Luan.toBoolean(obj); - } - @Override public String toString() { - return "ARG_BOOLEAN"; - } - }; - private static final ArgConverter ARG_BOOLEAN_OBJ = new ArgConverter() { - public Object convert(LuanState luan,Object obj) { - return obj==null ? null : Luan.toBoolean(obj); - } - @Override public String toString() { - return "ARG_BOOLEAN_OBJ"; - } - }; -*/ private static final ArgConverter ARG_DOUBLE = new ArgConverter() { public Object convert(LuanState luan,Object obj) { if( obj instanceof Double ) @@ -516,12 +498,6 @@ } private static ArgConverter getArgConverter(Class cls) { -/* - if( cls == Boolean.TYPE ) - return ARG_BOOLEAN; - if( cls.equals(Boolean.class) ) - return ARG_BOOLEAN_OBJ; -*/ if( cls == Double.TYPE || cls.equals(Double.class) ) return ARG_DOUBLE; if( cls == Float.TYPE || cls.equals(Float.class) )
diff -r e45bcaf6f5fe -r cc7d246bda2a core/src/luan/modules/Luan.luan --- a/core/src/luan/modules/Luan.luan Mon May 04 14:59:01 2015 -0600 +++ b/core/src/luan/modules/Luan.luan Mon May 04 15:43:36 2015 -0600 @@ -2,11 +2,11 @@ local BasicLuan = require "java:luan.modules.BasicLuan" assert_boolean = BasicLuan.assert_boolean +assert_integer = BasicLuan.assert_integer +assert_long = BasicLuan.assert_long assert_number = BasicLuan.assert_number assert_string = BasicLuan.assert_string assert_table = BasicLuan.assert_table -assert_integer = BasicLuan.assert_integer -assert_long = BasicLuan.assert_long do_file = BasicLuan.do_file error = BasicLuan.error get_metatable = BasicLuan.get_metatable