Mercurial Hosting > luan
annotate core/src/luan/impl/ThemeParser.java @ 663:b438a47196bc
finish compiling function blocks
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Thu, 07 Apr 2016 00:01:10 -0600 |
parents | cdc70de628b5 |
children | 71f8f5075df8 |
rev | line source |
---|---|
584 | 1 package luan.impl; |
2 | |
3 import java.util.Map; | |
4 import java.util.HashMap; | |
5 import java.util.List; | |
6 import java.util.ArrayList; | |
635
c83b8cefd922
better error handling in theme code
Franklin Schmidt <fschmidt@gmail.com>
parents:
634
diff
changeset
|
7 import luan.Luan; |
584 | 8 import luan.LuanTable; |
9 import luan.LuanState; | |
10 import luan.LuanFunction; | |
11 import luan.LuanException; | |
12 import luan.modules.PackageLuan; | |
13 | |
14 | |
15 public final class ThemeParser { | |
16 | |
645 | 17 public static LuanFunction compile(LuanState luan,String sourceName,String sourceText) throws LuanException { |
584 | 18 try { |
645 | 19 FnDef fnDef = new ThemeParser(sourceName,sourceText).parse(); |
584 | 20 final LuanStateImpl luanImpl = (LuanStateImpl)luan; |
21 return new Closure(luanImpl,fnDef); | |
22 } catch(ParseException e) { | |
23 //e.printStackTrace(); | |
646
cdc70de628b5
simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents:
645
diff
changeset
|
24 throw new LuanException( e.getFancyMessage() ); |
584 | 25 } |
26 } | |
27 | |
28 private static final class Frame { | |
29 final Frame parent; | |
30 final List<String> symbols = new ArrayList<String>(); | |
31 int stackSize = 0; | |
32 final boolean isVarArg; | |
33 final List<String> upValueSymbols = new ArrayList<String>(); | |
34 final List<UpValue.Getter> upValueGetters = new ArrayList<UpValue.Getter>(); | |
35 | |
36 Frame() { | |
37 this.parent = null; | |
38 isVarArg = true; | |
39 } | |
40 | |
41 Frame(Frame parent) { | |
42 this.parent = parent; | |
43 isVarArg = false; | |
44 if( upValueIndex(MOD) != 0 ) | |
45 throw new RuntimeException(); | |
46 } | |
47 | |
48 int stackIndex(String name) { | |
49 int i = symbols.size(); | |
50 while( --i >= 0 ) { | |
51 if( symbols.get(i).equals(name) ) | |
52 return i; | |
53 } | |
54 return -1; | |
55 } | |
56 | |
57 int upValueIndex(String name) { | |
58 int i = upValueSymbols.size(); | |
59 while( --i >= 0 ) { | |
60 if( upValueSymbols.get(i).equals(name) ) | |
61 return i; | |
62 } | |
63 if( parent==null ) | |
64 return -1; | |
65 i = parent.stackIndex(name); | |
66 if( i != -1 ) { | |
67 upValueGetters.add(new UpValue.StackGetter(i)); | |
68 } else { | |
69 i = parent.upValueIndex(name); | |
70 if( i == -1 ) | |
71 return -1; | |
72 upValueGetters.add(new UpValue.NestedGetter(i)); | |
73 } | |
74 upValueSymbols.add(name); | |
75 return upValueSymbols.size() - 1; | |
76 } | |
77 | |
78 void addUpValueGetter(String name,UpValue.Getter upValueGetter) { | |
79 upValueSymbols.add(name); | |
80 upValueGetters.add(upValueGetter); | |
81 } | |
82 } | |
83 | |
84 private static final String IO = "-IO-"; | |
85 private static final String MOD = "-MOD-"; | |
86 private static final String ENV = "-ENV-"; | |
594 | 87 private static final String INDENT = "-INDENT-"; |
584 | 88 private static final UpValue.Getter[] NO_UP_VALUE_GETTERS = new UpValue.Getter[0]; |
89 | |
645 | 90 // private final LuanSource source; |
584 | 91 private final Parser parser; |
92 private Frame frame = new Frame(); | |
93 | |
645 | 94 private ThemeParser(String sourceName,String sourceText) { |
95 // this.source = source; | |
96 this.parser = new Parser(sourceName,sourceText); | |
584 | 97 } |
98 | |
99 private int symbolsSize() { | |
100 return frame.symbols.size(); | |
101 } | |
102 | |
103 private void addSymbol(String name) { | |
104 frame.symbols.add(name); | |
105 if( frame.stackSize < symbolsSize() ) | |
106 frame.stackSize = symbolsSize(); | |
107 } | |
108 | |
645 | 109 private FnDef newFnDef(Stmt stmt) { |
663
b438a47196bc
finish compiling function blocks
Franklin Schmidt <fschmidt@gmail.com>
parents:
646
diff
changeset
|
110 return new FnDef( /*stmt*/null, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) ); |
584 | 111 } |
112 | |
113 private int stackIndex(String name) { | |
114 return frame.stackIndex(name); | |
115 } | |
116 | |
594 | 117 private void popSymbols(int n) { |
118 List<String> symbols = frame.symbols; | |
119 while( n-- > 0 ) { | |
120 symbols.remove(symbols.size()-1); | |
121 } | |
122 } | |
123 | |
584 | 124 private int upValueIndex(String name) { |
125 return frame.upValueIndex(name); | |
126 } | |
127 | |
128 private ParseException exception(String msg) { | |
129 parser.failure(); | |
130 return parser.exception(msg); | |
131 } | |
132 | |
133 private Expr env() { | |
645 | 134 return new GetLocalVar(stackIndex(ENV)); |
584 | 135 } |
136 | |
137 private FnDef parse() throws ParseException { | |
138 List<Stmt> stmts = new ArrayList<Stmt>(); | |
139 int stackStart = symbolsSize(); | |
140 { | |
141 addSymbol(IO); | |
645 | 142 FnCall requireCall = new FnCall( new ConstExpr(PackageLuan.requireFn), new ConstExpr("luan:Io") ); |
584 | 143 SetStmt setStmt = new SetStmt( new SetLocalVar(stackIndex(IO)), new ExpressionsExpr(requireCall) ); |
144 stmts.add(setStmt); | |
145 } | |
146 { | |
147 addSymbol(MOD); | |
645 | 148 TableExpr.Field indent = new TableExpr.Field(new ConstExpr(INDENT),new ConstExpr("")); |
149 TableExpr tableExpr = new TableExpr( new TableExpr.Field[]{indent}, ExpList.emptyExpList ); | |
584 | 150 SetStmt setStmt = new SetStmt( new SetLocalVar(stackIndex(MOD)), tableExpr ); |
151 stmts.add(setStmt); | |
152 } | |
153 while( !parser.endOfInput() ) { | |
154 Stmt def = parseDef(); | |
155 if( def != null ) { | |
156 stmts.add(def); | |
157 } else { | |
158 parser.anyChar(); | |
159 } | |
160 } | |
645 | 161 stmts.add( new ReturnStmt(new GetLocalVar(stackIndex(MOD))) ); |
584 | 162 Stmt block = new Block( stmts.toArray(new Stmt[0]), stackStart, symbolsSize() ); |
645 | 163 FnDef fnDef = newFnDef(block); |
584 | 164 return fnDef; |
165 } | |
166 | |
167 private Stmt parseDef() throws ParseException { | |
645 | 168 parser.begin(); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
169 if( !parser.match("{define:") ) |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
170 return parser.failure(null); |
594 | 171 String name = parseName(); |
172 if( name==null ) | |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
173 throw parser.exception("invalid block name"); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
174 if( !parser.match('}') ) |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
175 throw parser.exception("unclosed define tag"); |
594 | 176 String spaces = ""; |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
177 boolean indent = BlankLine(); |
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
178 if( indent ) { |
594 | 179 int startSpaces = parser.currentIndex(); |
180 InlineSpaces(); | |
181 spaces = parser.textFrom(startSpaces); | |
182 } | |
645 | 183 Expr table = new GetLocalVar(stackIndex(MOD)); |
184 Settable fnName = new SetTableEntry(table,new ConstExpr(name)); | |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
185 frame = new Frame(frame); |
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
186 addSymbol(ENV); |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
187 Stmt block = parseBody("define:"+name,spaces,indent); |
645 | 188 FnDef fnDef = newFnDef(block); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
189 frame = frame.parent; |
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
190 Stmt rtn = new SetStmt(fnName,fnDef); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
191 return parser.success(rtn); |
584 | 192 } |
193 | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
194 private Stmt parseBody(String tagName,final String spaces,boolean afterIndent) throws ParseException { |
584 | 195 List<Stmt> stmts = new ArrayList<Stmt>(); |
196 int stackStart = symbolsSize(); | |
594 | 197 int start = parser.currentIndex(); |
198 { | |
199 addSymbol(INDENT); | |
200 final Expr env = env(); | |
645 | 201 Expr exp = new ExprImpl() { |
594 | 202 @Override public Object eval(LuanStateImpl luan) throws LuanException { |
635
c83b8cefd922
better error handling in theme code
Franklin Schmidt <fschmidt@gmail.com>
parents:
634
diff
changeset
|
203 Object obj = env.eval(luan); |
c83b8cefd922
better error handling in theme code
Franklin Schmidt <fschmidt@gmail.com>
parents:
634
diff
changeset
|
204 if( !(obj instanceof LuanTable) ) |
646
cdc70de628b5
simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents:
645
diff
changeset
|
205 throw new LuanException("bad argument (table expected, got "+Luan.type(obj)+")"); |
635
c83b8cefd922
better error handling in theme code
Franklin Schmidt <fschmidt@gmail.com>
parents:
634
diff
changeset
|
206 LuanTable tbl = (LuanTable)obj; |
594 | 207 String indent = (String)tbl.get(luan,INDENT); |
208 if( indent==null ) throw new NullPointerException(); | |
209 return indent; | |
210 } | |
211 }; | |
212 // Expr exp = new IndexExpr( se(start,"indent"), env(), new ConstExpr(null,INDENT) ); | |
213 SetStmt setStmt = new SetStmt( new SetLocalVar(stackIndex(INDENT)), exp ); | |
214 stmts.add(setStmt); | |
215 } | |
216 int end = start; | |
217 while( !matchEndTag(tagName) ) { | |
584 | 218 if( parser.endOfInput() ) |
219 throw exception("unclosed block"); | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
220 Stmt block = parseBlock(spaces,afterIndent); |
584 | 221 if( block != null ) { |
594 | 222 addText(start,end,stmts,false); |
223 start = parser.currentIndex(); | |
584 | 224 stmts.add(block); |
594 | 225 afterIndent = false; |
584 | 226 continue; |
227 } | |
594 | 228 { |
229 String extraSpaces = null; | |
230 if( afterIndent ) { | |
231 int startSpaces = parser.currentIndex(); | |
232 InlineSpaces(); | |
233 extraSpaces = parser.textFrom(startSpaces); | |
234 end = parser.currentIndex(); | |
235 } | |
236 Stmt simpleTag = parseSimpleTag(extraSpaces); | |
237 if( simpleTag != null ) { | |
238 addText(start,end,stmts,false); | |
239 start = parser.currentIndex(); | |
240 stmts.add(simpleTag); | |
241 afterIndent = false; | |
242 continue; | |
243 } | |
244 if( extraSpaces!=null && extraSpaces.length() > 0 ) | |
245 continue; | |
246 } | |
247 if( EndOfLine() ) { | |
248 end = parser.currentIndex(); | |
249 afterIndent = false; | |
250 if( parser.match(spaces) ) { | |
251 addText(start,end,stmts,true); | |
252 start = parser.currentIndex(); | |
253 afterIndent = true; | |
254 } | |
584 | 255 continue; |
256 } | |
257 parser.anyChar(); | |
594 | 258 end = parser.currentIndex(); |
259 afterIndent = false; | |
584 | 260 } |
594 | 261 addText(start,end,stmts,false); |
262 Stmt block = new Block( stmts.toArray(new Stmt[0]), stackStart, symbolsSize() ); | |
263 popSymbols(1); | |
584 | 264 return block; |
265 } | |
266 | |
594 | 267 private boolean matchEndTag(String tagName) { |
268 parser.begin(); | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
269 /* |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
270 if( tagName.startsWith("define:") ) |
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
271 EndOfLine(); |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
272 */ |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
273 if( EndOfLine() ) |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
274 InlineSpaces(); |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
275 return parser.match("{/") && parser.match(tagName) && parser.match('}') ? parser.success() : parser.failure(); |
584 | 276 } |
277 | |
594 | 278 private void addText(int start,int end,List<Stmt> stmts,boolean indent) { |
279 List<Expressions> args = new ArrayList<Expressions>(); | |
280 if( start < end ) { | |
281 String text = parser.text.substring(start,end); | |
645 | 282 args.add( new ConstExpr(text) ); |
594 | 283 } |
284 if( indent ) { | |
645 | 285 args.add( new GetLocalVar(stackIndex(INDENT)) ); |
594 | 286 } |
287 if( !args.isEmpty() ) { | |
645 | 288 Expr io = new GetUpVar(upValueIndex(IO)); |
289 Expr stdoutExp = new IndexExpr( io, new ConstExpr("stdout") ); | |
290 Expr writeExp = new IndexExpr( stdoutExp, new ConstExpr("write") ); | |
291 FnCall writeCall = new FnCall( writeExp, ExpList.build(args) ); | |
594 | 292 stmts.add( new ExpressionsStmt(writeCall) ); |
293 } | |
294 } | |
295 | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
296 private Stmt parseBlock(String spaces,boolean afterIndent) throws ParseException { |
645 | 297 parser.begin(); |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
298 String tagSpaces = null; |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
299 if( afterIndent ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
300 tagSpaces = spaces; |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
301 } else if( EndOfLine() ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
302 int startSpaces = parser.currentIndex(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
303 InlineSpaces(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
304 tagSpaces = parser.textFrom(startSpaces); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
305 } |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
306 if( !parser.match("{block:") ) |
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
307 return parser.failure(null); |
594 | 308 String name = parseName(); |
309 if( name==null ) | |
310 throw exception("invalid block name"); | |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
311 if( !parser.match('}') ) |
594 | 312 return null; |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
313 if( tagSpaces != null ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
314 parser.begin(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
315 InlineSpaces(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
316 if( EndOfLine() ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
317 int startSpaces = parser.currentIndex(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
318 InlineSpaces(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
319 String line1Spaces = parser.textFrom(startSpaces); |
608 | 320 if( line1Spaces.startsWith(tagSpaces) ) { |
321 String newSpaces = spaces + line1Spaces.substring(tagSpaces.length()); | |
322 if( line1Spaces.startsWith(newSpaces) ) | |
323 spaces = newSpaces; | |
324 } | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
325 } |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
326 parser.failure(); // rollback |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
327 } |
584 | 328 frame = new Frame(frame); |
329 addSymbol(ENV); | |
594 | 330 Stmt block = parseBody("block:"+name,spaces,false); |
645 | 331 FnDef fnDef = newFnDef(block); |
584 | 332 frame = frame.parent; |
333 // String rtn = "<% env." + tag.name + "(" + (tag.attrs.isEmpty() ? "nil" : table(tag.attrs)) + ",env,function(env) %>" + block + "<% end) %>"; | |
334 Expr env = env(); | |
645 | 335 Expr fn = new IndexExpr( env, new ConstExpr(name) ); |
584 | 336 List<Expressions> args = new ArrayList<Expressions>(); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
337 args.add( env ); |
584 | 338 args.add( fnDef ); |
645 | 339 FnCall fnCall = new FnCall( fn, ExpList.build(args) ); |
584 | 340 Stmt rtn = new ExpressionsStmt(fnCall); |
341 return parser.success(rtn); | |
342 } | |
343 | |
594 | 344 private Stmt parseSimpleTag(String spaces) throws ParseException { |
645 | 345 parser.begin(); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
346 if( !parser.match('{') ) |
584 | 347 return parser.failure(null); |
348 String name = parseName(); | |
349 if( name==null ) | |
350 return parser.failure(null); | |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
351 if( !parser.match('}') ) |
584 | 352 return parser.failure(null); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
353 // rtn = "<% env." + name + (attrs.isEmpty() ? "()" : table(attrs)) + " %>"; |
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
354 Expr env = env(); |
645 | 355 Expr fn = new IndexExpr( env, new ConstExpr(name) ); |
594 | 356 if( spaces!=null && spaces.length() > 0 ) { |
357 final Expr oldEnv = env; | |
645 | 358 final Expr oldIndentExpr = new GetLocalVar(stackIndex(INDENT)); |
594 | 359 final String addSpaces = spaces; |
645 | 360 env = new ExprImpl() { |
594 | 361 @Override public Object eval(LuanStateImpl luan) throws LuanException { |
362 LuanTable mt = new LuanTable(); | |
363 mt.rawPut("__index",oldEnv.eval(luan)); | |
364 LuanTable tbl = new LuanTable(); | |
365 tbl.setMetatable(mt); | |
366 String oldIndent = (String)oldIndentExpr.eval(luan); | |
367 String newIndent = oldIndent + addSpaces; | |
368 tbl.rawPut(INDENT,newIndent); | |
369 return tbl; | |
370 } | |
371 }; | |
372 } | |
645 | 373 FnCall fnCall = new FnCall( fn, env ); |
584 | 374 Stmt rtn = new ExpressionsStmt(fnCall); |
375 return parser.success(rtn); | |
376 } | |
377 | |
594 | 378 private void InlineSpaces() { |
379 while( parser.anyOf(" \t") ); | |
380 } | |
381 | |
382 private boolean BlankLine() { | |
383 parser.begin(); | |
384 while( parser.anyOf(" \t") ); | |
385 return EndOfLine() ? parser.success() : parser.failure(); | |
386 } | |
387 | |
388 private boolean EndOfLine() { | |
389 return parser.match( "\r\n" ) || parser.match( '\r' ) || parser.match( '\n' ); | |
390 } | |
391 | |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
392 private String parseName() throws ParseException { |
584 | 393 int start = parser.begin(); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
394 if( parser.match('/') ) |
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
395 throw exception("bad closing tag"); |
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
396 if( parser.match("define:") ) |
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
397 throw exception("unexpected definition"); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
398 if( !NameChar() ) |
584 | 399 return parser.failure(null); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
400 while( NameChar() ); |
584 | 401 String match = parser.textFrom(start); |
402 return parser.success(match); | |
403 } | |
404 | |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
405 private boolean NameChar() { |
587 | 406 return parser.inCharRange('a', 'z') || parser.inCharRange('A', 'Z') |
634
3dde072c3420
allow "." in theme function name
Franklin Schmidt <fschmidt@gmail.com>
parents:
616
diff
changeset
|
407 || parser.inCharRange('0', '9') || parser.anyOf("-_."); |
584 | 408 } |
409 | |
410 } |