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

annotate src/luan/impl/LuanParser.java @ 1267:9fa8b8389578

add LuanTable.luan; support metatable __gc(); add luan.sql;

author	Franklin Schmidt <fschmidt@gmail.com>
date	Mon, 12 Nov 2018 02:10:41 -0700
parents	ba4daf107e07
children	f41919741100

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

Mercurial Hosting > luan

annotate src/luan/impl/LuanParser.java @ 1267:9fa8b8389578