Mercurial Hosting > luan

annotate core/src/luan/impl/LuanParser.java @ 665:41f8fdbc3a0a

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