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

fix security
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 11 Feb 2019 01:38:55 -0700
parents 9fa8b8389578
children 25746915a241
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1 package luan;
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
2
318
4fe6c9fed486 add html processing
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 296
diff changeset
3 import java.util.List;
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
4 import java.util.ArrayList;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
5 import java.util.Map;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
6 import java.util.LinkedHashMap;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
7 import java.util.Set;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
8 import java.util.Arrays;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
9 import java.util.Iterator;
168
ebe9db183eb7 rename *Lib.java to *Luan.java
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 167
diff changeset
10 import luan.modules.BasicLuan;
1164
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
11 import luan.modules.Utils;
694
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
12 import luan.impl.LuanCompiler;
134
b585d0915621 remove CmdLine.java and move code to Luan.java
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 113
diff changeset
13
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
14
66
f7e17cfb35f9 minor toString() improvement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 48
diff changeset
15 public final class Luan {
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
16
481
5d4a78c93383 luan errors are now tables
Franklin Schmidt <fschmidt@gmail.com>
parents: 446
diff changeset
17 public static void main(String[] args) throws LuanException {
1242
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
18 doFile( "classpath:luan/cmd_line.luan", args );
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
19 }
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
20
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
21 public static void doFile(String uri,String... args) throws LuanException {
672
d3e5414bdf4c better java permission handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 647
diff changeset
22 LuanState luan = new LuanState();
1242
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
23 LuanFunction fn = (LuanFunction)BasicLuan.load_file(luan,uri);
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
24 fn.call(luan,args);
134
b585d0915621 remove CmdLine.java and move code to Luan.java
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 113
diff changeset
25 }
b585d0915621 remove CmdLine.java and move code to Luan.java
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 113
diff changeset
26
111
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
27 public static Object first(Object obj) {
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
28 if( !(obj instanceof Object[]) )
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
29 return obj;
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
30 Object[] a = (Object[])obj;
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
31 return a.length==0 ? null : a[0];
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
32 }
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
33
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
34 public static Object[] array(Object obj) {
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
35 return obj instanceof Object[] ? (Object[])obj : new Object[]{obj};
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
36 }
2428ecfed375 change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 105
diff changeset
37
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
38 public static String type(Object obj) {
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
39 if( obj == null )
105
a9560839104d minor - change type names to lower case like Lua
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 104
diff changeset
40 return "nil";
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
41 if( obj instanceof String )
105
a9560839104d minor - change type names to lower case like Lua
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 104
diff changeset
42 return "string";
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
43 if( obj instanceof Boolean )
105
a9560839104d minor - change type names to lower case like Lua
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 104
diff changeset
44 return "boolean";
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
45 if( obj instanceof Number )
105
a9560839104d minor - change type names to lower case like Lua
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 104
diff changeset
46 return "number";
85
b2551f00bc51 fix type()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 66
diff changeset
47 if( obj instanceof LuanTable )
105
a9560839104d minor - change type names to lower case like Lua
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 104
diff changeset
48 return "table";
85
b2551f00bc51 fix type()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 66
diff changeset
49 if( obj instanceof LuanFunction )
105
a9560839104d minor - change type names to lower case like Lua
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 104
diff changeset
50 return "function";
113
8c706d6eb5dc add binary type
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 111
diff changeset
51 if( obj instanceof byte[] )
8c706d6eb5dc add binary type
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 111
diff changeset
52 return "binary";
513
0dfc01d8d42d rename type "userdata" to "java"
Franklin Schmidt <fschmidt@gmail.com>
parents: 481
diff changeset
53 return "java";
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
54 }
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
55
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
56 public static String toString(Number n) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
57 if( n instanceof Integer )
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
58 return n.toString();
255
e5ad26746c94 improve toString(Number)
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 226
diff changeset
59 int i = n.intValue();
e5ad26746c94 improve toString(Number)
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 226
diff changeset
60 if( i == n.doubleValue() )
e5ad26746c94 improve toString(Number)
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 226
diff changeset
61 return Integer.toString(i);
46
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
62 String s = n.toString();
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
63 int iE = s.indexOf('E');
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
64 String ending = null;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
65 if( iE != -1 ) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
66 ending = s.substring(iE);
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
67 s = s.substring(0,iE);
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
68 }
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
69 if( s.endsWith(".0") )
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
70 s = s.substring(0,s.length()-2);
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
71 if( ending != null )
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
72 s += ending;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
73 return s;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
74 }
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
75
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
76 public static Integer asInteger(Object obj) {
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
77 if( obj instanceof Integer )
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
78 return (Integer)obj;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
79 if( !(obj instanceof Number) )
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
80 return null;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
81 Number n = (Number)obj;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
82 int i = n.intValue();
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
83 return i==n.doubleValue() ? Integer.valueOf(i) : null;
a443637829c1 remove LuaNumber
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 44
diff changeset
84 }
66
f7e17cfb35f9 minor toString() improvement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 48
diff changeset
85
88
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
86 public static String stringEncode(String s) {
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
87 s = s.replace("\\","\\\\");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
88 s = s.replace("\u0007","\\a");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
89 s = s.replace("\b","\\b");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
90 s = s.replace("\f","\\f");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
91 s = s.replace("\n","\\n");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
92 s = s.replace("\r","\\r");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
93 s = s.replace("\t","\\t");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
94 s = s.replace("\u000b","\\v");
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
95 s = s.replace("\"","\\\"");
420
e9d4d5854e54 add String.encode
Franklin Schmidt <fschmidt@gmail.com>
parents: 419
diff changeset
96 s = s.replace("\'","\\'");
88
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
97 return s;
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
98 }
6ca02b188dba add LuanBit to clean up code;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 85
diff changeset
99
647
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
100
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
101 // from LuanState
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
102
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
103 public static Boolean checkBoolean(Object obj) throws LuanException {
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
104 if( obj instanceof Boolean )
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
105 return (Boolean)obj;
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
106 throw new LuanException("attempt to use a " + Luan.type(obj) + " value as a boolean" );
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
107 }
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
108
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
109 public static String checkString(Object obj) throws LuanException {
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
110 if( obj instanceof String )
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
111 return (String)obj;
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
112 throw new LuanException("attempt to use a " + Luan.type(obj) + " value as a string" );
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
113 }
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
114
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
115 public static LuanFunction checkFunction(Object obj) throws LuanException {
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
116 if( obj instanceof LuanFunction )
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
117 return (LuanFunction)obj;
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
118 throw new LuanException("attempt to call a " + Luan.type(obj) + " value" );
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
119 }
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
120
694
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
121 public static LuanFunction load(String text,String sourceName,LuanTable env)
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
122 throws LuanException
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
123 {
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
124 return LuanCompiler.compile(text,sourceName,env);
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
125 }
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
126
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
127 public static LuanFunction load(String text,String sourceName)
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
128 throws LuanException
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
129 {
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
130 return load(text,sourceName,null);
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
131 }
647
8e8c30b72e9b move methods from LuanState to Luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 574
diff changeset
132
1259
e8020216dee7 add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents: 1242
diff changeset
133 /*
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
134 public static Object toLuan(Object obj) throws LuanException {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
135 if( !type(obj).equals("java") )
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
136 return obj;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
137 LuanTable tbl = new LuanTable();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
138 if( obj instanceof Map ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
139 Map map = (Map)obj;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
140 for( Object stupid : map.entrySet() ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
141 Map.Entry entry = (Map.Entry)stupid;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
142 Object key = entry.getKey();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
143 Object value = entry.getValue();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
144 if( key != null && value != null )
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
145 tbl.rawPut(toLuan(key),toLuan(value));
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
146 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
147 return tbl;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
148 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
149 if( obj instanceof Set ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
150 Set set = (Set)obj;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
151 for( Object el : set ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
152 if( el != null )
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
153 tbl.rawPut(toLuan(el),Boolean.TRUE);
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
154 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
155 return tbl;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
156 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
157 List list;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
158 if( obj instanceof List ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
159 list = (List)obj;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
160 } else {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
161 Class cls = obj.getClass();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
162 if( cls.isArray() && !cls.getComponentType().isPrimitive() ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
163 Object[] a = (Object[])obj;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
164 list = Arrays.asList(a);
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
165 } else
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
166 throw new LuanException("can't convert type "+obj.getClass().getName()+" to luan");
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
167 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
168 int n = list.size();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
169 for( int i=0; i<n; i++ ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
170 Object val = list.get(i);
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
171 if( val != null )
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
172 tbl.rawPut(i+1,toLuan(val));
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
173 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
174 return tbl;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
175 }
1259
e8020216dee7 add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents: 1242
diff changeset
176 */
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
177
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
178 public static Object toJava(Object obj) throws LuanException {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
179 if( !(obj instanceof LuanTable) )
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
180 return obj;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
181 LuanTable tbl = (LuanTable)obj;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
182 if( tbl.isList() ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
183 List list = new ArrayList();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
184 for( Object el : tbl.asList() ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
185 list.add( toJava(el) );
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
186 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
187 return list;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
188 } else {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
189 Map map = new LinkedHashMap();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
190 Iterator<Map.Entry> iter = tbl.rawIterator();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
191 while( iter.hasNext() ) {
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
192 Map.Entry entry = iter.next();
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
193 map.put( toJava(entry.getKey()), toJava(entry.getValue()) );
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
194 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
195 return map;
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
196 }
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
197 }
1260
4b5b84853f6f replace Table.as_table with Luan.to_table
Franklin Schmidt <fschmidt@gmail.com>
parents: 1259
diff changeset
198 /*
1164
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
199 public static LuanTable table(LuanTable v) throws LuanException {
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
200 Utils.checkNotNull(v);
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
201 return v;
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1113
diff changeset
202 }
1260
4b5b84853f6f replace Table.as_table with Luan.to_table
Franklin Schmidt <fschmidt@gmail.com>
parents: 1259
diff changeset
203 */
1113
22652f4020fb add JsonToString
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
204
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
205
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
206
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
207 // security
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
208
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
209 public interface Security {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
210 public void check(LuanState luan,LuanClosure closure,String op,Object... args) throws LuanException;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
211 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
212
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
213 private static String SECURITY_KEY = "Luan.Security";
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
214
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
215 public static void checkSecurity(LuanState luan,String op,Object... args) throws LuanException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
216 check(luan,1,op,args);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
217 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
218
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
219 public static void checkCallerSecurity(LuanState luan,String op,Object... args) throws LuanException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
220 check(luan,2,op,args);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
221 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
222
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
223 private static void check(LuanState luan,int i,String op,Object... args) throws LuanException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
224 Security s = (Security)luan.registry().get(SECURITY_KEY);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
225 if( s!=null )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
226 s.check(luan,luan.peek(),op,args);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
227 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
228
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
229 public static Security setSecurity(LuanState luan,Security s) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
230 return (Security)luan.registry().put(SECURITY_KEY,s);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
231 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
232
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
233
66
f7e17cfb35f9 minor toString() improvement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 48
diff changeset
234 private Luan() {} // never
1
2df768b926aa start Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
235 }