freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/5] freemarker git commit: Removed unreachable error condition
Date Fri, 30 Mar 2018 18:02:59 GMT
Repository: freemarker
Updated Branches:
  refs/heads/2.3-gae 8e592550e -> ac3c6d2ed


Removed unreachable error condition


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

Branch: refs/heads/2.3-gae
Commit: aba12443417648da09e9a9a38a83ea9a51be167d
Parents: 8e59255
Author: ddekany <ddekany@apache.org>
Authored: Fri Mar 30 17:02:29 2018 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Fri Mar 30 17:02:29 2018 +0200

----------------------------------------------------------------------
 src/main/javacc/FTL.jj | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/freemarker/blob/aba12443/src/main/javacc/FTL.jj
----------------------------------------------------------------------
diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj
index d1ab33d..3d7de81 100644
--- a/src/main/javacc/FTL.jj
+++ b/src/main/javacc/FTL.jj
@@ -1559,17 +1559,6 @@ TOKEN:
         if (squBracTagSyntax || postInterpolationLexState != -1 /* We are in an interpolation
*/) {
             matchedToken.kind = NATURAL_GT;
         } else {
-            if (tagSyntaxEstablished && ( incompatibleImprovements >= _TemplateAPI.VERSION_INT_2_3_28
-                    || interpolationSyntax == SQUARE_BRACKET_INTERPOLATION_SYNTAX)) {
-                if (squBracTagSyntax) {
-                    throw new TokenMgrError(
-                            "The tag shouldn't end with \"" + image.charAt(image.length()
- 1) + "\".",
-                            TokenMgrError.LEXICAL_ERROR,
-                            matchedToken.beginLine, matchedToken.beginColumn,
-                            matchedToken.endLine, matchedToken.endColumn);
-                }
-            }
-        
             SwitchTo(DEFAULT);
         }
     }
@@ -1582,7 +1571,7 @@ TOKEN:
             char lastChar = image.charAt(image.length() - 1);
             if (!squBracTagSyntax && lastChar != '>' || squBracTagSyntax &&
lastChar != ']') {
                 throw new TokenMgrError(
-                        "The tag shouldn't end with \""+ lastChar + "\".",
+                        "The tag shouldn't end with \"" + lastChar + "\".",
                         TokenMgrError.LEXICAL_ERROR,
                         matchedToken.beginLine, matchedToken.beginColumn,
                         matchedToken.endLine, matchedToken.endColumn);


Mime
View raw message