repo/luan: src/luan/LuanTable.java comparison

disallow duplicates in table constructor

author	Franklin Schmidt <fschmidt@gmail.com>
date	Sun, 20 Sep 2020 15:53:58 -0600
parents	2e8a5df45d56
children	e1a13e707bf3

comparison

equal deleted inserted replaced

-:dc23c96f5021
+:d4407e8de707
 			return;
 		}
 		throw new LuanException("invalid type "+Luan.type(h)+" for metamethod __new_index");
 	}
-	public void rawPut(Object key,Object val) throws LuanException {
+	public Object rawPut(Object key,Object val) throws LuanException {
 		if( security != null )
 			Luan.checkSecurity(luan,"table",security,"put",key,val);
-		rawPut2(key,val);
+		return rawPut2(key,val);
 	}
-	private void rawPut2(Object key,Object val) {
+	private Object rawPut2(Object key,Object val) {
 		check();
 		Integer iT = Luan.asInteger(key);
 		if( iT != null ) {
 			int i = iT - 1;
 			if( list != null || i == 0 ) {
 				if( i == list().size() ) {
 					if( val != null ) {
 						list.add(val);
 						mapToList();
 					}
-					return;
+					return null;
 				} else if( i>=0 && i<list.size() ) {
-					list.set(i,val);
+					Object rtn = list.set(i,val);
 					if( val == null ) {
 						listToMap(i);
 					}
-					return;
+					return rtn;
 				}
 			}
 		}
 		if( key instanceof Number && !(key instanceof Double) ) {
 			Number n = (Number)key;
 			key = Double.valueOf(n.doubleValue());
 		}
 		if( val == null ) {
 			if( map!=null )
-				map.remove(key);
+				return map.remove(key);
+			else
+				return null;
 		} else {
 			if( map==null )
 				map = newMap();
-			map.put(key,val);
+			return map.put(key,val);
 		}
 	}
 	private void mapToList() {
 		if( map != null ) {

Mercurial Hosting > luan