diff core/src/luan/LuanTable.java @ 539:473e456444ff

Remove object-oriented primitive methods for string and binary
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 01 Jun 2015 17:53:55 -0600
parents 8e51d6071b67
children f1601a4ce1aa
line wrap: on
line diff
--- a/core/src/luan/LuanTable.java	Mon Jun 01 00:51:44 2015 -0600
+++ b/core/src/luan/LuanTable.java	Mon Jun 01 17:53:55 2015 -0600
@@ -132,10 +132,6 @@
 			LuanTable tbl = (LuanTable)obj;
 			return tbl.get(luan,key);
 		}
-		if( obj instanceof String )
-			return StringLuan.__index(bit,(String)obj,key);
-		if( obj instanceof byte[] )
-			return BinaryLuan.__index(bit,(byte[])obj,key);
 		if( obj != null && luan.hasJava() )
 			return JavaLuan.__index(bit,obj,key,false);
 		else if( bit.el==null )
@@ -155,6 +151,10 @@
 		}
 		if( map==null )
 			return null;
+		if( key instanceof Number && !(key instanceof Double) ) {
+			Number n = (Number)key;
+			key = Double.valueOf(n.doubleValue());
+		}
 		return map.get(key);
 	}
 
@@ -202,9 +202,8 @@
 				}
 			}
 		}
-		if( map==null ) {
+		if( map==null )
 			map = newMap();
-		}
 		if( key instanceof Number && !(key instanceof Double) ) {
 			Number n = (Number)key;
 			key = Double.valueOf(n.doubleValue());