phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of debugging

Browse Source
This commit is contained in:
Sergey
2017-04-12 10:54:42 -07:00
parent d18b3a0bf8
commit 019b65b6a2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pmd-visualforce/etc/grammar/VfParser.jjt
View File

@ -15,7 +15,7 @@ PARSER_BEGIN(VfParser)
package net.sourceforge.pmd.lang.vf.ast; package net.sourceforge.pmd.lang.vf.ast;
import net.sourceforge.pmd.lang.ast.CharStream; import net.sourceforge.pmd.lang.ast.CharStream;
import net.sourceforge.pmd.lang.vf.ast.TokenMgrError; import net.sourceforge.pmd.lang.ast.TokenMgrError;
public class VfParser { public class VfParser {
@ -250,9 +250,9 @@ PARSER_END(VfParser)
<AttrValueBetweenDoubleQuotesState> TOKEN : <AttrValueBetweenDoubleQuotesState> TOKEN :
{ {
<ENDING_DOUBLE_QUOTE: "\""> : InTagState <ENDING_DOUBLE_QUOTE: "\""> : InTagState
| <EL_EXPRESSION_IN_ATTRIBUTE_DQ: "{!" (<WHITESPACES>)? > : ElAttribTagStateDQ | <EL_EXPRESSION_IN_ATTRIBUTE_DQ: "{!" (<WHITESPACES>)? > : ElAttribTagStateDQ
| <UNPARSED_TEXT_NO_DOUBLE_QUOTES: | <UNPARSED_TEXT_NO_DOUBLE_QUOTES:
( (~["{", "\""]) | (["{"] ~["!", "\""]) )+ > ( (~["{", "\""]) | (["{"] ~["!", "\""]) )+ >
} }

4
pmd-visualforce/src/main/ant/alljavacc.xml
View File

@ -33,8 +33,7 @@
javacchome="${javacc-home.path}" /> javacchome="${javacc-home.path}" />
<!-- Ensure generated using CharStream interface debugparser="true" <!-- Ensure generated using CharStream interface debugparser="true"
debugtokenmanager="true"--> debugtokenmanager="true"-->
<javacc static="false" <javacc static="false"
usercharstream="true" usercharstream="true"
unicodeinput="true" unicodeinput="true"
javaunicodeescape="false" javaunicodeescape="false"
@ -44,6 +43,7 @@
<delete file="${target}/net/sourceforge/pmd/lang/vf/ast/Node.java" /> <delete file="${target}/net/sourceforge/pmd/lang/vf/ast/Node.java" />
<delete file="${target}/net/sourceforge/pmd/lang/vf/ast/SimpleNode.java" /> <delete file="${target}/net/sourceforge/pmd/lang/vf/ast/SimpleNode.java" />
<delete file="${target}/net/sourceforge/pmd/lang/vf/ast/CharStream.java" /> <delete file="${target}/net/sourceforge/pmd/lang/vf/ast/CharStream.java" />
<delete file="${target}/net/sourceforge/pmd/lang/vf/ast/TokenMgrError.java" />
<replace file="${target}/net/sourceforge/pmd/lang/vf/ast/VfParserTokenManager.java" <replace file="${target}/net/sourceforge/pmd/lang/vf/ast/VfParserTokenManager.java"
token="class VfParserTokenManager" token="class VfParserTokenManager"
value="class VfParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" /> value="class VfParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />