freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject freemarker git commit: Reverting most aesthetic renamings in FTL.jj, as those methods are public, and so in theory could be invoked by users.
Date Fri, 30 Mar 2018 20:19:59 GMT
Repository: freemarker
Updated Branches:
  refs/heads/2.3-gae a66e4650a -> b6a3ffe36


Reverting most aesthetic renamings in FTL.jj, as those methods are public, and so in theory
could be invoked by users.


Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/b6a3ffe3
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/b6a3ffe3
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/b6a3ffe3

Branch: refs/heads/2.3-gae
Commit: b6a3ffe36f9eb5bdab9fb5aa0830591c49f40346
Parents: a66e465
Author: ddekany <ddekany@apache.org>
Authored: Fri Mar 30 22:11:00 2018 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Fri Mar 30 22:11:00 2018 +0200

----------------------------------------------------------------------
 src/main/javacc/FTL.jj | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/freemarker/blob/b6a3ffe3/src/main/javacc/FTL.jj
----------------------------------------------------------------------
diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj
index 3d7de81..0946661 100644
--- a/src/main/javacc/FTL.jj
+++ b/src/main/javacc/FTL.jj
@@ -1658,10 +1658,11 @@ Expression Expression() :
 }
 
 /**
+ * Should be called HighestPrecedenceExpression.
  * Deals with the operators that have the highest precedence. Also deals with `exp!default`
and `exp!`, due to parser
  * tricks needed because of the last.
  */
-Expression HighestPrecedenceExpression() :
+Expression PrimaryExpression() :
 {
     Expression exp;
 }
@@ -1734,9 +1735,10 @@ Expression Parenthesis() :
 }
 
 /**
+ * Should be called UnaryPrefixExpression.
  * A primary expression preceded by zero or more unary prefix operators.
  */
-Expression UnaryPrefixExpression() :
+Expression UnaryExpression() :
 {
     Expression exp, result;
     boolean haveNot = false;
@@ -1748,7 +1750,7 @@ Expression UnaryPrefixExpression() :
         |
         result = NotExpression()
         |
-        result = HighestPrecedenceExpression()
+        result = PrimaryExpression()
     )
     {
         return result;
@@ -1765,7 +1767,7 @@ Expression NotExpression() :
     (
         t = <EXCLAM> { nots.add(t); }
     )+
-    exp = HighestPrecedenceExpression()
+    exp = PrimaryExpression()
     {
         for (int i = 0; i < nots.size(); i++) {
             result = new NotExpression(exp);
@@ -1789,7 +1791,7 @@ Expression UnaryPlusMinusExpression() :
         |
         t = <MINUS> { isMinus = true; }
     )
-    exp = HighestPrecedenceExpression()
+    exp = PrimaryExpression()
     {
         result = new UnaryPlusMinusExpression(exp, isMinus);  
         result.setLocation(template, t, exp);
@@ -1843,7 +1845,7 @@ Expression MultiplicativeExpression() :
     int operation = ArithmeticExpression.TYPE_MULTIPLICATION;
 }
 {
-    lhs = UnaryPrefixExpression() { result = lhs; }
+    lhs = UnaryExpression() { result = lhs; }
     (
         LOOKAHEAD(<TIMES>|<DIVIDE>|<PERCENT>)
         (
@@ -1855,7 +1857,7 @@ Expression MultiplicativeExpression() :
                 <PERCENT> {operation = ArithmeticExpression.TYPE_MODULO; }
             )
         )
-        rhs = UnaryPrefixExpression()
+        rhs = UnaryExpression()
         {
             numberLiteralOnly(lhs);
             numberLiteralOnly(rhs);
@@ -2442,9 +2444,9 @@ HashLiteral HashLiteral() :
 }
 
 /**
- * A production representing the ${...} or [=...] that outputs a variable.
+ * A production representing the ${...} or [=...] that outputs a variable; should be called
NormalInterpolation.
  */
-DollarVariable NormalInterpolation() :
+DollarVariable StringOutput() :
 {
     Expression exp;
     Token begin, end;
@@ -2476,7 +2478,8 @@ DollarVariable NormalInterpolation() :
     }
 }
 
-NumericalOutput NumericalInterpolation() :
+/** Should be called NumericalInterpolation */
+NumericalOutput NumericalOutput() :
 {
     Expression exp;
     Token fmt = null, begin, end;
@@ -4177,9 +4180,9 @@ TemplateElements MixedContentElements() :
         (
             elem = PCData()
             |
-            elem = NormalInterpolation()
+            elem = StringOutput()
             |
-            elem = NumericalInterpolation()
+            elem = NumericalOutput()
             |
             elem = FreemarkerDirective()
         )
@@ -4223,9 +4226,9 @@ MixedContent MixedContent() :
         (
             elem = PCData()
             |
-            elem = NormalInterpolation()
+            elem = StringOutput()
             |
-            elem = NumericalInterpolation()
+            elem = NumericalOutput()
             |
             elem = FreemarkerDirective()
         )
@@ -4280,9 +4283,9 @@ TemplateElement FreeMarkerText() :
         (
             elem = PCData()
             |
-            elem = NormalInterpolation()
+            elem = StringOutput()
             |
-            elem = NumericalInterpolation()
+            elem = NumericalOutput()
         )
         {
             if (begin == null) {
@@ -4532,12 +4535,12 @@ List<Object> StaticTextAndInterpolations() :
 	    (
 	        LOOKAHEAD(<DOLLAR_INTERPOLATION_OPENING>|<SQUARE_BRACKET_INTERPOLATION_OPENING>)
 		    (
-		        interpolation = NormalInterpolation()
+		        interpolation = StringOutput()
 	        )
 		    |
             LOOKAHEAD(<HASH_INTERPOLATION_OPENING>)
 		    (
-                interpolation = NumericalInterpolation()
+                interpolation = NumericalOutput()
 		    )
 	    )
 	    {


Mime
View raw message