#210 Changing var to %{...} as '%' does not belong to a java identifier

Author: ericbn

javalite-templator/src/main/java/org/javalite/templator/TemplateParser.java

@@ -9,15 +9,12 @@
  *
  * <pre>
  * WHITESPACE = Character.isWhitespace()+
- * IDENTIFIER = (Character.isJavaIdentifierStart() excluding '$') Character.isJavaIdentifierPart()*
- * IDENTIFIER_OR_FUNCTION = IDENTIFIER ('(' ')')?
+ * IDENTIFIER = Character.isJavaIdentifierStart() Character.isJavaIdentifierPart()*
+ * IDENTIFIER_OR_FUNCTION = IDENTIFIER ("()")?
  * CHAINED_IDENTIFIERS = IDENTIFIER ('.' IDENTIFIER_OR_FUNCTION)*
- * VAR = '$' '{' CHAINED_IDENTIFIER (WHITESPACE IDENTIFIER)? '}'
+ * VAR = "%{" CHAINED_IDENTIFIER (WHITESPACE IDENTIFIER)? '}'
+ *
  * CONST = .*
- * 
- * TAG_START = '&lt;' '#'
- * TAG_END = '&lt;' '/' '#'
- * LIST_TAG = TAG_START "list" WHITESPACE IDENTIFIER WHITESPACE "as" WHITESPACE IDENTIFIER '&gt;' LIST_TAG_BODY TAG_END "list" '>'
  * </pre>
  *
  * @author Eric Nielsen
@@ -52,8 +49,7 @@ private boolean _whitespace() {
 
     @SuppressWarnings("empty-statement")
     private boolean _identifier() {
-        // Do not accept $ at identifier start. Will someone ever complain about this?
-        if (currentCodePoint == '$' || !Character.isJavaIdentifierStart(currentCodePoint)) { return false; }
+        if (!Character.isJavaIdentifierStart(currentCodePoint)) { return false; }
         while (next() && Character.isJavaIdentifierPart(currentCodePoint));
         return true;
     }
@@ -82,7 +78,7 @@ private boolean _chainedIdentifiers(List<String> identifiers) {
 
     private boolean _var() {
         int startIndex = index;
-        if (currentCodePoint != '$') { return false; }
+        if (currentCodePoint != '%') { return false; }
         if (!(next() && currentCodePoint == '{')) { return false; }
         List<String> identifiers = new ArrayList<String>();
         if (!(next() && _chainedIdentifiers(identifiers))) { return false; }

javalite-templator/src/test/java/org/javalite/templator/TemplateParserSpec.java

@@ -23,35 +23,31 @@ public void shouldParseTextTemplate() throws Exception {
         the(sw.toString()).shouldBeEqual(source);
     }
 
+    private String processAll(List<TemplateNode> nodes, Map values) throws Exception {
+        StringWriter sw = new StringWriter();
+        for (TemplateNode node : nodes) {
+            node.process(values, sw);
+        }
+        return sw.toString();
+    }
+
     @Test
     public void shouldTokenizeTemplate() throws Exception {
         List<TemplateNode> tokens = new TemplateParser(
-                "Hello ${first_name}, your code is <b>${${foo.size()}${invalid()}}</b> ${one.two.three.four}")
+                "Hello %{first_name}, your code is <b>%{%{foo.size()}%{invalid()}}</b> %{one.two.three.four}")
                 .parse();
-        a(tokens.size()).shouldBeEqual(6);
-        Map values = map(
+        the(tokens.size()).shouldBeEqual(6);
+        the(processAll(tokens, map(
                 "first_name", "John",
                 "foo", map(),
-                "one", map("two", map("three", map("four", "five"))));
-        StringWriter sw = new StringWriter();
-        tokens.get(0).process(values, sw);
-        tokens.get(1).process(values, sw);
-        tokens.get(2).process(values, sw);
-        tokens.get(3).process(values, sw);
-        tokens.get(4).process(values, sw);
-        tokens.get(5).process(values, sw);
-        the(sw.toString()).shouldBeEqual("Hello John, your code is <b>${0${invalid()}}</b> five");
+                "one", map("two", map("three", map("four", "five")))
+        ))).shouldBeEqual("Hello John, your code is <b>%{0%{invalid()}}</b> five");
     }
 
     @Test
     public void shouldParseBuiltIn() throws Exception {
-        List<TemplateNode> tokens = new TemplateParser("<b>${article.content esc}</b>").parse();
-        a(tokens.size()).shouldBeEqual(3);
-        Map values = map("article", map("content", "R&B"));
-        StringWriter sw = new StringWriter();
-        tokens.get(0).process(values, sw);
-        tokens.get(1).process(values, sw);
-        tokens.get(2).process(values, sw);
-        the(sw.toString()).shouldBeEqual("<b>R&amp;B</b>");
+        List<TemplateNode> tokens = new TemplateParser("<b>%{article.content esc}</b>").parse();
+        the(tokens.size()).shouldBeEqual(3);
+        the(processAll(tokens, map("article", map("content", "R&B")))).shouldBeEqual("<b>R&amp;B</b>");
     }
 }