Mercurial Hosting > luan

annotate core/src/luan/impl/LuanParser.java @ 677:5c85d38659db

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