Mercurial Hosting > luan
comparison core/src/luan/Luan.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 | bf5e62a9090c |
| children | 5d4a78c93383 |
comparison
equal
deleted
inserted
replaced
| 445:cc7d246bda2a | 446:bbad2d06f728 |
|---|---|
| 45 if( obj instanceof byte[] ) | 45 if( obj instanceof byte[] ) |
| 46 return "binary"; | 46 return "binary"; |
| 47 return "userdata"; | 47 return "userdata"; |
| 48 } | 48 } |
| 49 | 49 |
| 50 public static Number toNumber(Object obj) { | |
| 51 return toNumber(obj,null); | |
| 52 } | |
| 53 | |
| 54 public static Number toNumber(Object obj,Integer base) { | |
| 55 if( obj instanceof Number ) | |
| 56 return (Number)obj; | |
| 57 if( obj instanceof String ) { | |
| 58 String s = (String)obj; | |
| 59 try { | |
| 60 if( base==null ) | |
| 61 return Double.valueOf(s); | |
| 62 else | |
| 63 return Long.valueOf(s,base); | |
| 64 } catch(NumberFormatException e) {} | |
| 65 } | |
| 66 return null; | |
| 67 } | |
| 68 | |
| 69 public static String toString(Number n) { | 50 public static String toString(Number n) { |
| 70 if( n instanceof Integer ) | 51 if( n instanceof Integer ) |
| 71 return n.toString(); | 52 return n.toString(); |
| 72 int i = n.intValue(); | 53 int i = n.intValue(); |
| 73 if( i == n.doubleValue() ) | 54 if( i == n.doubleValue() ) |
