Mercurial Hosting > luan

annotate core/src/luan/impl/LuanParser.java @ 674:2994e46f62b7

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