diff src/luan/Luan.java @ 1805:7793bcb5f34a default tip

minor
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 08 May 2024 11:13:16 -0600
parents b4328322d2be
children
line wrap: on
line diff
--- a/src/luan/Luan.java	Tue May 07 22:08:37 2024 -0600
+++ b/src/luan/Luan.java	Wed May 08 11:13:16 2024 -0600
@@ -423,11 +423,9 @@
 		return load(text,sourceName,persist,null);
 	}
 
+	public static final Object nullValue = new Object();
+
 	public static Object toJava(Object obj) throws LuanException {
-		return toJava(obj,null);
-	}
-
-	public static Object toJava(Object obj,Object nullValue) throws LuanException {
 		if( obj == nullValue )
 			return null;
 		if( !(obj instanceof LuanTable) )
@@ -436,7 +434,7 @@
 		if( !tbl.isMap() ) {
 			List list = new ArrayList();
 			for( Object el : tbl.asList() ) {
-				list.add( toJava(el,nullValue) );
+				list.add( toJava(el) );
 			}
 			return list;
 		} else {
@@ -444,7 +442,7 @@
 			Iterator<Map.Entry> iter = tbl.rawIterator();
 			while( iter.hasNext() ) {
 				Map.Entry entry = iter.next();
-				map.put( toJava(entry.getKey(),nullValue), toJava(entry.getValue(),nullValue) );
+				map.put( toJava(entry.getKey()), toJava(entry.getValue()) );
 			}
 			return map;
 		}