Mercurial Hosting > luan
diff src/luan/Lua.java @ 36:2a35154aec14
implement more basic lib functions
git-svn-id: https://luan-java.googlecode.com/svn/trunk@37 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Tue, 18 Dec 2012 09:53:42 +0000 |
| parents | e51906de0f11 |
| children | 8a57ebfdfd78 |
line wrap: on
line diff
--- a/src/luan/Lua.java Tue Dec 18 07:05:58 2012 +0000 +++ b/src/luan/Lua.java Tue Dec 18 09:53:42 2012 +0000 @@ -20,12 +20,6 @@ return obj != null && !Boolean.FALSE.equals(obj); } - public static String toString(Object obj) { - if( obj == null ) - return "nil"; - return obj.toString(); - } - public static String asString(Object obj) { if( obj instanceof String || obj instanceof LuaNumber ) return obj.toString(); @@ -40,12 +34,19 @@ } public static LuaNumber toNumber(Object obj) { + return toNumber(obj,null); + } + + public static LuaNumber toNumber(Object obj,Integer base) { if( obj instanceof LuaNumber ) return (LuaNumber)obj; if( obj instanceof String ) { String s = (String)obj; try { - return new LuaNumber( Double.parseDouble(s) ); + if( base==null ) + return new LuaNumber( Double.parseDouble(s) ); + else + return new LuaNumber( Long.parseLong(s,base) ); } catch(NumberFormatException e) {} } return null;