annotate src/luan/modules/parsers/LuanToString.java @ 1618:a37ffe2d1b14

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