Mercurial Hosting > luan

annotate src/luan/modules/parsers/LuanToString.java @ 1623:582384548a69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
LuanToString takes function
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 01 Aug 2021 18:59:01 -0600
parents a37ffe2d1b14
children f8f5c51f5b36
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
1 package luan.modules.parsers;
720
bdd766df1c17 add json parser
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
2
bdd766df1c17 add json parser
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
3 import java.util.List;
bdd766df1c17 add json parser
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
4 import java.util.Map;
1552
46d4baaad64d add long_string_keys
Franklin Schmidt <fschmidt@gmail.com>
parents: 1550
diff changeset
5 import java.util.Set;
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
6 import java.util.HashSet;
1552
46d4baaad64d add long_string_keys
Franklin Schmidt <fschmidt@gmail.com>
parents: 1550
diff changeset
7 import java.util.Collections;
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
8 import luan.Luan;
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
9 import luan.LuanTable;
1607
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
10 import luan.LuanFunction;
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
11 import luan.LuanException;
1388
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
12 import luan.LuanRuntimeException;
720
bdd766df1c17 add json parser
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
13
bdd766df1c17 add json parser
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
14
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
15 public final class LuanToString {
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
16 private static final Set<String> settingsKeys = new HashSet<String>();
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
17 static {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
18 Collections.addAll(settingsKeys
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
19 ,"strict"
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
20 ,"number_types"
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
21 ,"compressed"
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
22 ,"long_strings"
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
23 ,"inline"
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
24 ,"no_name_keys"
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
25 );
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
26 }
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
27
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
28 private static void checkOptions(LuanTable options) throws LuanException {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
29 for( Map.Entry entry : options.rawIterable() ) {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
30 if( !settingsKeys.contains(entry.getKey()) )
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
31 throw new LuanException("invalid option: "+entry.getKey());
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
32 if( !(entry.getValue() instanceof Boolean) )
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
33 throw new LuanException("options values must be boolean");
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
34 }
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
35 }
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
36
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
37 public static class Settings implements Cloneable {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
38 public boolean strict = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
39 public boolean numberTypes = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
40 public boolean compressed = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
41 public boolean longStrings = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
42 public boolean inline = false;
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
43 public boolean noNameKeys = false;
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
44
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
45 void applyOptions(LuanTable options) throws LuanException {
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
46 checkOptions(options);
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
47 Boolean b;
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
48 b = (Boolean)options.rawGet("strict");
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
49 if( b != null )
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
50 strict = b;
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
51 b = (Boolean)options.rawGet("number_types");
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
52 if( b != null )
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
53 numberTypes = b;
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
54 b = (Boolean)options.rawGet("compressed");
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
55 if( b != null )
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
56 compressed = b;
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
57 b = (Boolean)options.rawGet("long_strings");
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
58 if( b != null )
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
59 longStrings = b;
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
60 b = (Boolean)options.rawGet("inline");
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
61 if( b != null )
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
62 inline = b;
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
63 b = (Boolean)options.rawGet("no_name_keys");
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
64 if( b != null )
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
65 noNameKeys = b;
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
66 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
67
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
68 public Settings cloneSettings() {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
69 try {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
70 return (Settings)clone();
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
71 } catch(CloneNotSupportedException e) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
72 throw new RuntimeException(e);
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
73 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
74 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
75 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
76 private static final Settings keySettings = new Settings();
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
77
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
78 public final Settings settingsInit = new Settings();
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
79 private final Luan luan;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
80 private final LuanFunction fnOptions;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
81 private final LuanTable stack = new LuanTable();
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
82
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
83 public LuanToString() {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
84 this.luan = null;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
85 this.fnOptions = null;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
86 }
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
87
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
88 public LuanToString(Luan luan) throws LuanException {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
89 this.luan = luan;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
90 this.fnOptions = null;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
91 }
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
92
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
93 public LuanToString(Luan luan,LuanTable options) throws LuanException {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
94 this.luan = luan;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
95 this.fnOptions = null;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
96 settingsInit.applyOptions(options);
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
97 }
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
98
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
99 public LuanToString(Luan luan,LuanFunction fnOptions) throws LuanException {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
100 this.luan = luan;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
101 this.fnOptions = fnOptions;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
102 LuanTable options = getOptions();
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
103 if( options != null )
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
104 settingsInit.applyOptions(options);
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
105 }
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
106
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
107 private LuanTable getOptions() throws LuanException {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
108 if( fnOptions == null )
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
109 return null;
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
110 Object rtn = fnOptions.call(luan,stack);
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
111 if( !(rtn==null || rtn instanceof LuanTable) )
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
112 throw new LuanException("options-function must return table or nil");
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
113 return (LuanTable)rtn;
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
114 }
1419
59fd2e8b1b9d stringify and json_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1409
diff changeset
115
1388
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
116 public String toString(Object obj) throws LuanException {
758
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
117 StringBuilder sb = new StringBuilder();
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
118 toString(obj,sb,0,settingsInit);
758
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
119 return sb.toString();
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
120 }
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
121
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
122 private void toString(Object obj,StringBuilder sb,int indented,Settings settings) throws LuanException {
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
123 if( obj == null ) {
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
124 sb.append( "nil" );
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
125 return;
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
126 }
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
127 if( obj instanceof Boolean ) {
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
128 sb.append( obj );
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
129 return;
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
130 }
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
131 if( obj instanceof Number ) {
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
132 toString((Number)obj,sb,settings);
758
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
133 return;
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
134 }
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
135 if( obj instanceof String ) {
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
136 toString((String)obj,sb,settings);
758
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
137 return;
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
138 }
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
139 if( obj instanceof LuanTable ) {
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
140 toString((LuanTable)obj,sb,indented,settings);
758
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
141 return;
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
142 }
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
143 if( settings.strict )
1409
Franklin Schmidt <fschmidt@gmail.com>
parents: 1388
diff changeset
144 throw new LuanException("can't handle type "+Luan.type(obj));
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
145 sb.append( '<' );
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
146 sb.append( obj );
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
147 sb.append( '>' );
758
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
148 }
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
149
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
150 private void toString(LuanTable tbl,StringBuilder sb,int indented,Settings settings) throws LuanException {
1607
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
151 if( tbl.getMetatable()!=null ) {
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
152 if( settings.strict )
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
153 throw new LuanException("can't handle metatables when strict");
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
154 if( luan==null )
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
155 throw new LuanException("can't handle metatables when luan isn't set");
1612
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
156 LuanFunction pairs = luan.getHandlerFunction("__pairs",tbl);
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
157 if( pairs != null ) {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
158 sb.append( '{' );
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
159 boolean first = true;
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
160 for( Object obj : tbl.iterable(luan) ) {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
161 Map.Entry entry = (Map.Entry)obj;
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
162 if( settings.compressed ) {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
163 if( first )
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
164 first = false;
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
165 else
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
166 sb.append( ',' );
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
167 } else if( settings.inline ) {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
168 if( first ) {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
169 first = false;
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
170 sb.append( ' ' );
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
171 } else
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
172 sb.append( ", " );
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
173 } else {
1607
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
174 first = false;
1612
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
175 indent(sb,indented+1);
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
176 }
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
177 toString(entry,sb,indented+1,settings);
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
178 }
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
179 if( !first ) {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
180 if( settings.compressed ) {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
181 } else if( settings.inline ) {
1607
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
182 sb.append( ' ' );
1612
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
183 } else {
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
184 indent(sb,indented);
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
185 }
1607
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
186 }
1612
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
187 sb.append( '}' );
8852f34a646a bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1607
diff changeset
188 return;
1607
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
189 }
fa066aaa068c nginx caching
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
190 }
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
191 List list = tbl.asList();
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
192 Map map = tbl.rawMap();
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
193 sb.append( '{' );
1518
f989778ca9e1 stringify, json_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1485
diff changeset
194 boolean first = true;
f989778ca9e1 stringify, json_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1485
diff changeset
195 for( Object obj : list ) {
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
196 if( settings.compressed ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
197 if( first )
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
198 first = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
199 else
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
200 sb.append( ',' );
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
201 } else if( settings.inline ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
202 if( first ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
203 first = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
204 sb.append( ' ' );
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
205 } else
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
206 sb.append( ", " );
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
207 } else {
1419
59fd2e8b1b9d stringify and json_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1409
diff changeset
208 indent(sb,indented+1);
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
209 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
210 toString(obj,sb,indented+1,settings);
758
c29d11d675fd added Json.toString() and rpc now sends tables as json
Franklin Schmidt <fschmidt@gmail.com>
parents: 720
diff changeset
211 }
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
212 for( Object obj : map.entrySet() ) {
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
213 Map.Entry entry = (Map.Entry)obj;
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
214 if( settings.compressed ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
215 if( first )
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
216 first = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
217 else
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
218 sb.append( ',' );
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
219 } else if( settings.inline ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
220 if( first ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
221 first = false;
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
222 sb.append( ' ' );
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
223 } else
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
224 sb.append( ", " );
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
225 } else {
1518
f989778ca9e1 stringify, json_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1485
diff changeset
226 indent(sb,indented+1);
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
227 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
228 toString(entry,sb,indented+1,settings);
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
229 }
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
230 if( !list.isEmpty() || !map.isEmpty() ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
231 if( settings.compressed ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
232 } else if( settings.inline ) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
233 sb.append( ' ' );
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
234 } else {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
235 indent(sb,indented);
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
236 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
237 }
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
238 sb.append( '}' );
1115
809d74db1415 add json_pretty_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
239 return;
809d74db1415 add json_pretty_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
240 }
809d74db1415 add json_pretty_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
241
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
242 private void toString(Map.Entry entry,StringBuilder sb,int indented,Settings settings)
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
243 throws LuanException
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
244 {
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
245 Object key = entry.getKey();
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
246 if( key instanceof String && !settings.noNameKeys && ((String)key).matches("[a-zA-Z_][a-zA-Z_0-9]*") ) {
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
247 sb.append( (String)key );
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
248 } else {
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
249 sb.append( '[' );
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
250 toString( key, sb, indented, keySettings );
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
251 sb.append( ']' );
1115
809d74db1415 add json_pretty_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
252 }
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
253 sb.append( settings.compressed ? "=" : " = " );
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
254 stack.rawAdd(key); // push
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
255 LuanTable options = getOptions();
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
256 if( options != null ) {
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
257 settings = settings.cloneSettings();
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
258 settings.applyOptions(options);
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
259 }
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
260 toString( entry.getValue(), sb, indented, settings );
1623
582384548a69 LuanToString takes function
Franklin Schmidt <fschmidt@gmail.com>
parents: 1618
diff changeset
261 stack.removeFromList(stack.rawLength()); // pop
1115
809d74db1415 add json_pretty_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
262 }
809d74db1415 add json_pretty_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
263
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
264 private void indent(StringBuilder sb,int indented) {
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
265 sb.append( '\n' );
1117
9a1aa6fc0b4e remove json_pretty_string and make json_string somewhat pretty
Franklin Schmidt <fschmidt@gmail.com>
parents: 1116
diff changeset
266 for( int i=0; i<indented; i++ ) {
1189
73d754b1889f add stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1132
diff changeset
267 sb.append( '\t' );
1117
9a1aa6fc0b4e remove json_pretty_string and make json_string somewhat pretty
Franklin Schmidt <fschmidt@gmail.com>
parents: 1116
diff changeset
268 }
9a1aa6fc0b4e remove json_pretty_string and make json_string somewhat pretty
Franklin Schmidt <fschmidt@gmail.com>
parents: 1116
diff changeset
269 }
1115
809d74db1415 add json_pretty_string
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
270
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
271 private void toString(Number n,StringBuilder sb,Settings settings) throws LuanException {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
272 if( settings.numberTypes ) {
1388
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
273 sb.append( n.getClass().getSimpleName().toLowerCase() );
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
274 sb.append( '(' );
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
275 }
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
276 sb.append( Luan.toString(n) );
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
277 if( settings.numberTypes )
1388
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
278 sb.append( ')' );
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
279 }
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
280
1562
b89212fd04b5 remove table.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1554
diff changeset
281 public static void addNumberTypes(Luan luan,LuanTable env) {
1388
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
282 try {
1562
b89212fd04b5 remove table.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1554
diff changeset
283 LuanTable module = (LuanTable)luan.require("luan:Number.luan");
1618
a37ffe2d1b14 fix not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1612
diff changeset
284 env.rawPut( "double", module.fn(luan,"double") );
a37ffe2d1b14 fix not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1612
diff changeset
285 env.rawPut( "float", module.fn(luan,"float") );
a37ffe2d1b14 fix not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1612
diff changeset
286 env.rawPut( "integer", module.fn(luan,"integer") );
a37ffe2d1b14 fix not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1612
diff changeset
287 env.rawPut( "long", module.fn(luan,"long") );
1388
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
288 } catch(LuanException e) {
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
289 throw new LuanRuntimeException(e);
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
290 }
2024d23ddd64 add restore_from_postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1190
diff changeset
291 }
1550
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
292
1553
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
293 private void toString(String s,StringBuilder sb,Settings settings) {
26c51acf00f3 improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1552
diff changeset
294 if( settings.longStrings ) {
1552
46d4baaad64d add long_string_keys
Franklin Schmidt <fschmidt@gmail.com>
parents: 1550
diff changeset
295 StringBuilder start = new StringBuilder("[[");
46d4baaad64d add long_string_keys
Franklin Schmidt <fschmidt@gmail.com>
parents: 1550
diff changeset
296 if( s.indexOf('\n') != -1 )
46d4baaad64d add long_string_keys
Franklin Schmidt <fschmidt@gmail.com>
parents: 1550
diff changeset
297 start.append('\n');
1550
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
298 StringBuilder end = new StringBuilder("]]");
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
299 while( s.contains(end) ) {
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
300 start.insert(1,'=');
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
301 end.insert(1,'=');
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
302 }
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
303 sb.append(start);
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
304 sb.append(s);
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
305 sb.append(end);
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
306 return;
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
307 }
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
308 sb.append( '"' );
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
309 sb.append( Luan.stringEncode(s) );
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
310 sb.append( '"' );
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
311 }
0dc3be25ad20 use_long_strings
Franklin Schmidt <fschmidt@gmail.com>
parents: 1518
diff changeset
312
720
bdd766df1c17 add json parser
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
313 }