ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Some refactoring and additional comments

Browse source
This commit is contained in:
Ziver Koc 2015-03-25 14:43:14 +00:00
parent 939f99ffb7
commit 237acd8c09
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/zutil/parser/Templator.java
View file

@ -81,7 +81,6 @@ public class Templator {
} }
private TemplateNode parseTemplate(TemplateNode root, String tmpl, MutableInt m, String parentTag){ private TemplateNode parseTemplate(TemplateNode root, String tmpl, MutableInt m, String parentTag){
StringBuilder data = new StringBuilder(); StringBuilder data = new StringBuilder();
StringBuilder tag = new StringBuilder();
boolean tagOpen = false; boolean tagOpen = false;
for(; m.i<tmpl.length(); ++m.i){ for(; m.i<tmpl.length(); ++m.i){
@ -91,8 +90,6 @@ public class Templator {
case "{{": case "{{":
root.add(new TmplStaticString(data.toString())); root.add(new TmplStaticString(data.toString()));
data.delete(0, data.length()); data.delete(0, data.length());
tag.delete(0, data.length());
tag.append("{{");
tagOpen = true; tagOpen = true;
++m.i; ++m.i;
break; break;
@ -105,7 +102,6 @@ public class Templator {
++m.i; ++m.i;
String tagName = data.toString(); String tagName = data.toString();
data.delete(0, data.length()); data.delete(0, data.length());
tag.append(tagName).append("}}");
switch(tagName.charAt(0)) { switch(tagName.charAt(0)) {
case '#': case '#':
++m.i; ++m.i;
@ -113,10 +109,11 @@ public class Templator {
tmpl, m, tagName)); tmpl, m, tagName));
break; break;
case '/': case '/':
// Is this tag closing the parent?
if(parentTag != null && tagName.endsWith(parentTag.substring(1))) if(parentTag != null && tagName.endsWith(parentTag.substring(1)))
return root; return root;
log.severe("Closing non-opened tag: "+tag.toString()); log.severe("Closing non-opened tag: {{"+tagName+"}}");
root.add(new TmplStaticString(tag.toString())); root.add(new TmplStaticString("{{"+tagName+"}}"));
break; break;
default: default:
root.add(new TmplDataAttribute(tagName)); root.add(new TmplDataAttribute(tagName));
@ -129,9 +126,9 @@ public class Templator {
break; break;
} }
} }
if(tagOpen) if(tagOpen) // Incomplete tag, insert it as normal text
data.insert(0, tag); data.insert(0, "{{");
if(data.length() > 0) if(data.length() > 0) // Still some text left, add to node
root.add(new TmplStaticString(data.toString())); root.add(new TmplStaticString(data.toString()));
// If we get to this point means that this node is incorrectly close // If we get to this point means that this node is incorrectly close