Mercurial Hosting > luan

annotate src/luan/LuanTable.java @ 1388:2024d23ddd64

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