TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dead code

This commit is contained in:
Oliver Burn 2002-11-09 22:00:17 +00:00
parent ecaaaeb254
commit 4b754899a4
2 changed files with 20 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/checkstyle/com/puppycrawl/tools/checkstyle/Verifier.java
View File

@ -207,35 +207,6 @@ class Verifier
}
/**
* Report the name of the package the file is in.
* @param aName the name of the package
**/
void reportPackageName(LineText aName)
{
}
/**
* Report the location of an import.
* @param aLineNo the line number
* @param aType the type imported
**/
void reportImport(int aLineNo, String aType)
{
}
/**
* Report the location of an import using a ".*".
* @param aLineNo the line number
* @param aPkg the package imported
**/
void reportStarImport(int aLineNo, String aPkg)
{
}
/**
* Report that the parser is entering a block that is associated with a
* class or interface. Must match up the call to this method with a call
@ -281,30 +252,6 @@ class Verifier
mMethodBlockLevel--;
}
/**
* Verify an operator. Checks include that the operator is surrounded by
* whitespace, and that the operator follows the rules about whether to
* be at the end of a line.
* @param aLineNo number of line to check
* @param aColNo column where the text ends
* @param aText the text to check
*/
void verifyOpEnd(int aLineNo, int aColNo, String aText)
{
}
/**
* Verify an operator. Checks include that the operator is surrounded by
* whitespace, and that the operator follows the rules about whether to
* be at the end of a line.
* @param aLineNo number of line to check
* @param aColNo column where the text starts
* @param aText the text to check
*/
void verifyOpBegin(int aLineNo, int aColNo, String aText)
{
}
// }}}
// {{{ Private methods

46
src/checkstyle/com/puppycrawl/tools/checkstyle/java.g
View File

@ -98,7 +98,6 @@ compilationUnit
packageDefinition
options {defaultErrorHandler = true;} // let ANTLR handle errors
: p:"package"^ {#p.setType(PACKAGE_DEF);} identifier SEMI!
{ ver.reportPackageName(sLastIdentifier); }
;
@ -195,11 +194,6 @@ identifierStar
( DOT^ i2:IDENT {str += "." + i2.getText(); } )*
( DOT^ i3:STAR {str += ".*"; star = true; } )?
{
if (star) {
ver.reportStarImport(ln, str);
} else {
ver.reportImport(ln, str);
}
}
;
@ -784,7 +778,7 @@ assignmentExpression
// conditional test (level 12)
conditionalExpression
: logicalOrExpression
( QUESTION^ assignmentExpression c:COLON {ver.verifyOpBegin(c.getLine(), c.getColumn(), c.getText());} conditionalExpression )?
( QUESTION^ assignmentExpression c:COLON conditionalExpression )?
;
@ -848,14 +842,14 @@ shiftExpression
// binary addition/subtraction (level 3)
additiveExpression
: multiplicativeExpression
((p:PLUS^ {ver.verifyOpBegin(p.getLine(), p.getColumn(), p.getText());}| m:MINUS^ {ver.verifyOpBegin(m.getLine(), m.getColumn(), m.getText());} )
((p:PLUS^ | m:MINUS^ )
multiplicativeExpression)*
;
// multiplication/division/modulo (level 2)
multiplicativeExpression
: unaryExpression ((s:STAR^ {ver.verifyOpBegin(s.getLine(), s.getColumn(), s.getText());} | DIV^ | MOD^ ) unaryExpression)*
: unaryExpression ((s:STAR^ | DIV^ | MOD^ ) unaryExpression)*
;
unaryExpression
@ -1082,7 +1076,7 @@ options {
}
// OPERATORS
QUESTION : '?' {ver.verifyOpEnd(getLine(), getColumn(), "?");} ;
QUESTION : '?';
LPAREN : '(';
RPAREN : ')';
LBRACK : '[' ;
@ -1092,11 +1086,11 @@ RCURLY : '}' ;
COLON : ':' ;
COMMA : ',' {ver.verifyWSAfter(getLine(), getColumn() - 1, MyToken.COMMA);} ;
ASSIGN : '=';
EQUAL : "==" {ver.verifyOpEnd(getLine(), getColumn(), "==");} ;
EQUAL : "==";
LNOT : '!' ; // check above
BNOT : '~' ; // check above
NOT_EQUAL : "!=" {ver.verifyOpEnd(getLine(), getColumn(), "!=");};
DIV : '/' {ver.verifyOpEnd(getLine(), getColumn(), "/");} ;
NOT_EQUAL : "!=";
DIV : '/';
DIV_ASSIGN : "/=";
PLUS : '+'; // must handle the UNARY_PLUS
PLUS_ASSIGN : "+=";
@ -1106,26 +1100,26 @@ MINUS_ASSIGN : "-=";
DEC : "--" ; // must handle POST_DEC
STAR : '*' ; // star is special cause it can be used in imports.
STAR_ASSIGN : "*=";
MOD : '%' {ver.verifyOpEnd(getLine(), getColumn(), "%");} ;
MOD : '%';
MOD_ASSIGN : "%=";
SR : ">>" {ver.verifyOpEnd(getLine(), getColumn(), ">>");};
SR : ">>";
SR_ASSIGN : ">>=";
BSR : ">>>" {ver.verifyOpEnd(getLine(), getColumn(), ">>>");};
BSR : ">>>";
BSR_ASSIGN : ">>>=";
GE : ">=" {ver.verifyOpEnd(getLine(), getColumn(), ">=");};
GT : ">" {ver.verifyOpEnd(getLine(), getColumn(), ">");};
SL : "<<" {ver.verifyOpEnd(getLine(), getColumn(), "<<");};
GE : ">=";
GT : ">";
SL : "<<";
SL_ASSIGN : "<<=";
LE : "<=" {ver.verifyOpEnd(getLine(), getColumn(), "<=");};
LT : '<' {ver.verifyOpEnd(getLine(), getColumn(), "<");};
BXOR : '^' {ver.verifyOpEnd(getLine(), getColumn(), "^");};
LE : "<=";
LT : '<';
BXOR : '^';
BXOR_ASSIGN : "^=";
BOR : '|' {ver.verifyOpEnd(getLine(), getColumn(), "|" );};
BOR : '|';
BOR_ASSIGN : "|=";
LOR : "||" {ver.verifyOpEnd(getLine(), getColumn(), "||");};
BAND : '&' {ver.verifyOpEnd(getLine(), getColumn(), "&");};
LOR : "||";
BAND : '&';
BAND_ASSIGN : "&=";
LAND : "&&" {ver.verifyOpEnd(getLine(), getColumn(), "&&");};
LAND : "&&";
SEMI : ';' ;