Mercurial Hosting > luan

annotate src/luan/LuanTable.java @ 1330:f41919741100

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix security
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 11 Feb 2019 01:38:55 -0700
parents 1b46c8e6c647
children 25746915a241
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1 package luan;
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
2
27
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
3 import java.util.Iterator;
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
4 import java.util.ListIterator;
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
5 import java.util.Map;
222
b76fcb72d97d add AbstractLuanTable and improve HttpLuan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 221
diff changeset
6 import java.util.AbstractMap;
406
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
7 import java.util.LinkedHashMap;
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
8 import java.util.List;
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
9 import java.util.ArrayList;
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
10 import java.util.Collections;
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
11 import java.util.Comparator;
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
12 import java.util.Set;
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
13 import java.util.HashSet;
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
14
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
15
781
fbbdd369a13a rename DeepCloner to LuanCloner
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
16 public final class LuanTable implements LuanCloneable {
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
17 private LuanState luan;
434
472fc70853cd remove more generics
Franklin Schmidt <fschmidt@gmail.com>
parents: 433
diff changeset
18 private Map map = null;
472fc70853cd remove more generics
Franklin Schmidt <fschmidt@gmail.com>
parents: 433
diff changeset
19 private List list = null;
48
64ecb7a3aad7 rename Lua to Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 47
diff changeset
20 private LuanTable metatable = null;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
21 public LuanClosure closure;
782
655280eab1e2 start limited cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 781
diff changeset
22 private LuanCloner cloner;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
23 private String security = null;
782
655280eab1e2 start limited cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 781
diff changeset
24
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
25 public LuanTable(LuanState luan) {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
26 this.luan = luan;
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
27 }
364
1a464e090538 simplify table code
Franklin Schmidt <fschmidt@gmail.com>
parents: 355
diff changeset
28
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
29 public LuanTable(LuanState luan,List list){
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
30 int n = list.size();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
31 for( int i=0; i<n; i++ ) {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
32 Object val = list.get(i);
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
33 if( val != null )
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
34 rawPut2(i+1,val);
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
35 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
36 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
37
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
38 public LuanTable(LuanState luan,Map map) {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
39 this.luan = luan;
434
472fc70853cd remove more generics
Franklin Schmidt <fschmidt@gmail.com>
parents: 433
diff changeset
40 for( Object stupid : map.entrySet() ) {
472fc70853cd remove more generics
Franklin Schmidt <fschmidt@gmail.com>
parents: 433
diff changeset
41 Map.Entry entry = (Map.Entry)stupid;
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
42 Object key = entry.getKey();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
43 Object value = entry.getValue();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
44 if( key != null && value != null )
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
45 rawPut2(key,value);
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
46 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
47 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
48
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
49 public LuanTable(LuanState luan,Set set){
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
50 this.luan = luan;
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
51 for( Object el : set ) {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
52 if( el != null )
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
53 rawPut2(el,Boolean.TRUE);
118
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
54 }
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
55 }
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
56
425
0a2fb80907f9 minor LuanTable cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 423
diff changeset
57 public LuanTable(LuanTable tbl) {
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
58 this.luan = tbl.luan;
425
0a2fb80907f9 minor LuanTable cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 423
diff changeset
59 if( tbl.map != null && !tbl.map.isEmpty() )
0a2fb80907f9 minor LuanTable cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 423
diff changeset
60 this.map = new LinkedHashMap<Object,Object>(tbl.map);
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
61 if( tbl.rawLength() > 0 )
425
0a2fb80907f9 minor LuanTable cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 423
diff changeset
62 this.list = new ArrayList<Object>(tbl.list);
0a2fb80907f9 minor LuanTable cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 423
diff changeset
63 this.metatable = tbl.metatable;
0a2fb80907f9 minor LuanTable cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 423
diff changeset
64 }
0a2fb80907f9 minor LuanTable cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 423
diff changeset
65
784
6a7c6879158d revert shallowClone()
Franklin Schmidt <fschmidt@gmail.com>
parents: 782
diff changeset
66 @Override public LuanTable shallowClone() {
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
67 return new LuanTable(luan);
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
68 }
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
69
781
fbbdd369a13a rename DeepCloner to LuanCloner
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
70 @Override public void deepenClone(LuanCloneable dc,LuanCloner cloner) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
71 check();
433
c6bcb8859b93 make LuanState.registry a Map;
Franklin Schmidt <fschmidt@gmail.com>
parents: 432
diff changeset
72 LuanTable clone = (LuanTable)dc;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
73 clone.security = security;
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
74 switch( cloner.type ) {
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
75 case COMPLETE:
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
76 deepenClone(clone,cloner);
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
77 return;
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
78 case INCREMENTAL:
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
79 clone.cloner = cloner;
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
80 clone.map = map;
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
81 clone.list = list;
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
82 clone.metatable = metatable;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
83 clone.closure = closure;
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
84 return;
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
85 }
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
86 }
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
87
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
88 private void check() {
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
89 if( cloner != null ) {
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
90 deepenClone(this,cloner);
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
91 cloner = null;
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
92 }
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
93 }
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
94
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
95 private void deepenClone(LuanTable clone,LuanCloner cloner) {
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
96 clone.luan = (LuanState)cloner.clone(luan);
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
97 if( map != null ) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
98 Map newMap = newMap();
434
472fc70853cd remove more generics
Franklin Schmidt <fschmidt@gmail.com>
parents: 433
diff changeset
99 for( Object stupid : map.entrySet() ) {
472fc70853cd remove more generics
Franklin Schmidt <fschmidt@gmail.com>
parents: 433
diff changeset
100 Map.Entry entry = (Map.Entry)stupid;
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
101 newMap.put( cloner.get(entry.getKey()), cloner.get(entry.getValue()) );
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
102 }
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
103 clone.map = newMap;
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
104 }
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
105 if( list != null ) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
106 List newList = new ArrayList<Object>();
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
107 for( Object obj : list ) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
108 newList.add(cloner.get(obj));
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
109 }
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
110 clone.list = newList;
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
111 }
782
655280eab1e2 start limited cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 781
diff changeset
112 clone.metatable = (LuanTable)cloner.clone(metatable);
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
113 clone.closure = (LuanClosure)cloner.clone(closure);
77
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
114 }
4bf3d0c0b6b9 make LuanState cloneable
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 72
diff changeset
115
408
1b38de2b1845 merge LuanTableImpl into LuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 406
diff changeset
116 public boolean isList() {
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
117 return map==null || map.isEmpty();
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
118 }
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
119
408
1b38de2b1845 merge LuanTableImpl into LuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 406
diff changeset
120 public List<Object> asList() {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
121 check();
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
122 return list!=null ? list : Collections.emptyList();
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
123 }
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
124
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
125 public Map rawMap() {
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
126 check();
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
127 return map!=null ? map : Collections.emptyMap();
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
128 }
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
129
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
130 public String toStringLuan() throws LuanException {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
131 Object h = getHandler("__to_string");
430
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
132 if( h == null )
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
133 return rawToString();
647
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 646
diff changeset
134 LuanFunction fn = Luan.checkFunction(h);
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 646
diff changeset
135 return Luan.checkString( Luan.first( fn.call(luan,new Object[]{this}) ) );
430
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
136 }
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
137
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
138 public String rawToString() {
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
139 return "table: " + Integer.toHexString(hashCode());
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
140 }
f28320fd671d fix LuanTable.toString() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 428
diff changeset
141
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
142 public Object get(Object key) throws LuanException {
426
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
143 Object value = rawGet(key);
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
144 if( value != null )
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
145 return value;
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
146 Object h = getHandler("__index");
426
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
147 if( h==null )
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
148 return null;
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
149 if( h instanceof LuanFunction ) {
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
150 LuanFunction fn = (LuanFunction)h;
575
7c3ad6db8ac3 make LuanState.JAVA private
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
151 return Luan.first(fn.call(luan,new Object[]{this,key}));
426
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
152 }
575
7c3ad6db8ac3 make LuanState.JAVA private
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
153 return luan.index(h,key);
426
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
154 }
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
155
23a93c118042 fix LuanTable.get() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 425
diff changeset
156 public Object rawGet(Object key) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
157 check();
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
158 if( list != null ) {
48
64ecb7a3aad7 rename Lua to Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 47
diff changeset
159 Integer iT = Luan.asInteger(key);
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
160 if( iT != null ) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
161 int i = iT - 1;
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
162 if( i>=0 && i<list.size() )
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
163 return list.get(i);
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
164 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
165 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
166 if( map==null )
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
167 return null;
539
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 533
diff changeset
168 if( key instanceof Number && !(key instanceof Double) ) {
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 533
diff changeset
169 Number n = (Number)key;
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 533
diff changeset
170 key = Double.valueOf(n.doubleValue());
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 533
diff changeset
171 }
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
172 return map.get(key);
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
173 }
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
174
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
175 public void put(Object key,Object value) throws LuanException {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
176 Object h = getHandler("__new_index");
427
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
177 if( h==null || rawGet(key)!=null ) {
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
178 rawPut(key,value);
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
179 return;
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
180 }
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
181 if( h instanceof LuanFunction ) {
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
182 LuanFunction fn = (LuanFunction)h;
575
7c3ad6db8ac3 make LuanState.JAVA private
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
183 fn.call(luan,new Object[]{this,key,value});
427
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
184 return;
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
185 }
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
186 if( h instanceof LuanTable ) {
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
187 LuanTable tbl = (LuanTable)h;
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
188 tbl.put(key,value);
427
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
189 return;
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
190 }
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
191 throw new LuanException("invalid type "+Luan.type(h)+" for metamethod __new_index");
427
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
192 }
dae264ad6a7b fix LuanTable.put() to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 426
diff changeset
193
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
194 public void rawPut(Object key,Object val) throws LuanException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
195 if( security != null )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
196 Luan.checkSecurity(luan,"table",security,"put",key,val);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
197 rawPut2(key,val);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
198 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
199
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
200 private void rawPut2(Object key,Object val) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
201 check();
48
64ecb7a3aad7 rename Lua to Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 47
diff changeset
202 Integer iT = Luan.asInteger(key);
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
203 if( iT != null ) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
204 int i = iT - 1;
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
205 if( list != null || i == 0 ) {
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
206 if( i == list().size() ) {
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
207 if( val != null ) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
208 list.add(val);
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
209 mapToList();
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
210 }
224
05eb2837ddbf change LuanTable.put() to not return old value
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 222
diff changeset
211 return;
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
212 } else if( i>=0 && i<list.size() ) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
213 list.set(i,val);
118
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
214 if( val == null ) {
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
215 listToMap(i);
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
216 }
224
05eb2837ddbf change LuanTable.put() to not return old value
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 222
diff changeset
217 return;
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
218 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
219 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
220 }
539
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 533
diff changeset
221 if( map==null )
284
8870840251ea use LinkedHashMap in LuanTable to preserve order
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
222 map = newMap();
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
223 if( key instanceof Number && !(key instanceof Double) ) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
224 Number n = (Number)key;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
225 key = Double.valueOf(n.doubleValue());
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
226 }
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
227 if( val == null ) {
224
05eb2837ddbf change LuanTable.put() to not return old value
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 222
diff changeset
228 map.remove(key);
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
229 } else {
224
05eb2837ddbf change LuanTable.put() to not return old value
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 222
diff changeset
230 map.put(key,val);
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
231 }
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
232 }
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
233
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
234 private void mapToList() {
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
235 if( map != null ) {
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
236 while(true) {
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
237 Object v = map.remove(Double.valueOf(list.size()+1));
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
238 if( v == null )
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
239 break;
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
240 list.add(v);
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
241 }
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
242 }
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
243 }
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
244
118
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
245 private void listToMap(int from) {
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
246 if( list != null ) {
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
247 while( list.size() > from ) {
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
248 int i = list.size() - 1;
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
249 Object v = list.remove(i);
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
250 if( v != null ) {
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
251 if( map==null )
284
8870840251ea use LinkedHashMap in LuanTable to preserve order
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 233
diff changeset
252 map = newMap();
118
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
253 map.put(i+1,v);
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
254 }
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
255 }
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
256 }
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
257 }
735708619119 add Debug.debug()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 108
diff changeset
258
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
259 private List<Object> list() {
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
260 if( list == null ) {
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
261 list = new ArrayList<Object>();
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
262 mapToList();
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
263 }
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
264 return list;
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
265 }
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
266
431
3ffe8ba5b297 TableLuan cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 430
diff changeset
267 public void rawInsert(int pos,Object value) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
268 check();
108
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 88
diff changeset
269 if( value==null )
222
b76fcb72d97d add AbstractLuanTable and improve HttpLuan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 221
diff changeset
270 throw new IllegalArgumentException("can't insert a nil value");
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
271 list().add(pos-1,value);
108
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 88
diff changeset
272 mapToList();
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 88
diff changeset
273 }
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 88
diff changeset
274
431
3ffe8ba5b297 TableLuan cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 430
diff changeset
275 public Object rawRemove(int pos) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
276 check();
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
277 return list().remove(pos-1);
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
278 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
279
431
3ffe8ba5b297 TableLuan cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 430
diff changeset
280 public void rawSort(Comparator<Object> cmp) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
281 check();
47
659c7139e903 better conversion
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
282 Collections.sort(list(),cmp);
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
283 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
284
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
285 public int length() throws LuanException {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
286 Object h = getHandler("__len");
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
287 if( h != null ) {
647
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 646
diff changeset
288 LuanFunction fn = Luan.checkFunction(h);
575
7c3ad6db8ac3 make LuanState.JAVA private
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
289 return (Integer)Luan.first(fn.call(luan,new Object[]{this}));
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
290 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
291 return rawLength();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
292 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
293
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
294 public int rawLength() {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
295 check();
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
296 return list==null ? 0 : list.size();
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
297 }
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
298
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
299 public Iterable<Map.Entry> iterable() throws LuanException {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
300 final Iterator<Map.Entry> iter = iterator();
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
301 return new Iterable<Map.Entry>() {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
302 public Iterator<Map.Entry> iterator() {
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
303 return iter;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
304 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
305 };
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
306 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
307
1129
3234a14bb1f8 minor lucene changes
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
308 public Iterable<Map.Entry> rawIterable() {
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
309 final Iterator<Map.Entry> iter = rawIterator();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
310 return new Iterable<Map.Entry>() {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
311 public Iterator<Map.Entry> iterator() {
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
312 return iter;
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
313 }
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
314 };
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
315 }
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
316
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
317 public Iterator<Map.Entry> iterator() throws LuanException {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
318 if( getHandler("__pairs") == null )
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
319 return rawIterator();
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
320 final LuanFunction fn = pairs();
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
321 return new Iterator<Map.Entry>() {
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
322 private Map.Entry<Object,Object> next = getNext();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
323
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
324 private Map.Entry<Object,Object> getNext() {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
325 try {
575
7c3ad6db8ac3 make LuanState.JAVA private
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
326 Object obj = fn.call(luan);
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
327 if( obj==null )
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
328 return null;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
329 Object[] a = (Object[])obj;
497
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 434
diff changeset
330 if( a.length == 0 || a[0]==null )
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
331 return null;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
332 return new AbstractMap.SimpleEntry<Object,Object>(a[0],a[1]);
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
333 } catch(LuanException e) {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
334 throw new LuanRuntimeException(e);
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
335 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
336 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
337
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
338 public boolean hasNext() {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
339 return next != null;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
340 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
341
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
342 public Map.Entry<Object,Object> next() {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
343 Map.Entry<Object,Object> rtn = next;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
344 next = getNext();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
345 return rtn;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
346 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
347
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
348 public void remove() {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
349 throw new UnsupportedOperationException();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
350 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
351 };
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
352 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
353
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
354 public LuanFunction pairs() throws LuanException {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
355 Object h = getHandler("__pairs");
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
356 if( h != null ) {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
357 if( h instanceof LuanFunction ) {
575
7c3ad6db8ac3 make LuanState.JAVA private
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
358 LuanFunction fn = (LuanFunction)h;
7c3ad6db8ac3 make LuanState.JAVA private
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
359 Object obj = Luan.first(fn.call(luan,new Object[]{this}));
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
360 if( !(obj instanceof LuanFunction) )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
361 throw new LuanException( "metamethod __pairs should return function but returned " + Luan.type(obj) );
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
362 return (LuanFunction)obj;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
363 }
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
364 throw new LuanException( "invalid type of metamethod __pairs: " + Luan.type(h) );
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
365 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
366 return rawPairs();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
367 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
368
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
369 private LuanFunction rawPairs() {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
370 return new LuanFunction() {
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
371 final Iterator<Map.Entry> iter = rawIterator();
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
372
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
373 @Override public Object[] call(LuanState luan,Object[] args) {
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
374 if( !iter.hasNext() )
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
375 return LuanFunction.NOTHING;
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
376 Map.Entry<Object,Object> entry = iter.next();
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
377 return new Object[]{entry.getKey(),entry.getValue()};
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
378 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
379 };
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
380 }
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
381
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
382 public Iterator<Map.Entry> rawIterator() {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
383 check();
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
384 if( list == null ) {
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
385 if( map == null )
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
386 return Collections.<Map.Entry>emptyList().iterator();
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
387 return map.entrySet().iterator();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
388 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
389 if( map == null )
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
390 return listIterator();
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
391 return new Iterator<Map.Entry>() {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
392 Iterator<Map.Entry> iter = listIterator();
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
393 boolean isList = true;
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
394
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
395 public boolean hasNext() {
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
396 boolean b = iter.hasNext();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
397 if( !b && isList ) {
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
398 iter = map.entrySet().iterator();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
399 isList = false;
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
400 b = iter.hasNext();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
401 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
402 return b;
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
403 }
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
404
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
405 public Map.Entry<Object,Object> next() {
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
406 return iter.next();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
407 }
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
408
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
409 public void remove() {
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
410 throw new UnsupportedOperationException();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
411 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
412 };
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
413 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
414
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
415 private Iterator<Map.Entry> listIterator() {
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
416 if( list == null )
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
417 return Collections.<Map.Entry>emptyList().iterator();
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
418 final ListIterator iter = list.listIterator();
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 1100
diff changeset
419 return new Iterator<Map.Entry>() {
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
420
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
421 public boolean hasNext() {
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
422 return iter.hasNext();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
423 }
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
424
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
425 public Map.Entry<Object,Object> next() {
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
426 Integer key = iter.nextIndex()+1;
222
b76fcb72d97d add AbstractLuanTable and improve HttpLuan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 221
diff changeset
427 return new AbstractMap.SimpleEntry<Object,Object>(key,iter.next());
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
428 }
432
d9df6d6cb927 finish fixing LuanTable to use metatables
Franklin Schmidt <fschmidt@gmail.com>
parents: 431
diff changeset
429
44
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
430 public void remove() {
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
431 throw new UnsupportedOperationException();
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
432 }
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
433 };
57054fa43189 implement table lib
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 35
diff changeset
434 }
221
ec016471c6eb make LuanTable an interface
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 202
diff changeset
435
431
3ffe8ba5b297 TableLuan cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 430
diff changeset
436 public LuanTable rawSubList(int from,int to) {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
437 check();
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
438 LuanTable tbl = new LuanTable(luan);
221
ec016471c6eb make LuanTable an interface
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 202
diff changeset
439 tbl.list = new ArrayList<Object>(list().subList(from-1,to-1));
ec016471c6eb make LuanTable an interface
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 202
diff changeset
440 return tbl;
27
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
441 }
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
442
408
1b38de2b1845 merge LuanTableImpl into LuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 406
diff changeset
443 public LuanTable getMetatable() {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
444 check();
35
e51906de0f11 implement metatables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 27
diff changeset
445 return metatable;
e51906de0f11 implement metatables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 27
diff changeset
446 }
e51906de0f11 implement metatables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 27
diff changeset
447
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
448 public void setMetatable(LuanTable metatable) throws LuanException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
449 if( security != null )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
450 Luan.checkSecurity(luan,"table",security,"set_metatable",metatable);
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
451 check();
35
e51906de0f11 implement metatables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 27
diff changeset
452 this.metatable = metatable;
e51906de0f11 implement metatables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 27
diff changeset
453 }
300
9fb523472035 add java() to control java access
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 284
diff changeset
454
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
455 public Object getHandler(String op) throws LuanException {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
456 check();
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
457 return metatable==null ? null : metatable.get(op);
419
8fbb961aabd5 improve repr() to check metamethod recursively
Franklin Schmidt <fschmidt@gmail.com>
parents: 414
diff changeset
458 }
8fbb961aabd5 improve repr() to check metamethod recursively
Franklin Schmidt <fschmidt@gmail.com>
parents: 414
diff changeset
459
431
3ffe8ba5b297 TableLuan cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 430
diff changeset
460 private Map<Object,Object> newMap() {
406
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
461 return new LinkedHashMap<Object,Object>();
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
462 }
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
463
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
464 public boolean isSet() throws LuanException {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
465 for( Map.Entry<Object,Object> entry : iterable() ) {
406
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
466 if( !entry.getValue().equals(Boolean.TRUE) )
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
467 return false;
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
468 }
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
469 return true;
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
470 }
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
471
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
472 public Set<Object> asSet() throws LuanException {
406
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
473 Set<Object> set = new HashSet<Object>();
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
474 for( Map.Entry<Object,Object> entry : iterable() ) {
406
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
475 set.add(entry.getKey());
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
476 }
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
477 return set;
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
478 }
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
479
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
480 public Map<Object,Object> asMap() throws LuanException {
406
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
481 Map<Object,Object> map = newMap();
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
482 for( Map.Entry<Object,Object> entry : iterable() ) {
406
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
483 map.put(entry.getKey(),entry.getValue());
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
484 }
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
485 return map;
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
486 }
9321a33b9b1c remove AbstractLuanTable
Franklin Schmidt <fschmidt@gmail.com>
parents: 397
diff changeset
487
497
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 434
diff changeset
488 public void rawClear() {
785
d69d3c51c44e more work on incremental cloning
Franklin Schmidt <fschmidt@gmail.com>
parents: 784
diff changeset
489 check();
497
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 434
diff changeset
490 map = null;
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 434
diff changeset
491 list = null;
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 434
diff changeset
492 }
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 434
diff changeset
493
1095
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
494 public int hashValue() {
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
495 int n = 99;
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
496 if( map != null )
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
497 n ^= map.hashCode();
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
498 if( list != null )
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
499 n ^= list.hashCode();
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
500 return n;
2443152dc2f1 add Luan.hash_code() and Table.hash_value()
Franklin Schmidt <fschmidt@gmail.com>
parents: 796
diff changeset
501 }
1100
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
502
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
503 public boolean rawIsEmpty() {
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
504 return (map==null || map.isEmpty()) && (list==null || list.isEmpty());
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
505 }
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
506
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
507 public int rawSize() {
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
508 int n = 0;
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
509 if( map != null )
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
510 n += map.size();
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
511 if( list != null )
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
512 n += list.size();
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
513 return n;
ad6b3b9fef40 add Table.is_empty() and Table.size()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1095
diff changeset
514 }
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
515
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
516 protected void finalize() throws Throwable {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
517 Object h = getHandler("__gc");
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
518 if( h != null ) {
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
519 LuanFunction fn = Luan.checkFunction(h);
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
520 fn.call(luan,new Object[]{this});
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
521 }
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
522 super.finalize();
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
523 }
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1189
diff changeset
524
1283
503bde9a7c80 add luan.require() and table.call()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
525 public Object call(String fnName,Object... args) throws LuanException {
1284
Franklin Schmidt <fschmidt@gmail.com>
parents: 1283
diff changeset
526 LuanFunction fn = (LuanFunction)get(fnName);
1283
503bde9a7c80 add luan.require() and table.call()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
527 return fn.call(luan,args);
503bde9a7c80 add luan.require() and table.call()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
528 }
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
529
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
530 public static void setSecurity(LuanTable tbl,String security) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
531 tbl.security = security;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1284
diff changeset
532 }
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
533 }