diff src/luan/LuanTable.java @ 1333:25746915a241

merge Luan and LuanState
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 12 Feb 2019 22:33:40 -0700
parents f41919741100
children e0cf0d108a77
line wrap: on
line diff
--- a/src/luan/LuanTable.java	Tue Feb 12 21:50:26 2019 -0700
+++ b/src/luan/LuanTable.java	Tue Feb 12 22:33:40 2019 -0700
@@ -14,7 +14,7 @@
 
 
 public final class LuanTable implements LuanCloneable {
-	private LuanState luan;
+	private Luan luan;
 	private Map map = null;
 	private List list = null;
 	private LuanTable metatable = null;
@@ -22,11 +22,11 @@
 	private LuanCloner cloner;
 	private String security = null;
 
-	public LuanTable(LuanState luan) {
+	public LuanTable(Luan luan) {
 		this.luan = luan;
 	}
 
-	public LuanTable(LuanState luan,List list){
+	public LuanTable(Luan luan,List list){
 		int n = list.size();
 		for( int i=0; i<n; i++ ) {
 			Object val = list.get(i);
@@ -35,7 +35,7 @@
 		}
 	}
 
-	public LuanTable(LuanState luan,Map map) {
+	public LuanTable(Luan luan,Map map) {
 		this.luan = luan;
 		for( Object stupid : map.entrySet() ) {
 			Map.Entry entry = (Map.Entry)stupid;
@@ -46,7 +46,7 @@
 		}
 	}
 
-	public LuanTable(LuanState luan,Set set){
+	public LuanTable(Luan luan,Set set){
 		this.luan = luan;
 		for( Object el : set ) {
 			if( el != null )
@@ -93,7 +93,7 @@
 	}
 
 	private void deepenClone(LuanTable clone,LuanCloner cloner) {
-		clone.luan = (LuanState)cloner.clone(luan);
+		clone.luan = (Luan)cloner.clone(luan);
 		if( map != null ) {
 			Map newMap = newMap();
 			for( Object stupid : map.entrySet() ) {
@@ -370,7 +370,7 @@
 		return new LuanFunction() {
 			final Iterator<Map.Entry> iter = rawIterator();
 
-			@Override public Object[] call(LuanState luan,Object[] args) {
+			@Override public Object[] call(Luan luan,Object[] args) {
 				if( !iter.hasNext() )
 					return LuanFunction.NOTHING;
 				Map.Entry<Object,Object> entry = iter.next();