annotate core/src/luan/impl/LuanParser.java @ 669:e320488819b6

minor fix
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 11 Apr 2016 16:00:44 -0600
parents 7780cafca27f
children 58ebfec6178b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
166
4eaee12f6c65 move luan/interp to impl
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 165
diff changeset
1 package luan.impl;
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
2
12
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
3 import java.util.Set;
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
4 import java.util.HashSet;
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
5 import java.util.Arrays;
9
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
6 import java.util.List;
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
7 import java.util.ArrayList;
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
8 import java.util.Scanner;
48
64ecb7a3aad7 rename Lua to Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
9 import luan.Luan;
64ecb7a3aad7 rename Lua to Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 46
diff changeset
10 import luan.LuanState;
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
11 import luan.LuanTable;
186
cf939124461a don't import modules by default
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 181
diff changeset
12 import luan.modules.PackageLuan;
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
13
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
14
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
15 final class LuanParser {
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
16
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
17 private static final class Frame {
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
18 final Frame parent;
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
19 final List<String> symbols = new ArrayList<String>();
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
20 int stackSize = 0;
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
21 int loops = 0;
24
7ee247560db5 add VarArgs
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 21
diff changeset
22 boolean isVarArg = false;
32
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
23 final List<String> upValueSymbols = new ArrayList<String>();
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
24 final List<UpValue.Getter> upValueGetters = new ArrayList<UpValue.Getter>();
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
25
533
8e51d6071b67 restore LuanTable.hasJava
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
26 Frame(LuanTable java) {
34
0cdc1da466ee implement _G and _ENV
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 33
diff changeset
27 this.parent = null;
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
28 upValueSymbols.add(JAVA);
533
8e51d6071b67 restore LuanTable.hasJava
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
29 upValueGetters.add(new UpValue.ValueGetter(java));
34
0cdc1da466ee implement _G and _ENV
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 33
diff changeset
30 }
0cdc1da466ee implement _G and _ENV
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 33
diff changeset
31
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
32 Frame(Frame parent) {
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
33 this.parent = parent;
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
34 if( upValueIndex(JAVA) != 0 )
86
6db8f286fa6c _ENV is per module, not global
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 83
diff changeset
35 throw new RuntimeException();
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
36 }
32
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
37
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
38 int stackIndex(String name) {
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
39 int i = symbols.size();
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
40 while( --i >= 0 ) {
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
41 if( symbols.get(i).equals(name) )
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
42 return i;
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
43 }
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
44 return -1;
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
45 }
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
46
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
47 int upValueIndex(String name) {
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
48 int i = upValueSymbols.size();
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
49 while( --i >= 0 ) {
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
50 if( upValueSymbols.get(i).equals(name) )
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
51 return i;
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
52 }
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
53 if( parent==null )
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
54 return -1;
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
55 i = parent.stackIndex(name);
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
56 if( i != -1 ) {
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
57 upValueGetters.add(new UpValue.StackGetter(i));
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
58 } else {
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
59 i = parent.upValueIndex(name);
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
60 if( i == -1 )
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
61 return -1;
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
62 upValueGetters.add(new UpValue.NestedGetter(i));
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
63 }
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
64 upValueSymbols.add(name);
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
65 return upValueSymbols.size() - 1;
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
66 }
108
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
67
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
68 void addUpValueGetter(String name,UpValue.Getter upValueGetter) {
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
69 upValueSymbols.add(name);
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
70 upValueGetters.add(upValueGetter);
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
71 }
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
72 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
73
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
74 private static class In {
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
75 static final In NOTHING = new In(false,false);
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
76
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
77 final boolean parens;
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
78 final boolean template;
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
79
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
80 private In(boolean parens,boolean template) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
81 this.parens = parens;
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
82 this.template = template;
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
83 }
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
84
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
85 In parens() {
324
b24a35612947 minor parsing improvement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 321
diff changeset
86 return parens ? this : new In(true,false);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
87 }
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
88
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
89 In template() {
324
b24a35612947 minor parsing improvement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 321
diff changeset
90 return template ? this : new In(false,true);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
91 }
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
92 }
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
93
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
94 private static final String JAVA = "-JAVA-"; // inaccessible from Luan
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
95 private static final String _ENV = "_ENV";
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
96 private static final UpValue.Getter[] NO_UP_VALUE_GETTERS = new UpValue.Getter[0];
32
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
97
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
98 // final LuanSource source;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
99 private Frame frame;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
100 private final Parser parser;
86
6db8f286fa6c _ENV is per module, not global
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 83
diff changeset
101
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
102 LuanParser(String sourceName,String sourceText,LuanTable env) {
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
103 // this.source = source;
533
8e51d6071b67 restore LuanTable.hasJava
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
104 this.frame = new Frame( env!=null ? env : new LuanTable() );
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
105 this.parser = new Parser(sourceName,sourceText);
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
106 if( env != null )
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
107 addVar(_ENV,env);
108
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
108 }
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
109
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
110 void addVar(String name,Object value) {
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
111 frame.addUpValueGetter(name,new UpValue.ValueGetter(value));
86
6db8f286fa6c _ENV is per module, not global
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 83
diff changeset
112 }
16
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
113
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
114 private List<String> symbols() {
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
115 return frame.symbols;
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
116 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
117
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
118 private int symbolsSize() {
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
119 return frame.symbols.size();
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
120 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
121
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
122 private void addSymbol(String name) {
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
123 frame.symbols.add(name);
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
124 if( frame.stackSize < symbolsSize() )
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
125 frame.stackSize = symbolsSize();
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
126 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
127
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
128 private void addSymbols(List<String> names) {
28
df923e5835b2 fix local initial assignment
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 26
diff changeset
129 frame.symbols.addAll(names);
df923e5835b2 fix local initial assignment
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 26
diff changeset
130 if( frame.stackSize < symbolsSize() )
df923e5835b2 fix local initial assignment
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 26
diff changeset
131 frame.stackSize = symbolsSize();
df923e5835b2 fix local initial assignment
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 26
diff changeset
132 }
df923e5835b2 fix local initial assignment
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 26
diff changeset
133
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
134 private int stackIndex(String name) {
32
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
135 return frame.stackIndex(name);
17
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
136 }
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
137
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
138 private void popSymbols(int n) {
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
139 List<String> symbols = frame.symbols;
19
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
140 while( n-- > 0 ) {
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
141 symbols.remove(symbols.size()-1);
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
142 }
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
143 }
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
144
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
145 private int upValueIndex(String name) {
32
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
146 return frame.upValueIndex(name);
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
147 }
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
148
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
149 private void incLoops() {
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
150 frame.loops++;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
151 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
152
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
153 private void decLoops() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
154 frame.loops--;
20
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
155 }
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
156
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
157 private <T> T required(T t) throws ParseException {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
158 if( t==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
159 throw parser.exception();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
160 return t;
20
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
161 }
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
162
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
163 private <T> T required(T t,String msg) throws ParseException {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
164 if( t==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
165 throw parser.exception(msg);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
166 return t;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
167 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
168
154
c2e5101682ae Expr extends Expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 153
diff changeset
169 private static Expr expr(Expressions exprs) {
200
9fb218211763 add Package.block();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 195
diff changeset
170 if( exprs==null )
9fb218211763 add Package.block();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 195
diff changeset
171 return null;
154
c2e5101682ae Expr extends Expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 153
diff changeset
172 if( exprs instanceof Expr )
c2e5101682ae Expr extends Expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 153
diff changeset
173 return (Expr)exprs;
c2e5101682ae Expr extends Expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 153
diff changeset
174 return new ExpressionsExpr(exprs);
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
175 }
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
176
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
177 private Class newFnClass(int start,StmtString stmt) {
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
178 if( !stmt.hasReturn )
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
179 stmt.list.add( "return LuanFunction.NOTHING;\n" );
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
180 return toFnClass( stmt, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) );
32
c3eab5a3ce3c implement closures
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 31
diff changeset
181 }
20
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
182
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
183 private ExpString newFnExpStr(int start,StmtString stmt) {
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
184 if( !stmt.hasReturn )
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
185 stmt.list.add( "return LuanFunction.NOTHING;\n" );
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
186 return toFnExpStr( stmt, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) );
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
187 }
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
188
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
189 Class Expression() throws ParseException {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
190 Spaces(In.NOTHING);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
191 int start = parser.begin();
658
e038905512d3 compile ReturnStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 657
diff changeset
192 ExpString expr = ExprZ(In.NOTHING);
158
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
193 if( expr != null && parser.endOfInput() ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
194 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
195 stmt.list.add( "return " );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
196 stmt.list.addAll( expr.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
197 stmt.list.add( ";\n" );
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
198 stmt.hasReturn = true;
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
199 return parser.success(newFnClass(start,stmt));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
200 }
108
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
201 return parser.failure(null);
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
202 }
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
203
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
204 Class RequiredModule() throws ParseException {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
205 Spaces(In.NOTHING);
108
3c404a296995 make Package module more standard;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 107
diff changeset
206 int start = parser.begin();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
207 frame.isVarArg = true;
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
208 StmtString stmt = RequiredBlock();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
209 if( parser.endOfInput() )
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
210 return parser.success(newFnClass(start,stmt));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
211 throw parser.exception();
11
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
212 }
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
213
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
214 private StmtString RequiredBlock() throws ParseException {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
215 StmtString stmts = new StmtString();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
216 int stackStart = symbolsSize();
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
217 boolean isReturn = Stmt(stmts);
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
218 while( !isReturn && StmtSep(stmts) ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
219 Spaces(In.NOTHING);
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
220 isReturn = Stmt(stmts);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
221 }
668
Franklin Schmidt <fschmidt@gmail.com>
parents: 667
diff changeset
222 while( StmtSep(null) )
Franklin Schmidt <fschmidt@gmail.com>
parents: 667
diff changeset
223 Spaces(In.NOTHING);
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
224 int stackEnd = symbolsSize();
19
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
225 popSymbols( stackEnd - stackStart );
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
226 if( stmts.list.isEmpty() )
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
227 return stmts;
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
228 String code = stmts.toString();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
229 if( stackStart < stackEnd ) {
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
230 stmts.list.add( 0, "try {\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
231 stmts.list.add( ""
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
232 +"} finally {\n"
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
233 +" luan.stackClear("+stackStart+","+stackEnd+");\n"
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
234 +"}\n"
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
235 );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
236 }
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
237 stmts.hasReturn = isReturn;
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
238 return stmts;
12
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
239 }
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
240
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
241 private boolean StmtSep(StmtString stmts) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
242 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
243 if( parser.match( ';' ) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
244 return parser.success();
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
245 if( EndOfLine() )
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
246 return parser.success();
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
247 if( stmts != null ) {
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
248 // parser.rollback();
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
249 StmtString stmt = TemplateStmt();
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
250 if( stmt != null ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
251 stmts.list.addAll(stmt.list);
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
252 return parser.success();
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
253 }
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
254 }
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
255 return parser.failure();
14
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
256 }
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
257
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
258 private boolean EndOfLine() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
259 return parser.match( "\r\n" ) || parser.match( '\r' ) || parser.match( '\n' );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
260 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
261
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
262 private boolean Stmt(StmtString stmts) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
263 if( LocalStmt(stmts) )
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
264 return false;
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
265 StmtString stmt;
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
266 if( (stmt=ReturnStmt()) != null ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
267 stmts.list.addAll(stmt.list);
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
268 return true;
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
269 }
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
270 if( (stmt=FunctionStmt()) != null
661
1bbb08c0d8f1 compile LocalFunctionStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 660
diff changeset
271 || (stmt=LocalFunctionStmt()) != null
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
272 || (stmt=BreakStmt()) != null
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
273 || (stmt=ForStmt()) != null
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
274 || (stmt=DoStmt()) != null
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
275 || (stmt=WhileStmt()) != null
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
276 || (stmt=RepeatStmt()) != null
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
277 || (stmt=IfStmt()) != null
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
278 || (stmt=SetStmt()) != null
159
0abc9181061a revert rev 154 but only allow FnCall, AndExpr, or OrExpr in ExpressionsStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 158
diff changeset
279 || (stmt=ExpressionsStmt()) != null
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
280 ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
281 stmts.list.addAll(stmt.list);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
282 }
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
283 return false;
12
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
284 }
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
285
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
286 private ExpString indexExpStr(ExpString exp1,ExpString exp2) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
287 ExpString exp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
288 exp.list.add( "luan.index(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
289 exp.list.addAll( exp1.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
290 exp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
291 exp.list.addAll( exp2.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
292 exp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
293 return exp;
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
294 }
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
295
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
296 private ExpString callExpStr(ExpString fn,ExpString args) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
297 ExpString exp = new ExpString(false,true);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
298 exp.list.add( "Luan.checkFunction(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
299 exp.list.addAll( fn.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
300 exp.list.add( ").call(luan,Luan.array(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
301 exp.list.addAll( args.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
302 exp.list.add( "))" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
303 return exp;
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
304 }
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
305
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
306 private StmtString TemplateStmt() throws ParseException {
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
307 ExpString exprs = TemplateExpressions(In.NOTHING);
369
85bf9f0379aa template statements no longer depend on 'Io' being defined
Franklin Schmidt <fschmidt@gmail.com>
parents: 356
diff changeset
308 if( exprs == null )
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
309 return null;
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
310 ExpString requireCall = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
311 requireCall.list.add( "PackageLuan.require(luan,\"luan:Io\")" );
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
312 ExpString stdoutExp = indexExpStr( requireCall.expr(), constExpStr("stdout") );
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
313 ExpString writeExp = indexExpStr( stdoutExp, constExpStr("write") );
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
314 ExpString writeCall = callExpStr( writeExp, exprs );
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
315 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
316 stmt.list.addAll( writeCall.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
317 stmt.list.add( ";\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
318 return stmt;
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
319 }
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
320
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
321 private ExpString TemplateExpressions(In in) throws ParseException {
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
322 if( in.template )
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
323 return null;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
324 int start = parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
325 if( !parser.match( "%>" ) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
326 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
327 EndOfLine();
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
328 In inTemplate = in.template();
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
329 List<ExpString> builder = new ArrayList<ExpString>();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
330 while(true) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
331 if( parser.match( "<%=" ) ) {
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
332 Spaces(inTemplate);
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
333 builder.add( RequiredExpr(inTemplate) );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
334 RequiredMatch( "%>" );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
335 } else if( parser.match( "<%" ) ) {
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
336 Spaces(inTemplate);
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
337 return parser.success(expString(builder));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
338 } else {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
339 int i = parser.currentIndex();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
340 do {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
341 if( parser.match( "%>" ) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
342 throw parser.exception("'%>' unexpected");
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
343 if( !parser.anyChar() )
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
344 throw parser.exception("Unclosed template expression");
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
345 } while( !parser.test( "<%" ) );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
346 String match = parser.textFrom(i);
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
347 builder.add( constExpStr(match) );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
348 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
349 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
350 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
351
658
e038905512d3 compile ReturnStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 657
diff changeset
352 private StmtString ReturnStmt() throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
353 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
354 if( !Keyword("return",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
355 return parser.failure(null);
658
e038905512d3 compile ReturnStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 657
diff changeset
356 ExpString exprs = ExpStringList(In.NOTHING);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
357 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
358 stmt.list.add( "return " );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
359 if( exprs != null )
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
360 stmt.list.addAll( exprs.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
361 else
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
362 stmt.list.add( "LuanFunction.NOTHING" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
363 stmt.list.add( ";\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
364 return parser.success( stmt );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
365 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
366
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
367 private StmtString FunctionStmt() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
368 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
369 if( !Keyword("function",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
370 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
371
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
372 parser.currentIndex();
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
373 Var var = nameVar(RequiredName(In.NOTHING));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
374 while( parser.match( '.' ) ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
375 Spaces(In.NOTHING);
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
376 ExpString exp = NameExpr(In.NOTHING);
636
13b390bfed32 parser fixes
Franklin Schmidt <fschmidt@gmail.com>
parents: 604
diff changeset
377 if( exp==null )
13b390bfed32 parser fixes
Franklin Schmidt <fschmidt@gmail.com>
parents: 604
diff changeset
378 return parser.failure(null);
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
379 var = indexVar( var.exp(), exp );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
380 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
381
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
382 ExpString fnDef = RequiredFunction(In.NOTHING);
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
383 return parser.success( var.set(fnDef) );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
384 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
385
661
1bbb08c0d8f1 compile LocalFunctionStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 660
diff changeset
386 private StmtString LocalFunctionStmt() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
387 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
388 if( !(Keyword("local",In.NOTHING) && Keyword("function",In.NOTHING)) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
389 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
390 String name = RequiredName(In.NOTHING);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
391 addSymbol( name );
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
392 ExpString fnDef = RequiredFunction(In.NOTHING);
661
1bbb08c0d8f1 compile LocalFunctionStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 660
diff changeset
393 Settable s = new SetLocalVar(symbolsSize()-1);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
394 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
395 stmt.list.add( settableToString(s) );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
396 stmt.list.add( ".set(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
397 stmt.list.addAll( fnDef.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
398 stmt.list.add( ");\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
399 return parser.success( stmt );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
400 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
401
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
402 private StmtString BreakStmt() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
403 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
404 if( !Keyword("break",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
405 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
406 if( frame.loops <= 0 )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
407 throw parser.exception("'break' outside of loop");
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
408 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
409 stmt.list.add( "break;\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
410 return parser.success( stmt );
17
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
411 }
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
412
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
413 int forCounter = 0;
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
414
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
415 private StmtString ForStmt() throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
416 parser.begin();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
417 int stackStart = symbolsSize();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
418 if( !Keyword("for",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
419 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
420 List<String> names = RequiredNameList(In.NOTHING);
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
421 if( !Keyword("in",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
422 return parser.failure(null);
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
423 ExpString expr = RequiredExpr(In.NOTHING).expr();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
424 RequiredKeyword("do",In.NOTHING);
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
425
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
426 SetLocalVar[] vars = new SetLocalVar[names.size()];
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
427 for( int i=0; i<vars.length; i++ ) {
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
428 vars[i] = new SetLocalVar(stackStart+i);
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
429 }
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
430 String varsStr = varsToString(vars);
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
431
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
432 ExpString firstVar = new ExpString(new GetLocalVar(stackStart));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
433 addSymbols(names);
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
434 StmtString loop = RequiredLoopBlock();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
435 RequiredKeyword("end",In.NOTHING);
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
436 String fnVar = "fn"+ ++forCounter;
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
437 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
438 stmt.list.add( ""
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
439 +"try {\n"
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
440 +"LuanFunction "+fnVar+" = Luan.checkFunction("
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
441 );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
442 stmt.list.addAll( expr.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
443 stmt.list.add( ""
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
444 + ");\n"
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
445 +"while(true) {\n"
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
446 +"for( int i="+stackStart+"; i<"+symbolsSize()+"; i++ ) {\n"
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
447 +"luan.stackSet(i,null);\n"
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
448 +"}\n"
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
449 +"LuanImpl.set(luan," + varsStr + ", "+fnVar+".call(luan) );\n"
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
450 +"if( "
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
451 );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
452 stmt.list.addAll( firstVar.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
453 stmt.list.add( "==null ) break;\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
454 stmt.list.addAll( loop.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
455 stmt.list.add( ""
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
456 +"}"
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
457 +"} finally {\n"
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
458 +"luan.stackClear("+stackStart+","+symbolsSize()+");\n"
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
459 +"}\n"
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
460 );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
461 popSymbols( symbolsSize() - stackStart );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
462 return parser.success(stmt);
54
f5b27ef14d73 add OutputStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 51
diff changeset
463 }
f5b27ef14d73 add OutputStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 51
diff changeset
464
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
465 private StmtString DoStmt() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
466 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
467 if( !Keyword("do",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
468 return parser.failure(null);
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
469 StmtString stmt = RequiredBlock();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
470 RequiredKeyword("end",In.NOTHING);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
471 return parser.success(stmt);
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
472 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
473
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
474 private boolean LocalStmt(StmtString stmts) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
475 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
476 if( !Keyword("local",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
477 return parser.failure();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
478 List<String> names = NameList(In.NOTHING);
356
5e34702423a0 better parser error message
Franklin Schmidt <fschmidt@gmail.com>
parents: 326
diff changeset
479 if( names==null ) {
5e34702423a0 better parser error message
Franklin Schmidt <fschmidt@gmail.com>
parents: 326
diff changeset
480 if( Keyword("function",In.NOTHING) )
5e34702423a0 better parser error message
Franklin Schmidt <fschmidt@gmail.com>
parents: 326
diff changeset
481 return parser.failure(); // handled later
5e34702423a0 better parser error message
Franklin Schmidt <fschmidt@gmail.com>
parents: 326
diff changeset
482 throw parser.exception("Invalid local statement");
5e34702423a0 better parser error message
Franklin Schmidt <fschmidt@gmail.com>
parents: 326
diff changeset
483 }
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
484 if( parser.match( '=' ) ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
485 Spaces(In.NOTHING);
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
486 ExpString values = ExpStringList(In.NOTHING);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
487 if( values==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
488 throw parser.exception("Expressions expected");
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
489 SetLocalVar[] vars = new SetLocalVar[names.size()];
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
490 int stackStart = symbolsSize();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
491 for( int i=0; i<vars.length; i++ ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
492 vars[i] = new SetLocalVar(stackStart+i);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
493 }
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
494 String varsStr = varsToString(vars);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
495 stmts.list.add( "LuanImpl.set(luan," + varsStr + "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
496 stmts.list.addAll( values.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
497 stmts.list.add( ");\n" );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
498 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
499 addSymbols(names);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
500 return parser.success();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
501 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
502
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
503 private List<String> RequiredNameList(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
504 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
505 List<String> names = NameList(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
506 if( names==null )
139
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
507 throw parser.exception("Name expected");
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
508 return parser.success(names);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
509 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
510
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
511 private List<String> NameList(In in) throws ParseException {
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
512 String name = Name(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
513 if( name==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
514 return null;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
515 List<String> names = new ArrayList<String>();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
516 names.add(name);
139
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
517 while( (name=anotherName(in)) != null ) {
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
518 names.add(name);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
519 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
520 return names;
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
521 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
522
139
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
523 private String anotherName(In in) throws ParseException {
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
524 parser.begin();
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
525 if( !parser.match( ',' ) )
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
526 return parser.failure(null);
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
527 Spaces(in);
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
528 String name = Name(in);
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
529 if( name==null )
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
530 return parser.failure(null);
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
531 return parser.success(name);
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
532 }
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
533
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
534 private StmtString WhileStmt() throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
535 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
536 if( !Keyword("while",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
537 return parser.failure(null);
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
538 ExpString cnd = RequiredExpr(In.NOTHING).expr();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
539 RequiredKeyword("do",In.NOTHING);
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
540 StmtString loop = RequiredLoopBlock();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
541 RequiredKeyword("end",In.NOTHING);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
542 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
543 stmt.list.add( "while( Luan.checkBoolean(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
544 stmt.list.addAll( cnd.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
545 stmt.list.add( ") ) {\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
546 stmt.list.addAll( loop.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
547 stmt.list.add( "}\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
548 return parser.success( stmt );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
549 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
550
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
551 private StmtString RepeatStmt() throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
552 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
553 if( !Keyword("repeat",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
554 return parser.failure(null);
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
555 StmtString loop =RequiredLoopBlock();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
556 RequiredKeyword("until",In.NOTHING);
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
557 ExpString cnd = RequiredExpr(In.NOTHING).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
558 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
559 stmt.list.add( "do {\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
560 stmt.list.addAll( loop.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
561 stmt.list.add( "} while( !Luan.checkBoolean(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
562 stmt.list.addAll( cnd.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
563 stmt.list.add( ") );\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
564 return parser.success( stmt );
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
565 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
566
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
567 private StmtString RequiredLoopBlock() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
568 incLoops();
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
569 StmtString stmt = RequiredBlock();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
570 decLoops();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
571 return stmt;
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
572 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
573
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
574 private StmtString IfStmt() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
575 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
576 if( !Keyword("if",In.NOTHING) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
577 return parser.failure(null);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
578 StmtString stmt = new StmtString();
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
579 ExpString cnd;
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
580 StmtString block;
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
581 cnd = RequiredExpr(In.NOTHING).expr();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
582 RequiredKeyword("then",In.NOTHING);
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
583 block = RequiredBlock();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
584 stmt.list.add( "if( Luan.checkBoolean(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
585 stmt.list.addAll( cnd.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
586 stmt.list.add( ") ) {\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
587 stmt.list.addAll( block.list );
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
588 while( Keyword("elseif",In.NOTHING) ) {
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
589 cnd = RequiredExpr(In.NOTHING).expr();
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
590 RequiredKeyword("then",In.NOTHING);
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
591 block = RequiredBlock();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
592 stmt.list.add( "} else if( Luan.checkBoolean(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
593 stmt.list.addAll( cnd.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
594 stmt.list.add( ") ) {\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
595 stmt.list.addAll( block.list );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
596 }
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
597 if( Keyword("else",In.NOTHING) ) {
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
598 block = RequiredBlock();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
599 stmt.list.add( "} else {\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
600 stmt.list.addAll( block.list );
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
601 }
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
602 RequiredKeyword("end",In.NOTHING);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
603 stmt.list.add( "}\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
604 return parser.success( stmt );
20
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
605 }
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
606
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
607 private StmtString SetStmt() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
608 parser.begin();
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
609 List<Var> vars = new ArrayList<Var>();
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
610 Var v = SettableVar();
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
611 if( v == null )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
612 return parser.failure(null);
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
613 vars.add(v);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
614 while( parser.match( ',' ) ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
615 Spaces(In.NOTHING);
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
616 v = SettableVar();
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
617 if( v == null )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
618 return parser.failure(null);
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
619 vars.add(v);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
620 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
621 if( !parser.match( '=' ) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
622 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
623 Spaces(In.NOTHING);
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
624 ExpString values = ExpStringList(In.NOTHING);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
625 if( values==null )
274
8afe9f2fdfec AB testing, not fully tested
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
626 // throw parser.exception("Expressions expected");
8afe9f2fdfec AB testing, not fully tested
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
627 return parser.failure(null);
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
628 int n = vars.size();
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
629 if( n == 1 )
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
630 return parser.success( vars.get(0).set(values) );
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
631 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
632 stmt.list.add( "t = " );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
633 stmt.list.addAll( values.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
634 stmt.list.add( ";\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
635 ExpString t = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
636 t.list.add( "t" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
637 stmt.list.addAll( vars.get(0).set(t).list );
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
638 for( int i=1; i<n; i++ ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
639 t.list.clear();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
640 t.list.add( "LuanImpl.pick(t,"+i+")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
641 stmt.list.addAll( vars.get(i).set(t).list );
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
642 }
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
643 return parser.success( stmt );
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
644 }
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
645
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
646 private static String varsToString(Settable[] vars) {
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
647 StringBuilder sb = new StringBuilder();
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
648 sb.append( "new Settable[]{" );
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
649 for( Settable v : vars ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
650 sb.append( settableToString(v) ).append( ',' );
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
651 }
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
652 sb.append( "}" );
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
653 return sb.toString();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
654 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
655
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
656 private StmtString ExpressionsStmt() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
657 parser.begin();
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
658 ExpString exp = ExprZ(In.NOTHING);
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
659 if( exp != null && exp.isStmt ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
660 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
661 if( exp.isExpr ) {
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
662 stmt.list.add( "LuanImpl.nop(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
663 stmt.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
664 stmt.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
665 } else {
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
666 stmt.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
667 }
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
668 stmt.list.add( ";\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
669 return parser.success( stmt );
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
670 }
159
0abc9181061a revert rev 154 but only allow FnCall, AndExpr, or OrExpr in ExpressionsStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 158
diff changeset
671 return parser.failure(null);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
672 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
673
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
674 private Var SettableVar() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
675 int start = parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
676 Var var = VarZ(In.NOTHING);
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
677 if( var==null || !var.isSettable() )
155
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
678 return parser.failure(null);
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
679 return parser.success( var );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
680 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
681
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
682 private ExpString RequiredExpr(In in) throws ParseException {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
683 parser.begin();
211
284eddd599b1 fix parsing bug
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 209
diff changeset
684 return parser.success(required(ExprZ(in),"Bad expression"));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
685 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
686
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
687 private ExpString ExprZ(In in) throws ParseException {
449
e89bf64a0d05 fix parse error
Franklin Schmidt <fschmidt@gmail.com>
parents: 369
diff changeset
688 return OrExpr(in);
19
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
689 }
a7c13c6017f7 add GenericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 18
diff changeset
690
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
691 private ExpString OrExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
692 parser.begin();
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
693 ExpString exp = AndExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
694 if( exp==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
695 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
696 while( Keyword("or",in) ) {
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
697 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
698 ExpString exp2 = required(RelExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
699 ExpString newExp = new ExpString(true,true);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
700 newExp.list.add( "(LuanImpl.cnd(t = " );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
701 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
702 newExp.list.add( ") ? t : (" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
703 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
704 newExp.list.add( "))" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
705 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
706 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
707 return parser.success(exp);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
708 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
709
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
710 private ExpString AndExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
711 parser.begin();
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
712 ExpString exp = RelExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
713 if( exp==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
714 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
715 while( Keyword("and",in) ) {
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
716 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
717 ExpString exp2 = required(RelExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
718 ExpString newExp = new ExpString(true,true);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
719 newExp.list.add( "(LuanImpl.cnd(t = " );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
720 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
721 newExp.list.add( ") ? (" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
722 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
723 newExp.list.add( ") : t)" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
724 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
725 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
726 return parser.success(exp);
18
3971113699b8 add NumericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 17
diff changeset
727 }
3971113699b8 add NumericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 17
diff changeset
728
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
729 private ExpString RelExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
730 parser.begin();
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
731 ExpString exp = ConcatExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
732 if( exp==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
733 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
734 while(true) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
735 if( parser.match("==") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
736 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
737 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
738 ExpString exp2 = required(ConcatExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
739 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
740 newExp.list.add( "LuanImpl.eq(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
741 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
742 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
743 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
744 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
745 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
746 } else if( parser.match("~=") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
747 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
748 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
749 ExpString exp2 = required(ConcatExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
750 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
751 newExp.list.add( "!LuanImpl.eq(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
752 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
753 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
754 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
755 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
756 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
757 } else if( parser.match("<=") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
758 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
759 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
760 ExpString exp2 = required(ConcatExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
761 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
762 newExp.list.add( "LuanImpl.le(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
763 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
764 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
765 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
766 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
767 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
768 } else if( parser.match(">=") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
769 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
770 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
771 ExpString exp2 = required(ConcatExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
772 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
773 newExp.list.add( "LuanImpl.le(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
774 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
775 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
776 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
777 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
778 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
779 } else if( parser.match("<") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
780 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
781 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
782 ExpString exp2 = required(ConcatExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
783 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
784 newExp.list.add( "LuanImpl.lt(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
785 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
786 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
787 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
788 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
789 exp = newExp;
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
790 } else if( parser.match(">") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
791 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
792 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
793 ExpString exp2 = required(ConcatExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
794 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
795 newExp.list.add( "LuanImpl.lt(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
796 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
797 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
798 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
799 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
800 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
801 } else
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
802 break;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
803 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
804 return parser.success(exp);
42
786699c78837 implement try-catch
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 40
diff changeset
805 }
786699c78837 implement try-catch
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 40
diff changeset
806
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
807 private ExpString ConcatExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
808 parser.begin();
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
809 ExpString exp = SumExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
810 if( exp==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
811 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
812 if( parser.match("..") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
813 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
814 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
815 ExpString exp2 = required(ConcatExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
816 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
817 newExp.list.add( "LuanImpl.concat(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
818 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
819 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
820 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
821 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
822 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
823 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
824 return parser.success(exp);
28
df923e5835b2 fix local initial assignment
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 26
diff changeset
825 }
df923e5835b2 fix local initial assignment
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 26
diff changeset
826
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
827 private ExpString SumExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
828 parser.begin();
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
829 ExpString exp = TermExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
830 if( exp==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
831 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
832 while(true) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
833 if( parser.match('+') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
834 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
835 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
836 ExpString exp2 = required(TermExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
837 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
838 newExp.list.add( "LuanImpl.add(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
839 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
840 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
841 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
842 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
843 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
844 } else if( Minus() ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
845 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
846 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
847 ExpString exp2 = required(TermExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
848 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
849 newExp.list.add( "LuanImpl.sub(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
850 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
851 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
852 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
853 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
854 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
855 } else
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
856 break;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
857 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
858 return parser.success(exp);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
859 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
860
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
861 private boolean Minus() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
862 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
863 return parser.match('-') && !parser.match('-') ? parser.success() : parser.failure();
12
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
864 }
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
865
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
866 private ExpString TermExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
867 parser.begin();
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
868 ExpString exp = UnaryExpr(in);
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
869 if( exp==null )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
870 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
871 while(true) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
872 if( parser.match('*') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
873 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
874 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
875 ExpString exp2 = required(UnaryExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
876 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
877 newExp.list.add( "LuanImpl.mul(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
878 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
879 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
880 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
881 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
882 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
883 } else if( parser.match('/') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
884 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
885 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
886 ExpString exp2 = required(UnaryExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
887 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
888 newExp.list.add( "LuanImpl.div(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
889 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
890 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
891 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
892 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
893 exp = newExp;
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
894 } else if( Mod() ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
895 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
896 exp = exp.expr();
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
897 ExpString exp2 = required(UnaryExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
898 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
899 newExp.list.add( "LuanImpl.mod(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
900 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
901 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
902 newExp.list.addAll( exp2.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
903 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
904 exp = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
905 } else
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
906 break;
17
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
907 }
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
908 return parser.success(exp);
17
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
909 }
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
910
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
911 private boolean Mod() {
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
912 parser.begin();
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
913 return parser.match('%') && !parser.match('>') ? parser.success() : parser.failure();
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
914 }
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
915
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
916 private ExpString UnaryExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
917 parser.begin();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
918 if( parser.match('#') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
919 Spaces(in);
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
920 ExpString exp = required(UnaryExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
921 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
922 newExp.list.add( "LuanImpl.len(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
923 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
924 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
925 return parser.success(newExp);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
926 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
927 if( Minus() ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
928 Spaces(in);
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
929 ExpString exp = required(UnaryExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
930 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
931 newExp.list.add( "LuanImpl.unm(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
932 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
933 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
934 return parser.success(newExp);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
935 }
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
936 if( Keyword("not",in) ) {
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
937 Spaces(in);
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
938 ExpString exp = required(UnaryExpr(in)).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
939 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
940 newExp.list.add( "!Luan.checkBoolean(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
941 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
942 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
943 return parser.success(newExp);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
944 }
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
945 ExpString exp = PowExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
946 if( exp==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
947 return parser.failure(null);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
948 return parser.success(exp);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
949 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
950
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
951 private ExpString PowExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
952 parser.begin();
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
953 ExpString exp1 = SingleExpr(in);
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
954 if( exp1==null )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
955 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
956 if( parser.match('^') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
957 Spaces(in);
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
958 ExpString exp2 = required(PowExpr(in));
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
959 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
960 newExp.list.add( "LuanImpl.pow(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
961 newExp.list.addAll( exp1.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
962 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
963 newExp.list.addAll( exp2.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
964 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
965 exp1 = newExp;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
966 }
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
967 return parser.success(exp1);
14
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
968 }
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
969
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
970 private ExpString SingleExpr(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
971 parser.begin();
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
972 ExpString es = FunctionExpr(in);
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
973 if( es != null )
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
974 return parser.success(es);
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
975 es = VarExp(in);
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
976 if( es != null )
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
977 return parser.success(es);
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
978 Expressions exp = VarArgs(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
979 if( exp != null )
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
980 return parser.success(new ExpString(exp));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
981 return parser.failure(null);
14
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
982 }
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
983
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
984 private ExpString FunctionExpr(In in) throws ParseException {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
985 if( !Keyword("function",in) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
986 return null;
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
987 return RequiredFunction(in);
20
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
988 }
d85510d92eee add BreakStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 19
diff changeset
989
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
990 private ExpString RequiredFunction(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
991 int start = parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
992 RequiredMatch('(');
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
993 In inParens = in.parens();
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
994 Spaces(inParens);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
995 frame = new Frame(frame);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
996 List<String> names = NameList(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
997 if( names != null ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
998 addSymbols(names);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
999 if( parser.match(',') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1000 Spaces(inParens);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1001 if( !parser.match("...") )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1002 throw parser.exception();
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 247
diff changeset
1003 Spaces(inParens);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1004 frame.isVarArg = true;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1005 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1006 } else if( parser.match("...") ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1007 Spaces(inParens);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1008 frame.isVarArg = true;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1009 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1010 RequiredMatch(')');
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1011 Spaces(in);
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1012 StmtString block = RequiredBlock();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1013 RequiredKeyword("end",in);
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1014 ExpString fnDef = newFnExpStr(start,block);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1015 frame = frame.parent;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1016 return parser.success(fnDef);
11
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1017 }
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1018
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1019 private VarArgs VarArgs(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1020 parser.begin();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1021 if( !frame.isVarArg || !parser.match("...") )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1022 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1023 Spaces(in);
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1024 return parser.success( new VarArgs() );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1025 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1026
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1027 private ExpString TableExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1028 parser.begin();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1029 if( !parser.match('{') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1030 return parser.failure(null);
604
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1031 Spaces(In.NOTHING);
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1032 List<ExpString> builder = new ArrayList<ExpString>();
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1033 Field(builder);
604
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1034 while( FieldSep() ) {
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1035 Spaces(In.NOTHING);
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1036 Field(builder);
604
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1037 }
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1038 ExpString exp = TemplateExpressions(In.NOTHING);
245
2ed8465a9d62 allow TemplateExpressions at end of table constructor
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 211
diff changeset
1039 if( exp != null )
2ed8465a9d62 allow TemplateExpressions at end of table constructor
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 211
diff changeset
1040 builder.add(exp);
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1041 if( !parser.match('}') )
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1042 throw parser.exception("Expected table element or '}'");
203
99eef1d0e706 IO security
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 200
diff changeset
1043 Spaces(in);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1044 exp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1045 exp.list.add( "LuanImpl.table(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1046 exp.list.addAll( expString(builder).list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1047 exp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1048 return parser.success( exp );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1049 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1050
604
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1051 private boolean FieldSep() throws ParseException {
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1052 return parser.anyOf(",;") || EndOfLine();
14
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
1053 }
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
1054
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1055 private boolean Field(List<ExpString> builder) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1056 parser.begin();
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1057 ExpString exp = SubExpr(In.NOTHING);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1058 if( exp==null )
604
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1059 exp = NameExpr(In.NOTHING);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1060 if( exp!=null && parser.match('=') ) {
604
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1061 Spaces(In.NOTHING);
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1062 ExpString val = RequiredExpr(In.NOTHING).expr();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1063 ExpString newExp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1064 newExp.list.add( "new TableField(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1065 newExp.list.addAll( exp.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1066 newExp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1067 newExp.list.addAll( val.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1068 newExp.list.add( ")" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1069 builder.add( newExp );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1070 return parser.success();
17
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
1071 }
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1072 parser.rollback();
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1073 ExpString exprs = ExprZ(In.NOTHING);
154
c2e5101682ae Expr extends Expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 153
diff changeset
1074 if( exprs != null ) {
c2e5101682ae Expr extends Expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 153
diff changeset
1075 builder.add(exprs);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1076 return parser.success();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1077 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1078 return parser.failure();
7
bca8fc5d928b work on expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 6
diff changeset
1079 }
bca8fc5d928b work on expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 6
diff changeset
1080
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1081 private ExpString VarExp(In in) throws ParseException {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1082 Var var = VarZ(in);
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1083 return var==null ? null : var.exp();
8
8896068e0a4b finish operators
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 7
diff changeset
1084 }
8896068e0a4b finish operators
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 7
diff changeset
1085
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1086 private Var VarZ(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1087 parser.begin();
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1088 Var var = VarStart(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1089 if( var==null )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1090 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1091 Var var2;
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1092 while( (var2=Var2(in,var.exp())) != null ) {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1093 var = var2;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1094 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1095 return parser.success(var);
7
bca8fc5d928b work on expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 6
diff changeset
1096 }
bca8fc5d928b work on expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 6
diff changeset
1097
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1098 private Var VarStart(In in) throws ParseException {
206
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1099 if( parser.match('(') ) {
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1100 In inParens = in.parens();
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1101 Spaces(inParens);
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1102 ExpString exp = RequiredExpr(inParens).expr();
206
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1103 RequiredMatch(')');
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1104 Spaces(in);
206
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1105 return exprVar(exp);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1106 }
206
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1107 String name = Name(in);
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1108 if( name != null )
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1109 return nameVar(name);
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1110 ExpString exp;
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1111 exp = TableExpr(in);
206
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1112 if( exp != null )
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1113 return exprVar(exp);
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1114 exp = Literal(in);
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1115 if( exp != null )
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1116 return exprVar(exp);
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1117 return null;
21
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
1118 }
c93d8c781853 add functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 20
diff changeset
1119
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1120 private Var Var2(In in,ExpString exp1) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1121 parser.begin();
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1122 ExpString exp2 = SubExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1123 if( exp2 != null )
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1124 return parser.success(indexVar(exp1,exp2));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1125 if( parser.match('.') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1126 Spaces(in);
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1127 exp2 = NameExpr(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1128 if( exp2!=null )
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1129 return parser.success(indexVar(exp1,exp2));
636
13b390bfed32 parser fixes
Franklin Schmidt <fschmidt@gmail.com>
parents: 604
diff changeset
1130 return parser.failure(null);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1131 }
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1132 ExpString fnCall = Args( in, exp1, new ArrayList<ExpString>() );
206
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1133 if( fnCall != null )
77365c9fdfe4 remove -> operator
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 203
diff changeset
1134 return parser.success(exprVar(fnCall));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1135 return parser.failure(null);
9
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1136 }
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1137
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1138 private interface Var {
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1139 public ExpString exp() throws ParseException;
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1140 // public Settable settable() throws ParseException;
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1141 public boolean isSettable();
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1142 public StmtString set(ExpString val) throws ParseException;
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1143 }
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1144
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1145 private Expr env() {
34
0cdc1da466ee implement _G and _ENV
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 33
diff changeset
1146 int index = stackIndex(_ENV);
0cdc1da466ee implement _G and _ENV
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 33
diff changeset
1147 if( index != -1 )
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1148 return new GetLocalVar(index);
34
0cdc1da466ee implement _G and _ENV
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 33
diff changeset
1149 index = upValueIndex(_ENV);
0cdc1da466ee implement _G and _ENV
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 33
diff changeset
1150 if( index != -1 )
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1151 return new GetUpVar(index);
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1152 return null;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1153 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1154
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1155 private Var nameVar(final String name) {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1156 return new Var() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1157
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1158 public ExpString exp() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1159 int index = stackIndex(name);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1160 if( index != -1 )
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1161 return new ExpString(new GetLocalVar(index));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1162 index = upValueIndex(name);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1163 if( index != -1 )
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1164 return new ExpString(new GetUpVar(index));
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1165 Expr envExpr = env();
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1166 if( envExpr != null )
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1167 return indexExpStr( new ExpString(envExpr), constExpStr(name) );
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1168 parser.failure(null);
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1169 throw parser.exception("name '"+name+"' not defined");
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1170 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1171
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1172 public boolean isSettable() {
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1173 return true;
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1174 }
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1175
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1176 private Settable settable() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1177 int index = stackIndex(name);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1178 if( index != -1 )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1179 return new SetLocalVar(index);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1180 index = upValueIndex(name);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1181 if( index != -1 )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1182 return new SetUpVar(index);
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1183 Expr envExpr = env();
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1184 if( envExpr != null )
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1185 return new SetTableEntry( envExpr, new ConstExpr(name) );
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1186 parser.failure(null);
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 460
diff changeset
1187 throw parser.exception("name '"+name+"' not defined");
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1188 }
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1189
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1190 public StmtString set(ExpString val) throws ParseException {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1191 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1192 stmt.list.add( settableToString(settable()) + ".set(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1193 stmt.list.addAll( val.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1194 stmt.list.add( ");\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1195 return stmt;
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1196 }
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1197 };
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1198 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1199
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1200 private Var exprVar(final ExpString expr) {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1201 return new Var() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1202
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1203 public ExpString exp() {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1204 return expr;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1205 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1206
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1207 public boolean isSettable() {
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1208 return false;
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1209 }
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1210
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1211 public StmtString set(ExpString val) {
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1212 throw new RuntimeException();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1213 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1214 };
11
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1215 }
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1216
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1217 private Var indexVar(final ExpString table,final ExpString key) {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1218 return new Var() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1219
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1220 public ExpString exp() {
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1221 return indexExpStr( table, key );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1222 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1223
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1224 public boolean isSettable() {
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1225 return true;
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1226 }
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1227 /*
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1228 public Settable settable() {
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1229 return new SetTableEntry(expr(LuanParser.exp(table)),expr(LuanParser.exp(key)));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1230 }
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1231 */
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1232 public StmtString set(ExpString val) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1233 StmtString stmt = new StmtString();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1234 stmt.list.add( "LuanImpl.put(luan," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1235 stmt.list.addAll( table.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1236 stmt.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1237 stmt.list.addAll( key.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1238 stmt.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1239 stmt.list.addAll( val.expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1240 stmt.list.add( ");\n" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1241 return stmt;
660
e064377994b2 compile table put
Franklin Schmidt <fschmidt@gmail.com>
parents: 658
diff changeset
1242 }
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1243 };
9
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1244 }
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1245
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1246 private ExpString Args(In in,ExpString fn,List<ExpString> builder) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1247 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1248 return args(in,builder)
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1249 ? parser.success( callExpStr( fn, expString(builder) ) )
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1250 : parser.failure((ExpString)null);
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1251 }
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1252
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1253 private boolean args(In in,List<ExpString> builder) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1254 parser.begin();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1255 if( parser.match('(') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1256 In inParens = in.parens();
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1257 Spaces(inParens);
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1258 ExpList(inParens,builder); // optional
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1259 if( !parser.match(')') )
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1260 throw parser.exception("Expression or ')' expected");
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1261 Spaces(in);
195
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1262 return parser.success();
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1263 }
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1264 ExpString exp = TableExpr(in);
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1265 if( exp != null ) {
655
e2be71451d04 compile TableExpr
Franklin Schmidt <fschmidt@gmail.com>
parents: 654
diff changeset
1266 builder.add(exp);
195
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1267 return parser.success();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1268 }
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1269 String s = StringLiteral(in);
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1270 if( s != null ) {
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
1271 builder.add( constExpStr(s) );
195
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1272 return parser.success();
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1273 }
181
5d2cb8c1f844 add web logging
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 180
diff changeset
1274 /*
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 155
diff changeset
1275 Expressions exps = TemplateExpressions(in);
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1276 if( exps != null ) {
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1277 builder.add(exps);
195
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1278 return parser.success();
107
dbf459397217 change OutputStatement to JspExpressions;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 106
diff changeset
1279 }
181
5d2cb8c1f844 add web logging
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 180
diff changeset
1280 */
195
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1281 return parser.failure();
11
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1282 }
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1283
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1284 private ExpString ExpStringList(In in) throws ParseException {
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1285 List<ExpString> builder = new ArrayList<ExpString>();
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1286 return ExpList(in,builder) ? expString(builder) : null;
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1287 }
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1288
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1289 private boolean ExpList(In in,List<ExpString> builder) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1290 parser.begin();
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1291 ExpString exp = TemplateExpressions(in);
158
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
1292 if( exp != null ) {
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1293 builder.add(exp);
158
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
1294 return parser.success();
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
1295 }
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1296 exp = ExprZ(in);
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1297 if( exp==null )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1298 return parser.failure();
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1299 builder.add(exp);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1300 while( parser.match(',') ) {
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1301 Spaces(in);
158
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
1302 exp = TemplateExpressions(in);
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
1303 if( exp != null ) {
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1304 builder.add(exp);
158
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
1305 return parser.success();
cced1c4d3575 only allow TemplateExpressions at end of expr list;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 157
diff changeset
1306 }
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1307 builder.add( RequiredExpr(in) );
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1308 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1309 return parser.success();
9
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1310 }
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1311
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1312 private ExpString SubExpr(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1313 parser.begin();
209
239c8d650028 convert returned arrays to tables for java methods
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 206
diff changeset
1314 if( !parser.match('[') || parser.test("[") || parser.test("=") )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1315 return parser.failure(null);
604
b73f005f3735 table constructor now uses end_of_line as a delimiter
Franklin Schmidt <fschmidt@gmail.com>
parents: 584
diff changeset
1316 Spaces(In.NOTHING);
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1317 ExpString exp = RequiredExpr(In.NOTHING).expr();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1318 RequiredMatch(']');
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1319 Spaces(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1320 return parser.success(exp);
11
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1321 }
b7d7069fee58 add assignment statement and CmdLine
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 9
diff changeset
1322
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1323 private ExpString NameExpr(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1324 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1325 String name = Name(in);
195
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1326 if( name==null )
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1327 return parser.failure(null);
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1328 return parser.success(constExpStr(name));
54
f5b27ef14d73 add OutputStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 51
diff changeset
1329 }
f5b27ef14d73 add OutputStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 51
diff changeset
1330
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1331 private String RequiredName(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1332 parser.begin();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1333 String name = Name(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1334 if( name==null )
139
3b384dc5ca91 replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 137
diff changeset
1335 throw parser.exception("Name expected");
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1336 return parser.success(name);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1337 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1338
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1339 private String Name(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1340 int start = parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1341 if( !NameFirstChar() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1342 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1343 while( NameChar() );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1344 String match = parser.textFrom(start);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1345 if( keywords.contains(match) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1346 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1347 Spaces(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1348 return parser.success(match);
17
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
1349 }
09d41f7490a8 add local variables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 16
diff changeset
1350
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1351 private boolean NameChar() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1352 return NameFirstChar() || Digit();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1353 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1354
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1355 private boolean NameFirstChar() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1356 return parser.inCharRange('a', 'z') || parser.inCharRange('A', 'Z') || parser.match('_');
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1357 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1358
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1359 private void RequiredMatch(char c) throws ParseException {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1360 if( !parser.match(c) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1361 throw parser.exception("'"+c+"' expected");
9
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1362 }
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1363
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1364 private void RequiredMatch(String s) throws ParseException {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1365 if( !parser.match(s) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1366 throw parser.exception("'"+s+"' expected");
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1367 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1368
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1369 private void RequiredKeyword(String keyword,In in) throws ParseException {
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1370 if( !Keyword(keyword,in) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1371 throw parser.exception("'"+keyword+"' expected");
9
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1372 }
600676034a1a add variables and tables
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 8
diff changeset
1373
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1374 private boolean Keyword(String keyword,In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1375 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1376 if( !parser.match(keyword) || NameChar() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1377 return parser.failure();
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1378 Spaces(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1379 return parser.success();
12
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1380 }
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1381
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1382 private static final Set<String> keywords = new HashSet<String>(Arrays.asList(
12
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1383 "and",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1384 "break",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1385 "do",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1386 "else",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1387 "elseif",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1388 "end",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1389 "false",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1390 "for",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1391 "function",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1392 "goto",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1393 "if",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1394 "in",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1395 "local",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1396 "nil",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1397 "not",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1398 "or",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1399 "repeat",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1400 "return",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1401 "then",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1402 "true",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1403 "until",
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1404 "while"
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1405 ));
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1406
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1407 private ExpString Literal(In in) throws ParseException {
645
859c0dedc8b6 remove LuanSource
Franklin Schmidt <fschmidt@gmail.com>
parents: 636
diff changeset
1408 parser.begin();
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1409 if( NilLiteral(in) ) {
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1410 ExpString exp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1411 exp.list.add( "null" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1412 return parser.success(exp);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1413 }
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1414 Boolean b = BooleanLiteral(in);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1415 if( b != null ) {
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1416 ExpString exp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1417 exp.list.add( b.toString() );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1418 return parser.success(exp);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1419 }
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1420 Number n = NumberLiteral(in);
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
1421 if( n != null ) {
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
1422 String s = n.toString();
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
1423 if( n instanceof Long )
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
1424 s += "L";
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1425 ExpString exp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1426 exp.list.add( s );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1427 return parser.success(exp);
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
1428 }
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1429 String s = StringLiteral(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1430 if( s != null )
656
471be4752b9e compiling
Franklin Schmidt <fschmidt@gmail.com>
parents: 655
diff changeset
1431 return parser.success(constExpStr(s));
195
24ede40ee0aa make MetatableGetter DeepCloneable, scoped, and secure
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 193
diff changeset
1432 return parser.failure(null);
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1433 }
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1434
664
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1435 private ExpString constExpStr(String s) {
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1436 s = s
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1437 .replace("\\","\\\\")
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1438 .replace("\"","\\\"")
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1439 .replace("\n","\\n")
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1440 .replace("\r","\\r")
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1441 .replace("\t","\\t")
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1442 .replace("\b","\\b")
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1443 ;
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1444 ExpString exp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1445 exp.list.add( "\""+s+"\"" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1446 return exp;
664
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1447 }
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1448
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1449 private boolean NilLiteral(In in) throws ParseException {
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1450 return Keyword("nil",in);
65
1ff53a88579a multi-line statements
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 60
diff changeset
1451 }
1ff53a88579a multi-line statements
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 60
diff changeset
1452
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1453 private Boolean BooleanLiteral(In in) throws ParseException {
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1454 if( Keyword("true",in) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1455 return true;
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1456 if( Keyword("false",in) )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1457 return false;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1458 return null;
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1459 }
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1460
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1461 private Number NumberLiteral(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1462 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1463 Number n;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1464 if( parser.matchIgnoreCase("0x") ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1465 n = HexNumber();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1466 } else {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1467 n = DecNumber();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1468 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1469 if( n==null || NameChar() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1470 return parser.failure(null);
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1471 Spaces(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1472 return parser.success(n);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1473 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1474
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1475 private Number DecNumber() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1476 int start = parser.begin();
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1477 boolean isInt = true;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1478 if( Int() ) {
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1479 if( parser.match('.') ) {
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1480 isInt = false;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1481 Int(); // optional
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1482 }
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1483 } else if( parser.match('.') && Int() ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1484 // ok
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1485 isInt = false;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1486 } else
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1487 return parser.failure(null);
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1488 if( Exponent() ) // optional
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1489 isInt = false;
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1490 String s = parser.textFrom(start);
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1491 if( isInt ) {
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1492 try {
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1493 return parser.success(Integer.valueOf(s));
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1494 } catch(NumberFormatException e) {}
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1495 try {
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1496 return parser.success(Long.valueOf(s));
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1497 } catch(NumberFormatException e) {}
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1498 }
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1499 return parser.success(Double.valueOf(s));
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1500 }
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1501
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1502 private boolean Exponent() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1503 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1504 if( !parser.matchIgnoreCase("e") )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1505 return parser.failure();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1506 parser.anyOf("+-"); // optional
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1507 if( !Int() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1508 return parser.failure();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1509 return parser.success();
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1510 }
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1511
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1512 private boolean Int() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1513 if( !Digit() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1514 return false;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1515 while( Digit() );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1516 return true;
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1517 }
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1518
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1519 private boolean Digit() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1520 return parser.inCharRange('0', '9');
16
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1521 }
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1522
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1523 private Number HexNumber() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1524 int start = parser.begin();
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1525 long nLong = 0;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1526 double n;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1527 if( HexInt() ) {
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1528 nLong = Long.parseLong(parser.textFrom(start),16);
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1529 n = (double)nLong;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1530 if( parser.match('.') ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1531 start = parser.currentIndex();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1532 if( HexInt() ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1533 String dec = parser.textFrom(start);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1534 n += (double)Long.parseLong(dec,16) / Math.pow(16,dec.length());
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1535 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1536 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1537 } else if( parser.match('.') && HexInt() ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1538 String dec = parser.textFrom(start+1);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1539 n = (double)Long.parseLong(dec,16) / Math.pow(16,dec.length());
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1540 } else {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1541 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1542 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1543 if( parser.matchIgnoreCase("p") ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1544 parser.anyOf("+-"); // optional
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1545 start = parser.currentIndex();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1546 if( !HexInt() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1547 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1548 n *= Math.pow(2,(double)Long.parseLong(parser.textFrom(start)));
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1549 }
535
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1550 if( nLong == n ) {
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1551 int nInt = (int)nLong;
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1552 if( nInt == nLong )
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1553 return parser.success(Integer.valueOf(nInt));
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1554 return parser.success(Long.valueOf(nLong));
289908469e02 parse numeric constants to ints or longs if possible
Franklin Schmidt <fschmidt@gmail.com>
parents: 534
diff changeset
1555 }
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1556 return parser.success(Double.valueOf(n));
16
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1557 }
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1558
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1559 private boolean HexInt() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1560 if( !HexDigit() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1561 return false;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1562 while( HexDigit() );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1563 return true;
16
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1564 }
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1565
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1566
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1567 private boolean HexDigit() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1568 return Digit() || parser.anyOf("abcdefABCDEF");
6
a315783c9524 more parsing
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 5
diff changeset
1569 }
a315783c9524 more parsing
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 5
diff changeset
1570
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1571 private String StringLiteral(In in) throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1572 String s;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1573 if( (s=QuotedString('"'))==null
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1574 && (s=QuotedString('\''))==null
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1575 && (s=LongString())==null
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1576 )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1577 return null;
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1578 Spaces(in);
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1579 return s;
16
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1580 }
2a30281ef47c finish number literals;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 15
diff changeset
1581
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1582 private String LongString() throws ParseException {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1583 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1584 if( !parser.match('[') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1585 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1586 int start = parser.currentIndex();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1587 while( parser.match('=') );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1588 int nEquals = parser.currentIndex() - start;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1589 if( !parser.match('[') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1590 return parser.failure(null);
120
8d7730a5e3b4 move standalone logic from Java to Luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 118
diff changeset
1591 EndOfLine();
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1592 start = parser.currentIndex();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1593 while( !LongBracketsEnd(nEquals) ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1594 if( !parser.anyChar() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1595 throw parser.exception("Unclosed long string");
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1596 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1597 String s = parser.text.substring( start, parser.currentIndex() - nEquals - 2 );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1598 return parser.success(s);
6
a315783c9524 more parsing
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 5
diff changeset
1599 }
a315783c9524 more parsing
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 5
diff changeset
1600
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1601 private String QuotedString(char quote) throws ParseException {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1602 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1603 if( !parser.match(quote) )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1604 return parser.failure(null);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1605 StringBuilder buf = new StringBuilder();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1606 while( !parser.match(quote) ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1607 Character c = EscSeq();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1608 if( c != null ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1609 buf.append(c);
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1610 } else {
271
82a3ebcfbafa add internal tests
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 260
diff changeset
1611 if( parser.test('\r') || parser.test('\n') || !parser.anyChar() )
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1612 throw parser.exception("Unclosed string");
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1613 buf.append(parser.lastChar());
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1614 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1615 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1616 return parser.success(buf.toString());
6
a315783c9524 more parsing
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 5
diff changeset
1617 }
a315783c9524 more parsing
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 5
diff changeset
1618
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1619 private Character EscSeq() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1620 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1621 if( !parser.match('\\') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1622 return parser.failure(null);
155
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1623 if( parser.match('a') ) return parser.success('\u0007');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1624 if( parser.match('b') ) return parser.success('\b');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1625 if( parser.match('f') ) return parser.success('\f');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1626 if( parser.match('n') ) return parser.success('\n');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1627 if( parser.match('r') ) return parser.success('\r');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1628 if( parser.match('t') ) return parser.success('\t');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1629 if( parser.match('v') ) return parser.success('\u000b');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1630 if( parser.match('\\') ) return parser.success('\\');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1631 if( parser.match('"') ) return parser.success('"');
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1632 if( parser.match('\'') ) return parser.success('\'');
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1633 int start = parser.currentIndex();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1634 if( parser.match('x') && HexDigit() && HexDigit() )
155
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1635 return parser.success((char)Integer.parseInt(parser.textFrom(start+1),16));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1636 if( Digit() ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1637 if( Digit() ) Digit(); // optional
155
db7b3902e01c fix parsing problems
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 154
diff changeset
1638 return parser.success((char)Integer.parseInt(parser.textFrom(start)));
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1639 }
271
82a3ebcfbafa add internal tests
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 260
diff changeset
1640 if( EndOfLine() )
82a3ebcfbafa add internal tests
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 260
diff changeset
1641 return parser.success('\n');
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1642 return parser.failure(null);
14
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
1643 }
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
1644
129
486a0641bca4 add pickle client/server;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 128
diff changeset
1645 private void Spaces(In in) throws ParseException {
247
b5995d77878a fix parsing of comments
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 245
diff changeset
1646 while( parser.anyOf(" \t") || Comment() || ContinueOnNextLine() || in.parens && EndOfLine() );
14
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
1647 }
2ddf85634d20 whitespace handling;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 12
diff changeset
1648
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1649 private boolean ContinueOnNextLine() {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1650 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1651 return parser.match('\\') && EndOfLine() ? parser.success() : parser.failure();
7
bca8fc5d928b work on expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 6
diff changeset
1652 }
bca8fc5d928b work on expressions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 6
diff changeset
1653
247
b5995d77878a fix parsing of comments
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 245
diff changeset
1654 private boolean Comment() throws ParseException {
b5995d77878a fix parsing of comments
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 245
diff changeset
1655 if( LongComment() )
b5995d77878a fix parsing of comments
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 245
diff changeset
1656 return true;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1657 if( parser.match("--") ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1658 while( parser.noneOf("\r\n") );
247
b5995d77878a fix parsing of comments
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 245
diff changeset
1659 return true;
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1660 }
247
b5995d77878a fix parsing of comments
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 245
diff changeset
1661 return false;
18
3971113699b8 add NumericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 17
diff changeset
1662 }
3971113699b8 add NumericForStmt
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 17
diff changeset
1663
247
b5995d77878a fix parsing of comments
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 245
diff changeset
1664 private boolean LongComment() throws ParseException {
104
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1665 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1666 if( !parser.match("--[") )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1667 return parser.failure();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1668 int start = parser.currentIndex();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1669 while( parser.match('=') );
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1670 int nEquals = parser.currentIndex() - start;
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1671 if( !parser.match('[') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1672 return parser.failure();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1673 while( !LongBracketsEnd(nEquals) ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1674 if( !parser.anyChar() )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1675 throw parser.exception("Unclosed comment");
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1676 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1677 return parser.success();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1678 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1679
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1680 private boolean LongBracketsEnd(int nEquals) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1681 parser.begin();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1682 if( !parser.match(']') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1683 return parser.failure();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1684 while( nEquals-- > 0 ) {
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1685 if( !parser.match('=') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1686 return parser.failure();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1687 }
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1688 if( !parser.match(']') )
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1689 return parser.failure();
754e6030c029 remove parboiled and rewrite parser;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 99
diff changeset
1690 return parser.success();
12
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1691 }
9cea1aea5eef CmdLine can run files
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 11
diff changeset
1692
648
e387e4021afe start compiler with len operator
Franklin Schmidt <fschmidt@gmail.com>
parents: 645
diff changeset
1693
e387e4021afe start compiler with len operator
Franklin Schmidt <fschmidt@gmail.com>
parents: 645
diff changeset
1694
e387e4021afe start compiler with len operator
Franklin Schmidt <fschmidt@gmail.com>
parents: 645
diff changeset
1695
e387e4021afe start compiler with len operator
Franklin Schmidt <fschmidt@gmail.com>
parents: 645
diff changeset
1696 private static int classCounter = 0;
e387e4021afe start compiler with len operator
Franklin Schmidt <fschmidt@gmail.com>
parents: 645
diff changeset
1697
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1698 private class ExpString {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1699 final List list = new ArrayList();
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1700 final boolean isExpr;
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1701 final boolean isStmt;
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1702
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1703 ExpString(Expressions exp) {
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1704 if( exp==null ) throw new NullPointerException();
664
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1705 int i = LuanImpl.addObj(exp);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1706 list.add( "((Expressions)LuanImpl.getObj(" + i + ")).eval(luan)" );
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1707 isExpr = exp instanceof Expr;
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1708 isStmt = exp instanceof StmtExp;
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1709 }
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1710
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1711 ExpString(boolean isExpr,boolean isStmt) {
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1712 this.isExpr = isExpr;
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1713 this.isStmt = isStmt;
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1714 }
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1715
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1716 ExpString expr() {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1717 if( isExpr )
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1718 return this;
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1719 ExpString exp = new ExpString(true,isStmt);
669
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1720 exp.list.add( "Luan.first(" );
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1721 exp.list.addAll( list );
669
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1722 exp.list.add( ")" );
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1723 return exp;
649
37f0cf43f191 UnaryExpr now compiled
Franklin Schmidt <fschmidt@gmail.com>
parents: 648
diff changeset
1724 }
650
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
1725 }
d658eab7bf4c finish compiling operators
Franklin Schmidt <fschmidt@gmail.com>
parents: 649
diff changeset
1726
654
ea7dbd2dfa65 compile TemplateStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 653
diff changeset
1727 private ExpString expString(List<ExpString> list) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1728 ExpString exp = new ExpString(false,false);
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1729 switch(list.size()) {
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1730 case 0:
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1731 exp.list.add("LuanFunction.NOTHING");
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1732 return exp;
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1733 case 1:
653
538b0ae08faa compile IfStmt and BreakStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 652
diff changeset
1734 return list.get(0);
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1735 default:
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1736 int lastI = list.size() - 1;
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1737 exp.list.add( "new Object[]{" );
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1738 for( int i=0; i<lastI; i++ ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1739 exp.list.addAll( list.get(i).expr().list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1740 exp.list.add( "," );
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1741 }
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1742 ExpString last = list.get(lastI);
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1743 if( last.isExpr ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1744 exp.list.addAll( last.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1745 exp.list.add( "}" );
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1746 } else {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1747 exp.list.add( "}" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1748 exp.list.add( 0, "LuanImpl.concatArgs(" );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1749 exp.list.add( "," );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1750 exp.list.addAll( last.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1751 exp.list.add( ")" );
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1752 }
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1753 return exp;
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1754 }
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1755 }
657
8081713bf7d9 compile literals
Franklin Schmidt <fschmidt@gmail.com>
parents: 656
diff changeset
1756
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
1757 private static class StmtString {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1758 final List list = new ArrayList();
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1759 boolean hasReturn = false;
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
1760 }
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
1761
669
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1762 private static String concat(List list) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1763 StringBuilder sb = new StringBuilder();
669
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1764 for( Object o : list ) {
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1765 if( o instanceof List ) throw new RuntimeException();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1766 if( o instanceof ExpString ) throw new RuntimeException();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1767 if( o instanceof StmtString ) throw new RuntimeException();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1768 sb.append( o.toString() );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1769 }
669
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1770 return sb.toString();
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1771 }
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1772
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1773 private static Class toFnClass(StmtString stmt,int stackSize,int numArgs,boolean isVarArg,UpValue.Getter[] upValueGetters) {
e320488819b6 minor fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 668
diff changeset
1774 String code = concat(stmt.list);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1775 //System.out.println("code:\n"+code);
651
140cc5191b7a start compiling statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 650
diff changeset
1776
664
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1777 int i = LuanImpl.addObj(upValueGetters);
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1778 String className = "EXP" + ++classCounter;
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1779 String classCode = ""
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1780 +"package luan.impl;\n"
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1781 +"import luan.Luan;\n"
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1782 +"import luan.LuanFunction;\n"
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1783 +"import luan.LuanException;\n"
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1784 +"import luan.modules.PackageLuan;\n"
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1785 +"\n"
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
1786 +"public class " + className +" extends Closure {\n"
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
1787 +" public "+className+"(LuanStateImpl luan) throws LuanException {\n"
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
1788 +" super(luan,"+stackSize+","+numArgs+","+isVarArg+",(UpValue.Getter[])LuanImpl.getObj("+i+"));\n"
664
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1789 +" }\n"
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1790 +"\n"
71f8f5075df8 compile FnDef
Franklin Schmidt <fschmidt@gmail.com>
parents: 663
diff changeset
1791 +" @Override public Object run(LuanStateImpl luan) throws LuanException {\n"
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1792 +" Object t;\n"
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1793 +" " + code
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1794 +" }\n"
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1795 +"}\n"
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1796 ;
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1797 try {
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1798 //System.out.println(classCode);
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
1799 return LuanJavaCompiler.compile("luan.impl."+className,"code",classCode);
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1800 } catch(ClassNotFoundException e) {
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1801 throw new RuntimeException(e);
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1802 }
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1803 }
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1804
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1805 private ExpString toFnExpStr(StmtString stmt,int stackSize,int numArgs,boolean isVarArg,UpValue.Getter[] upValueGetters) {
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1806 int i = LuanImpl.addObj(upValueGetters);
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1807 ExpString exp = new ExpString(true,false);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1808 exp.list.add( ""
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1809 +"\n"
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
1810 +"new Closure(luan,"+stackSize+","+numArgs+","+isVarArg+",(UpValue.Getter[])LuanImpl.getObj("+i+")) {\n"
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1811 +" @Override public Object run(LuanStateImpl luan) throws LuanException {\n"
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1812 +" Object t;\n"
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1813 +" "
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1814 );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1815 exp.list.addAll( stmt.list );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1816 exp.list.add( ""
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1817 +" }\n"
667
08966099aa6d implement Closure directly
Franklin Schmidt <fschmidt@gmail.com>
parents: 666
diff changeset
1818 +"}\n"
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1819 );
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1820 return exp;
665
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1821 }
41f8fdbc3a0a compile modules
Franklin Schmidt <fschmidt@gmail.com>
parents: 664
diff changeset
1822
663
b438a47196bc finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents: 662
diff changeset
1823
666
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1824 private static String settableToString(Settable settable) {
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1825 if( settable==null ) throw new NullPointerException();
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1826 int i = LuanImpl.addObj(settable);
2f449ccf54d2 use lists to assemble source
Franklin Schmidt <fschmidt@gmail.com>
parents: 665
diff changeset
1827 return"((Settable)LuanImpl.getObj(" + i + "))";
652
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1828 }
067d9470184d compile SetStmt and ForStmt
Franklin Schmidt <fschmidt@gmail.com>
parents: 651
diff changeset
1829
5
9ef0fd711101 start LuaParser
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1830 }