Repository: freemarker Updated Branches: refs/heads/3 6f1b3ba4f -> b0825190f
Forward ported from 2.3-gae: 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/b0825190 Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/b0825190 Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/b0825190 Branch: refs/heads/3 Commit: b0825190f0113901457ec424428b66a287541336 Parents: 6f1b3ba Author: ddekany <[email protected]> Authored: Fri Mar 30 17:03:56 2018 +0200 Committer: ddekany <[email protected]> Committed: Fri Mar 30 17:03:56 2018 +0200 ---------------------------------------------------------------------- freemarker-core/src/main/javacc/FTL.jj | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/b0825190/freemarker-core/src/main/javacc/FTL.jj ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/javacc/FTL.jj b/freemarker-core/src/main/javacc/FTL.jj index fa29105..f49d76e 100644 --- a/freemarker-core/src/main/javacc/FTL.jj +++ b/freemarker-core/src/main/javacc/FTL.jj @@ -1340,16 +1340,6 @@ TOKEN: if (squBracTagSyntax || postInterpolationLexState != -1 /* We are in an interpolation */) { matchedToken.kind = NATURAL_GT; } else { - if (tagSyntaxEstablished) { - 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); } } @@ -1366,7 +1356,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);
