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

annotate src/luan/impl/LuanParser.java @ 1496:6c830be6be98

parse fix

author	Franklin Schmidt <fschmidt@gmail.com>
date	Fri, 08 May 2020 10:46:13 -0600
parents	56fb5cd8228d
children	d9a5405a3102

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

Mercurial Hosting > luan

annotate src/luan/impl/LuanParser.java @ 1496:6c830be6be98