Mercurial Hosting > luan
comparison core/src/luan/modules/BasicLuan.java @ 446:bbad2d06f728
remove automatic conversion from string to number
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Mon, 04 May 2015 16:21:17 -0600 |
parents | e45bcaf6f5fe |
children | 0bd42e774c50 |
comparison
equal
deleted
inserted
replaced
445:cc7d246bda2a | 446:bbad2d06f728 |
---|---|
101 return t.rawLength(); | 101 return t.rawLength(); |
102 } | 102 } |
103 throw luan.exception( "bad argument #1 to 'raw_len' (table or string expected)" ); | 103 throw luan.exception( "bad argument #1 to 'raw_len' (table or string expected)" ); |
104 } | 104 } |
105 | 105 |
106 public static Number to_number(Object e,Integer base) { | 106 public static Number to_number(Object v,Integer base) { |
107 return Luan.toNumber(e,base); | 107 try { |
108 if( base == null ) { | |
109 if( v instanceof Number ) | |
110 return (Number)v; | |
111 if( v instanceof String ) | |
112 return Double.valueOf((String)v); | |
113 } else { | |
114 if( v instanceof String ) | |
115 return Long.valueOf((String)v,base); | |
116 } | |
117 } catch(NumberFormatException e) {} | |
118 return null; | |
108 } | 119 } |
109 | 120 |
110 public static String to_string(LuanState luan,Object v) throws LuanException { | 121 public static String to_string(LuanState luan,Object v) throws LuanException { |
111 return luan.toString(v); | 122 return luan.toString(v); |
112 } | 123 } |