Skip to content

Commit

Permalink
#359 use parseCFMLExpression
Browse files Browse the repository at this point in the history
  • Loading branch information
ryaneberly committed Aug 9, 2017
1 parent 68dbdb3 commit c4c2acf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/java/com/cflint/CFLint.java
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ private void process(final Element elem, final String space, final Context conte
final String cfscript = m.group(1).trim();
if(!cfscript.isEmpty()){
try {
final CFExpression expression = cfmlParser.parseCFExpression(cfscript, this);
final CFExpression expression = cfmlParser.parseCFMLExpression(cfscript, this);
if (expression != null) {
process(expression, elem, context);
}
Expand Down Expand Up @@ -569,7 +569,7 @@ private List<CFExpression> unpackTagExpressions(final Element elem) {

List<String> errors = new ArrayList<String>();
ANTLRErrorListener errorReporter = new ArrayErrorListener(errors );
final CFExpression exp = cfmlParser.parseCFExpression(literalChar.get(0) + attr.getValue() + literalChar.get(0), errorReporter);
final CFExpression exp = cfmlParser.parseCFMLExpression(literalChar.get(0) + attr.getValue() + literalChar.get(0), errorReporter);
if(errors.size()==0){
expressions.add(exp);
continue;
Expand All @@ -578,7 +578,7 @@ private List<CFExpression> unpackTagExpressions(final Element elem) {
}
// Try other quotes before reporting a failure
try {
final CFExpression exp = cfmlParser.parseCFExpression(literalChar.get(1) + attr.getValue() + literalChar.get(1), this);
final CFExpression exp = cfmlParser.parseCFMLExpression(literalChar.get(1) + attr.getValue() + literalChar.get(1), this);
expressions.add(exp);
} catch (Exception e2) {
System.err.println("Error in parsing : " + attr.getValue() + " on tag " + elem.getName());
Expand Down

0 comments on commit c4c2acf

Please sign in to comment.