repo/luan: src/luan/impl/LuanParser.java annotate

annotate src/luan/impl/LuanParser.java @ 1562:b89212fd04b5

remove table.luan

author	Franklin Schmidt <fschmidt@gmail.com>
date	Sun, 08 Nov 2020 16:50:59 -0700
parents	e1a13e707bf3
children	8fbcc4747091

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

Mercurial Hosting > luan

annotate src/luan/impl/LuanParser.java @ 1562:b89212fd04b5