Mercurial Hosting > luan
annotate core/src/luan/impl/ThemeParser.java @ 664:71f8f5075df8
compile FnDef
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Thu, 07 Apr 2016 15:11:52 -0600 |
parents | b438a47196bc |
children | 08966099aa6d |
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) { |
664 | 110 // return new FnDef( /*stmt*/null, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) ); |
111 return null; | |
584 | 112 } |
113 | |
114 private int stackIndex(String name) { | |
115 return frame.stackIndex(name); | |
116 } | |
117 | |
594 | 118 private void popSymbols(int n) { |
119 List<String> symbols = frame.symbols; | |
120 while( n-- > 0 ) { | |
121 symbols.remove(symbols.size()-1); | |
122 } | |
123 } | |
124 | |
584 | 125 private int upValueIndex(String name) { |
126 return frame.upValueIndex(name); | |
127 } | |
128 | |
129 private ParseException exception(String msg) { | |
130 parser.failure(); | |
131 return parser.exception(msg); | |
132 } | |
133 | |
134 private Expr env() { | |
645 | 135 return new GetLocalVar(stackIndex(ENV)); |
584 | 136 } |
137 | |
138 private FnDef parse() throws ParseException { | |
139 List<Stmt> stmts = new ArrayList<Stmt>(); | |
140 int stackStart = symbolsSize(); | |
141 { | |
142 addSymbol(IO); | |
645 | 143 FnCall requireCall = new FnCall( new ConstExpr(PackageLuan.requireFn), new ConstExpr("luan:Io") ); |
584 | 144 SetStmt setStmt = new SetStmt( new SetLocalVar(stackIndex(IO)), new ExpressionsExpr(requireCall) ); |
145 stmts.add(setStmt); | |
146 } | |
147 { | |
148 addSymbol(MOD); | |
645 | 149 TableExpr.Field indent = new TableExpr.Field(new ConstExpr(INDENT),new ConstExpr("")); |
150 TableExpr tableExpr = new TableExpr( new TableExpr.Field[]{indent}, ExpList.emptyExpList ); | |
584 | 151 SetStmt setStmt = new SetStmt( new SetLocalVar(stackIndex(MOD)), tableExpr ); |
152 stmts.add(setStmt); | |
153 } | |
154 while( !parser.endOfInput() ) { | |
155 Stmt def = parseDef(); | |
156 if( def != null ) { | |
157 stmts.add(def); | |
158 } else { | |
159 parser.anyChar(); | |
160 } | |
161 } | |
645 | 162 stmts.add( new ReturnStmt(new GetLocalVar(stackIndex(MOD))) ); |
584 | 163 Stmt block = new Block( stmts.toArray(new Stmt[0]), stackStart, symbolsSize() ); |
645 | 164 FnDef fnDef = newFnDef(block); |
584 | 165 return fnDef; |
166 } | |
167 | |
168 private Stmt parseDef() throws ParseException { | |
645 | 169 parser.begin(); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
170 if( !parser.match("{define:") ) |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
171 return parser.failure(null); |
594 | 172 String name = parseName(); |
173 if( name==null ) | |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
174 throw parser.exception("invalid block name"); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
175 if( !parser.match('}') ) |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
176 throw parser.exception("unclosed define tag"); |
594 | 177 String spaces = ""; |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
178 boolean indent = BlankLine(); |
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
179 if( indent ) { |
594 | 180 int startSpaces = parser.currentIndex(); |
181 InlineSpaces(); | |
182 spaces = parser.textFrom(startSpaces); | |
183 } | |
645 | 184 Expr table = new GetLocalVar(stackIndex(MOD)); |
185 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
|
186 frame = new Frame(frame); |
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
187 addSymbol(ENV); |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
188 Stmt block = parseBody("define:"+name,spaces,indent); |
645 | 189 FnDef fnDef = newFnDef(block); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
190 frame = frame.parent; |
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
191 Stmt rtn = new SetStmt(fnName,fnDef); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
192 return parser.success(rtn); |
584 | 193 } |
194 | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
195 private Stmt parseBody(String tagName,final String spaces,boolean afterIndent) throws ParseException { |
584 | 196 List<Stmt> stmts = new ArrayList<Stmt>(); |
197 int stackStart = symbolsSize(); | |
594 | 198 int start = parser.currentIndex(); |
199 { | |
200 addSymbol(INDENT); | |
201 final Expr env = env(); | |
645 | 202 Expr exp = new ExprImpl() { |
594 | 203 @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
|
204 Object obj = env.eval(luan); |
c83b8cefd922
better error handling in theme code
Franklin Schmidt <fschmidt@gmail.com>
parents:
634
diff
changeset
|
205 if( !(obj instanceof LuanTable) ) |
646
cdc70de628b5
simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents:
645
diff
changeset
|
206 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
|
207 LuanTable tbl = (LuanTable)obj; |
594 | 208 String indent = (String)tbl.get(luan,INDENT); |
209 if( indent==null ) throw new NullPointerException(); | |
210 return indent; | |
211 } | |
212 }; | |
213 // Expr exp = new IndexExpr( se(start,"indent"), env(), new ConstExpr(null,INDENT) ); | |
214 SetStmt setStmt = new SetStmt( new SetLocalVar(stackIndex(INDENT)), exp ); | |
215 stmts.add(setStmt); | |
216 } | |
217 int end = start; | |
218 while( !matchEndTag(tagName) ) { | |
584 | 219 if( parser.endOfInput() ) |
220 throw exception("unclosed block"); | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
221 Stmt block = parseBlock(spaces,afterIndent); |
584 | 222 if( block != null ) { |
594 | 223 addText(start,end,stmts,false); |
224 start = parser.currentIndex(); | |
584 | 225 stmts.add(block); |
594 | 226 afterIndent = false; |
584 | 227 continue; |
228 } | |
594 | 229 { |
230 String extraSpaces = null; | |
231 if( afterIndent ) { | |
232 int startSpaces = parser.currentIndex(); | |
233 InlineSpaces(); | |
234 extraSpaces = parser.textFrom(startSpaces); | |
235 end = parser.currentIndex(); | |
236 } | |
237 Stmt simpleTag = parseSimpleTag(extraSpaces); | |
238 if( simpleTag != null ) { | |
239 addText(start,end,stmts,false); | |
240 start = parser.currentIndex(); | |
241 stmts.add(simpleTag); | |
242 afterIndent = false; | |
243 continue; | |
244 } | |
245 if( extraSpaces!=null && extraSpaces.length() > 0 ) | |
246 continue; | |
247 } | |
248 if( EndOfLine() ) { | |
249 end = parser.currentIndex(); | |
250 afterIndent = false; | |
251 if( parser.match(spaces) ) { | |
252 addText(start,end,stmts,true); | |
253 start = parser.currentIndex(); | |
254 afterIndent = true; | |
255 } | |
584 | 256 continue; |
257 } | |
258 parser.anyChar(); | |
594 | 259 end = parser.currentIndex(); |
260 afterIndent = false; | |
584 | 261 } |
594 | 262 addText(start,end,stmts,false); |
263 Stmt block = new Block( stmts.toArray(new Stmt[0]), stackStart, symbolsSize() ); | |
264 popSymbols(1); | |
584 | 265 return block; |
266 } | |
267 | |
594 | 268 private boolean matchEndTag(String tagName) { |
269 parser.begin(); | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
270 /* |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
271 if( tagName.startsWith("define:") ) |
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
272 EndOfLine(); |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
273 */ |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
274 if( EndOfLine() ) |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
275 InlineSpaces(); |
600
b926e53910dd
change theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
595
diff
changeset
|
276 return parser.match("{/") && parser.match(tagName) && parser.match('}') ? parser.success() : parser.failure(); |
584 | 277 } |
278 | |
594 | 279 private void addText(int start,int end,List<Stmt> stmts,boolean indent) { |
280 List<Expressions> args = new ArrayList<Expressions>(); | |
281 if( start < end ) { | |
282 String text = parser.text.substring(start,end); | |
645 | 283 args.add( new ConstExpr(text) ); |
594 | 284 } |
285 if( indent ) { | |
645 | 286 args.add( new GetLocalVar(stackIndex(INDENT)) ); |
594 | 287 } |
288 if( !args.isEmpty() ) { | |
645 | 289 Expr io = new GetUpVar(upValueIndex(IO)); |
290 Expr stdoutExp = new IndexExpr( io, new ConstExpr("stdout") ); | |
291 Expr writeExp = new IndexExpr( stdoutExp, new ConstExpr("write") ); | |
292 FnCall writeCall = new FnCall( writeExp, ExpList.build(args) ); | |
594 | 293 stmts.add( new ExpressionsStmt(writeCall) ); |
294 } | |
295 } | |
296 | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
297 private Stmt parseBlock(String spaces,boolean afterIndent) throws ParseException { |
645 | 298 parser.begin(); |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
299 String tagSpaces = null; |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
300 if( afterIndent ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
301 tagSpaces = spaces; |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
302 } else if( EndOfLine() ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
303 int startSpaces = parser.currentIndex(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
304 InlineSpaces(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
305 tagSpaces = parser.textFrom(startSpaces); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
306 } |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
307 if( !parser.match("{block:") ) |
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
308 return parser.failure(null); |
594 | 309 String name = parseName(); |
310 if( name==null ) | |
311 throw exception("invalid block name"); | |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
312 if( !parser.match('}') ) |
594 | 313 return null; |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
314 if( tagSpaces != null ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
315 parser.begin(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
316 InlineSpaces(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
317 if( EndOfLine() ) { |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
318 int startSpaces = parser.currentIndex(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
319 InlineSpaces(); |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
320 String line1Spaces = parser.textFrom(startSpaces); |
608 | 321 if( line1Spaces.startsWith(tagSpaces) ) { |
322 String newSpaces = spaces + line1Spaces.substring(tagSpaces.length()); | |
323 if( line1Spaces.startsWith(newSpaces) ) | |
324 spaces = newSpaces; | |
325 } | |
607
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
326 } |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
327 parser.failure(); // rollback |
c5ad80f869da
improve theming indentation
Franklin Schmidt <fschmidt@gmail.com>
parents:
600
diff
changeset
|
328 } |
584 | 329 frame = new Frame(frame); |
330 addSymbol(ENV); | |
594 | 331 Stmt block = parseBody("block:"+name,spaces,false); |
645 | 332 FnDef fnDef = newFnDef(block); |
584 | 333 frame = frame.parent; |
334 // String rtn = "<% env." + tag.name + "(" + (tag.attrs.isEmpty() ? "nil" : table(tag.attrs)) + ",env,function(env) %>" + block + "<% end) %>"; | |
335 Expr env = env(); | |
645 | 336 Expr fn = new IndexExpr( env, new ConstExpr(name) ); |
584 | 337 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
|
338 args.add( env ); |
584 | 339 args.add( fnDef ); |
645 | 340 FnCall fnCall = new FnCall( fn, ExpList.build(args) ); |
584 | 341 Stmt rtn = new ExpressionsStmt(fnCall); |
342 return parser.success(rtn); | |
343 } | |
344 | |
594 | 345 private Stmt parseSimpleTag(String spaces) throws ParseException { |
645 | 346 parser.begin(); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
347 if( !parser.match('{') ) |
584 | 348 return parser.failure(null); |
349 String name = parseName(); | |
350 if( name==null ) | |
351 return parser.failure(null); | |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
352 if( !parser.match('}') ) |
584 | 353 return parser.failure(null); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
354 // 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
|
355 Expr env = env(); |
645 | 356 Expr fn = new IndexExpr( env, new ConstExpr(name) ); |
594 | 357 if( spaces!=null && spaces.length() > 0 ) { |
358 final Expr oldEnv = env; | |
645 | 359 final Expr oldIndentExpr = new GetLocalVar(stackIndex(INDENT)); |
594 | 360 final String addSpaces = spaces; |
645 | 361 env = new ExprImpl() { |
594 | 362 @Override public Object eval(LuanStateImpl luan) throws LuanException { |
363 LuanTable mt = new LuanTable(); | |
364 mt.rawPut("__index",oldEnv.eval(luan)); | |
365 LuanTable tbl = new LuanTable(); | |
366 tbl.setMetatable(mt); | |
367 String oldIndent = (String)oldIndentExpr.eval(luan); | |
368 String newIndent = oldIndent + addSpaces; | |
369 tbl.rawPut(INDENT,newIndent); | |
370 return tbl; | |
371 } | |
372 }; | |
373 } | |
645 | 374 FnCall fnCall = new FnCall( fn, env ); |
584 | 375 Stmt rtn = new ExpressionsStmt(fnCall); |
376 return parser.success(rtn); | |
377 } | |
378 | |
594 | 379 private void InlineSpaces() { |
380 while( parser.anyOf(" \t") ); | |
381 } | |
382 | |
383 private boolean BlankLine() { | |
384 parser.begin(); | |
385 while( parser.anyOf(" \t") ); | |
386 return EndOfLine() ? parser.success() : parser.failure(); | |
387 } | |
388 | |
389 private boolean EndOfLine() { | |
390 return parser.match( "\r\n" ) || parser.match( '\r' ) || parser.match( '\n' ); | |
391 } | |
392 | |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
393 private String parseName() throws ParseException { |
584 | 394 int start = parser.begin(); |
616
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
395 if( parser.match('/') ) |
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
396 throw exception("bad closing tag"); |
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
397 if( parser.match("define:") ) |
56b0b9018319
improve ThemeParser error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
608
diff
changeset
|
398 throw exception("unexpected definition"); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
399 if( !NameChar() ) |
584 | 400 return parser.failure(null); |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
401 while( NameChar() ); |
584 | 402 String match = parser.textFrom(start); |
403 return parser.success(match); | |
404 } | |
405 | |
593
92c9fa5e39e6
remove theme "Get" and "Set", and add "define"
Franklin Schmidt <fschmidt@gmail.com>
parents:
587
diff
changeset
|
406 private boolean NameChar() { |
587 | 407 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
|
408 || parser.inCharRange('0', '9') || parser.anyOf("-_."); |
584 | 409 } |
410 | |
411 } |