From: <js...@us...> - 2006-12-04 18:10:11
|
Revision: 37 http://svn.sourceforge.net/jcontracts/?rev=37&view=rev Author: jstuyts Date: 2006-12-04 10:10:07 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Removed unnecessary code. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java trunk/source/java/net/sf/jcontracts/codeparser/Method.java trunk/source/java/net/sf/jcontracts/codeparser/Parser.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/Darwin.java trunk/source/java/net/sf/jcontracts/icontract/Interface.java trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java trunk/source/java/net/sf/jcontracts/icontract/Method.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java 2006-12-04 18:10:07 UTC (rev 37) @@ -118,6 +118,4 @@ private int len; private CharScanner lexer; - - private static final int prime = 151; } Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -1750,87 +1750,70 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp = super._returnToken; break; case 47: // '/' mCOMMENT(true); - Token _tmp1 = super._returnToken; break; case 63: // '?' mQUESTION(true); - Token _tmp2 = super._returnToken; break; case 35: // '#' mTREE_BEGIN(true); - Token _tmp3 = super._returnToken; break; case 40: // '(' mLPAREN(true); - Token _tmp4 = super._returnToken; break; case 41: // ')' mRPAREN(true); - Token _tmp5 = super._returnToken; break; case 58: // ':' mCOLON(true); - Token _tmp6 = super._returnToken; break; case 42: // '*' mSTAR(true); - Token _tmp7 = super._returnToken; break; case 43: // '+' mPLUS(true); - Token _tmp8 = super._returnToken; break; case 59: // ';' mSEMI(true); - Token _tmp9 = super._returnToken; break; case 94: // '^' mCARET(true); - Token _tmp10 = super._returnToken; break; case 33: // '!' mBANG(true); - Token _tmp11 = super._returnToken; break; case 124: // '|' mOR(true); - Token _tmp12 = super._returnToken; break; case 126: // '~' mNOT_OP(true); - Token _tmp13 = super._returnToken; break; case 125: // '}' mRCURLY(true); - Token _tmp14 = super._returnToken; break; case 39: // '\'' mCHAR_LITERAL(true); - Token _tmp15 = super._returnToken; break; case 34: // '"' mSTRING_LITERAL(true); - Token _tmp16 = super._returnToken; break; case 48: // '0' @@ -1844,17 +1827,14 @@ case 56: // '8' case 57: // '9' mINT(true); - Token _tmp17 = super._returnToken; break; case 91: // '[' mARG_ACTION(true); - Token _tmp18 = super._returnToken; break; case 123: // '{' mACTION(true); - Token _tmp19 = super._returnToken; break; case 65: // 'A' @@ -1884,7 +1864,6 @@ case 89: // 'Y' case 90: // 'Z' mTOKEN_REF(true); - Token _tmp20 = super._returnToken; break; case 97: // 'a' @@ -1914,37 +1893,31 @@ case 121: // 'y' case 122: // 'z' mRULE_REF(true); - Token _tmp21 = super._returnToken; break; case 45: // '-' mTREE_SPECIFIER(true); - Token _tmp22 = super._returnToken; break; default: if (super.la_1 == '=' && super.la_2 == '>') { mIMPLIES(true); - Token _tmp23 = super._returnToken; break; } if (super.la_1 == '.' && super.la_2 == '.') { mRANGE(true); - Token _tmp24 = super._returnToken; break; } if (super.la_1 == '=') { mASSIGN(true); - Token _tmp25 = super._returnToken; break; } if (super.la_1 == '.') { mWILDCARD(true); - Token _tmp26 = super._returnToken; break; } if (LA(1) != '\uFFFF') Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java 2006-12-04 18:10:07 UTC (rev 37) @@ -1673,8 +1673,6 @@ public static final String version = "2.20b7"; - private static final boolean DEBUG_PARSER = false; - ANTLRGrammarParseBehavior behavior; Tool tool; Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -798,27 +798,22 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp = super._returnToken; break; case 40: // '(' mLPAREN(true); - Token _tmp1 = super._returnToken; break; case 41: // ')' mRPAREN(true); - Token _tmp2 = super._returnToken; break; case 61: // '=' mASSIGN(true); - Token _tmp3 = super._returnToken; break; case 34: // '"' mSTRING(true); - Token _tmp4 = super._returnToken; break; case 65: // 'A' @@ -874,7 +869,6 @@ case 121: // 'y' case 122: // 'z' mID(true); - Token _tmp5 = super._returnToken; break; case 48: // '0' @@ -888,20 +882,17 @@ case 56: // '8' case 57: // '9' mINT(true); - Token _tmp6 = super._returnToken; break; default: if (super.la_1 == '/' && super.la_2 == '/') { mSL_COMMENT(true); - Token _tmp7 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*') { mML_COMMENT(true); - Token _tmp8 = super._returnToken; break; } if (LA(1) != '\uFFFF') Modified: trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java 2006-12-04 18:10:07 UTC (rev 37) @@ -301,7 +301,6 @@ { ActionLexer lexer = new ActionLexer(actionStr, currentRule, this, tInfo); lexer.setLineOffset(line); - lexer.setTool(tool); try { lexer.mACTION(true); @@ -414,6 +413,4 @@ protected int bitsetTestThreshold; - private static boolean OLD_ACTION_TRANSLATOR = true; - } Modified: trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java 2006-12-04 18:10:07 UTC (rev 37) @@ -449,7 +449,6 @@ for (int i = 0; i < blk.alternatives.size(); i++) { Alternative alt = blk.getAlternativeAt(i); - AlternativeElement _tmp = alt.head; println(""); if (i != 0) { Modified: trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 18:10:07 UTC (rev 37) @@ -80,8 +80,6 @@ } } - private int dummy; - private String filename; private boolean noDefine; Modified: trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -492,7 +492,6 @@ match('#'); super.text.setLength(_saveIndex); mTREE(true); - Token _tmp = super._returnToken; } else if(super.la_1 == '#' && _tokenSet_2.member(super.la_2)) { @@ -519,7 +518,6 @@ match('#'); super.text.setLength(_saveIndex); mAST_CONSTRUCTOR(true); - Token _tmp1 = super._returnToken; } else if(super.la_1 == '#' && super.la_2 == '#') { @@ -1840,7 +1838,6 @@ int _begin = super.text.length(); int _ttype = 15; mID(true); - Token _tmp = super._returnToken; if(_tokenSet_3.member(super.la_1) && _tokenSet_14.member(super.la_2)) { int _saveIndex = super.text.length(); @@ -2272,7 +2269,6 @@ if(super.la_1 == '=' && _tokenSet_5.member(super.la_2)) { match('='); - char _tmp = super.la_1; matchNot('='); if(transInfo != null && transInfo.refRuleRoot != null) { @@ -2346,7 +2342,6 @@ try { mACTION(true); - Token _tmp = super._returnToken; _ttype = super._returnToken.getType(); if(_ttype != -1) { @@ -2372,15 +2367,9 @@ setLine(lineOffset); } - public void setTool(Tool tool) - { - this.tool = tool; - } - protected RuleBlock currentRule; protected CodeGenerator generator; protected int lineOffset; - private Tool tool; ActionTransInfo transInfo; private static final long _tokenSet_0_data_[] = { 0xffff7f63fffffbf8L, 0x7fffffffffffffffL, 0L, 0L Modified: trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,8 +5,6 @@ package net.sf.jcontracts.antlr.collections; -import java.io.PrintStream; - import net.sf.jcontracts.antlr.collections.impl.BitSet; public class BitSetTest Modified: trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,7 +5,6 @@ package net.sf.jcontracts.antlr.collections; -import java.io.PrintStream; import java.util.Enumeration; import net.sf.jcontracts.antlr.collections.impl.LList; Modified: trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,7 +5,6 @@ package net.sf.jcontracts.antlr.collections; -import java.io.PrintStream; import java.util.Enumeration; import java.util.NoSuchElementException; Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -1727,47 +1727,38 @@ { case 58: // ':' mRULE_BLOCK(true); - Token _tmp = super._returnToken; break; case 40: // '(' mSUBRULE_BLOCK(true); - Token _tmp1 = super._returnToken; break; case 47: // '/' mCOMMENT(true); - Token _tmp2 = super._returnToken; break; case 123: // '{' mACTION(true); - Token _tmp3 = super._returnToken; break; case 34: // '"' mSTRING_LITERAL(true); - Token _tmp4 = super._returnToken; break; case 39: // '\'' mCHAR_LITERAL(true); - Token _tmp5 = super._returnToken; break; case 33: // '!' mBANG(true); - Token _tmp6 = super._returnToken; break; case 59: // ';' mSEMI(true); - Token _tmp7 = super._returnToken; break; case 125: // '}' mRCURLY(true); - Token _tmp8 = super._returnToken; break; case 65: // 'A' @@ -1824,7 +1815,6 @@ case 121: // 'y' case 122: // 'z' mID_OR_KEYWORD(true); - Token _tmp9 = super._returnToken; break; case 9: // '\t' @@ -1832,17 +1822,14 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp10 = super._returnToken; break; case 61: // '=' mASSIGN_RHS(true); - Token _tmp11 = super._returnToken; break; case 91: // '[' mARG_ACTION(true); - Token _tmp12 = super._returnToken; break; default: Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java 2006-12-04 18:10:07 UTC (rev 37) @@ -7,7 +7,6 @@ import java.io.FileNotFoundException; import java.io.IOException; -import java.io.PrintStream; import java.util.Enumeration; import net.sf.jcontracts.antlr.collections.impl.Vector; Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -612,17 +612,14 @@ { case 44: // ',' mCOMMA(true); - Token _tmp = super._returnToken; break; case 34: // '"' mDOUBLEQUOTE(true); - Token _tmp1 = super._returnToken; break; case 39: // '\'' mQUOTE(true); - Token _tmp2 = super._returnToken; break; case 9: // '\t' @@ -630,32 +627,27 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp3 = super._returnToken; break; default: if (super.la_1 == '/' && super.la_2 == '/' && LA(3) >= '\003' && LA(3) <= '\377') { mSL_COMMENT(true); - Token _tmp4 = super._returnToken; break; } if (super.la_1 == '-' && _tokenSet_0.member(super.la_2)) { mOPTION_WITH_ARG(true); - Token _tmp5 = super._returnToken; break; } if (super.la_1 == '-') { mDASH(true); - Token _tmp6 = super._returnToken; break; } if (_tokenSet_1.member(super.la_1)) { mIDENT(true); - Token _tmp7 = super._returnToken; break; } if (LA(1) != '\uFFFF') Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-12-04 18:10:07 UTC (rev 37) @@ -33,8 +33,6 @@ private IDependencyFilter filter; - private Vector unusedConstraints; - public DottyVisitor(IArchitectureSpecification spec, String filename, String title, boolean layoutLR, boolean directed, int componentVisitorDetailLevel, boolean showPackages, Vector quietList, boolean check, boolean do_not_show_dependecy_details, IDependencyFilter filter) throws IOException @@ -45,7 +43,6 @@ cluster_index = 1; specification = null; this.filter = null; - unusedConstraints = new Vector(); specification = spec; if (componentVisitorDetailLevel == 2) { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,7 +5,6 @@ import java.util.Hashtable; import java.util.Vector; -import net.sf.jcontracts.icontract.QuietOption; import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; public class Dotty_Component_CommonLevel @@ -145,7 +144,6 @@ } } } - QuietOption _tmp = QuietOption.theQuietOption; return result; } Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-12-04 18:10:07 UTC (rev 37) @@ -9,18 +9,14 @@ public class Dotty_Component_TypeLevel extends Dotty_Component_CommonLevel implements IDotty_Component_Level { - private Vector previouslinks; - public Dotty_Component_TypeLevel(IDependencyFilter filter, boolean performChecks) { - previouslinks = new Vector(); super.performChecks = performChecks; super.filter = filter; } public Dotty_Component_TypeLevel(boolean performChecks) { - previouslinks = new Vector(); super.performChecks = performChecks; } Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -21,8 +21,6 @@ private int _suspectedTokenStartPosition; - private String _filename; - private int _last_newline_position; private static final long _tokenSet_0_data_[] = @@ -87,7 +85,6 @@ _data = null; _position = 0; _suspectedTokenStartPosition = 0; - _filename = "?"; _last_newline_position = 0; super.literals = new Hashtable(); super.literals.put(new ANTLRHashString("synchronized", this), new Integer(32)); @@ -165,11 +162,6 @@ return _suspectedTokenStartPosition - _last_newline_position; } - private String getFilename() - { - return _filename; - } - int getPosition() { return _position; @@ -2897,57 +2889,46 @@ { case 63: // '?' mQUESTION(true); - Token _tmp = super._returnToken; break; case 40: // '(' mLPAREN(true); - Token _tmp1 = super._returnToken; break; case 41: // ')' mRPAREN(true); - Token _tmp2 = super._returnToken; break; case 91: // '[' mLBRACK(true); - Token _tmp3 = super._returnToken; break; case 93: // ']' mRBRACK(true); - Token _tmp4 = super._returnToken; break; case 123: // '{' mLCURLY(true); - Token _tmp5 = super._returnToken; break; case 125: // '}' mRCURLY(true); - Token _tmp6 = super._returnToken; break; case 58: // ':' mCOLON(true); - Token _tmp7 = super._returnToken; break; case 44: // ',' mCOMMA(true); - Token _tmp8 = super._returnToken; break; case 126: // '~' mBNOT(true); - Token _tmp9 = super._returnToken; break; case 59: // ';' mSEMI(true); - Token _tmp10 = super._returnToken; break; case 9: // '\t' @@ -2956,22 +2937,18 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp11 = super._returnToken; break; case 35: // '#' mPREPROC_LINE(true); - Token _tmp12 = super._returnToken; break; case 39: // '\'' mCHAR_LITERAL(true); - Token _tmp13 = super._returnToken; break; case 34: // '"' mSTRING_LITERAL(true); - Token _tmp14 = super._returnToken; break; case 36: // '$' @@ -3029,249 +3006,208 @@ case 121: // 'y' case 122: // 'z' mIDENT(true); - Token _tmp15 = super._returnToken; break; default: if (super.la_1 == '>' && super.la_2 == '>' && LA(3) == '>' && LA(4) == '=') { mBSR_ASSIGN(true); - Token _tmp16 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*' && LA(3) == '*' && LA(4) == '/') { mTRIV_COMMENT(true); - Token _tmp17 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*' && LA(3) == '*' && LA(4) >= '\003' && LA(4) <= '\377') { mCODE_COMMENT(true); - Token _tmp18 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '>' && LA(3) == '=') { mSR_ASSIGN(true); - Token _tmp19 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '>' && LA(3) == '>') { mBSR(true); - Token _tmp20 = super._returnToken; break; } if (super.la_1 == '<' && super.la_2 == '<' && LA(3) == '=') { mSL_ASSIGN(true); - Token _tmp21 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*' && _tokenSet_0.member(LA(3))) { mML_COMMENT(true); - Token _tmp22 = super._returnToken; break; } if (super.la_1 == '=' && super.la_2 == '=') { mEQUAL(true); - Token _tmp23 = super._returnToken; break; } if (super.la_1 == '!' && super.la_2 == '=') { mNOT_EQUAL(true); - Token _tmp24 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '=') { mDIV_ASSIGN(true); - Token _tmp25 = super._returnToken; break; } if (super.la_1 == '+' && super.la_2 == '=') { mPLUS_ASSIGN(true); - Token _tmp26 = super._returnToken; break; } if (super.la_1 == '+' && super.la_2 == '+') { mINC(true); - Token _tmp27 = super._returnToken; break; } if (super.la_1 == '-' && super.la_2 == '=') { mMINUS_ASSIGN(true); - Token _tmp28 = super._returnToken; break; } if (super.la_1 == '-' && super.la_2 == '-') { mDEC(true); - Token _tmp29 = super._returnToken; break; } if (super.la_1 == '*' && super.la_2 == '=') { mSTAR_ASSIGN(true); - Token _tmp30 = super._returnToken; break; } if (super.la_1 == '%' && super.la_2 == '=') { mMOD_ASSIGN(true); - Token _tmp31 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '>') { mSR(true); - Token _tmp32 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '=') { mGE(true); - Token _tmp33 = super._returnToken; break; } if (super.la_1 == '<' && super.la_2 == '<') { mSL(true); - Token _tmp34 = super._returnToken; break; } if (super.la_1 == '<' && super.la_2 == '=') { mLE(true); - Token _tmp35 = super._returnToken; break; } if (super.la_1 == '^' && super.la_2 == '=') { mBXOR_ASSIGN(true); - Token _tmp36 = super._returnToken; break; } if (super.la_1 == '|' && super.la_2 == '=') { mBOR_ASSIGN(true); - Token _tmp37 = super._returnToken; break; } if (super.la_1 == '|' && super.la_2 == '|') { mLOR(true); - Token _tmp38 = super._returnToken; break; } if (super.la_1 == '&' && super.la_2 == '=') { mBAND_ASSIGN(true); - Token _tmp39 = super._returnToken; break; } if (super.la_1 == '&' && super.la_2 == '&') { mLAND(true); - Token _tmp40 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '/') { mSL_COMMENT(true); - Token _tmp41 = super._returnToken; break; } if (super.la_1 == '.') { mDOT(true); - Token _tmp42 = super._returnToken; break; } if (super.la_1 == '=') { mASSIGN(true); - Token _tmp43 = super._returnToken; break; } if (super.la_1 == '!') { mLNOT(true); - Token _tmp44 = super._returnToken; break; } if (super.la_1 == '/') { mDIV(true); - Token _tmp45 = super._returnToken; break; } if (super.la_1 == '+') { mPLUS(true); - Token _tmp46 = super._returnToken; break; } if (super.la_1 == '-') { mMINUS(true); - Token _tmp47 = super._returnToken; break; } if (super.la_1 == '*') { mSTAR(true); - Token _tmp48 = super._returnToken; break; } if (super.la_1 == '%') { mMOD(true); - Token _tmp49 = super._returnToken; break; } if (super.la_1 == '>') { mGT(true); - Token _tmp50 = super._returnToken; break; } if (super.la_1 == '<') { mLT(true); - Token _tmp51 = super._returnToken; break; } if (super.la_1 == '^') { mBXOR(true); - Token _tmp52 = super._returnToken; break; } if (super.la_1 == '|') { mBOR(true); - Token _tmp53 = super._returnToken; break; } if (super.la_1 == '&') { mBAND(true); - Token _tmp54 = super._returnToken; break; } if (_tokenSet_1.member(super.la_1)) { mNUM_INT(true); - Token _tmp55 = super._returnToken; break; } if (LA(1) != '\uFFFF') @@ -3307,10 +3243,4 @@ { _data = o; } - - void setFilename(String filename) - { - _filename = filename; - } - } Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 18:10:07 UTC (rev 37) @@ -30,8 +30,6 @@ private static String otherConst = "other"; - private boolean displayMissingTypeWarning; - private boolean captureAllDependencies; private Vector _annotations; @@ -485,7 +483,6 @@ protected JavaParser(TokenBuffer tokenBuf, int k) { super(tokenBuf, k); - displayMissingTypeWarning = true; captureAllDependencies = true; _annotations = new Vector(); importList_ = new Vector(); @@ -508,7 +505,6 @@ protected JavaParser(Tokenizer lexer, int k) { super(lexer, k); - displayMissingTypeWarning = true; captureAllDependencies = true; _annotations = new Vector(); importList_ = new Vector(); @@ -1531,11 +1527,6 @@ captureAllDependencies = false; } - void disableDisplayMissingTypeWarning() - { - displayMissingTypeWarning = false; - } - public void enableCaptureAllDependencies() { captureAllDependencies = true; @@ -1546,11 +1537,6 @@ captureAllDep = true; } - void enableDisplayMissingTypeWarning() - { - displayMissingTypeWarning = true; - } - private void enterMethod(Method m) { currentMethod = m; @@ -2768,7 +2754,6 @@ filename = "<System.in>"; } JavaLexer lexer = new JavaLexer(is); - lexer.setFilename(filename); lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken"); JavaParser parser = new JavaParser(lexer); MetaclassFactory metaclassFactory = new MetaclassFactory(filename); Modified: trunk/source/java/net/sf/jcontracts/codeparser/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-12-04 18:10:07 UTC (rev 37) @@ -21,8 +21,6 @@ private int _endOfConstructorSuperCall; - private int _numberOfReturnStatements; - protected Vector newedTypes; protected Vector castedTypes; @@ -40,7 +38,6 @@ _body_indentation = 0; _endOfLastStatement = 0; _endOfConstructorSuperCall = 0; - _numberOfReturnStatements = 0; newedTypes = new Vector(); castedTypes = new Vector(); localVarTypes = new Vector(); Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 18:10:07 UTC (rev 37) @@ -17,7 +17,6 @@ public Parser(InputStream is, String filename) { _lexer = new JavaLexer(is); - _lexer.setFilename(filename); _lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken"); _javaparser = new JavaParser(_lexer); _javaparser.setFilename(filename); @@ -45,7 +44,6 @@ public Vector getAnnotations() throws ParserException { - _javaparser.enableDisplayMissingTypeWarning(); _javaparser.compilationUnit(); return _javaparser.getAnnotations(); } Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java =================================================================== --- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-12-04 18:10:07 UTC (rev 37) @@ -134,11 +134,6 @@ return !found; } - private boolean isVisited() - { - return visited4marked_; - } - public void mark(BooleanBlockWithNodeArg block) { if (!visited4marked_ && !marked_) Modified: trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-12-04 18:10:07 UTC (rev 37) @@ -373,7 +373,7 @@ { String code = ""; String elementType = getElementType(); - String _tmp = "__" + getMangledValue(getElementVar()) + "_counter"; + getMangledValue(getElementVar()); String elementVar = getElementVar(); String resultVar = "__result_" + getMangledValue(getElementVar()); String quantificationDomain = getQuantificationDomain(); @@ -707,7 +707,7 @@ { String code = ""; String elementType = getElementType(); - String _tmp = "__" + getMangledValue(getElementVar()) + "_counter"; + getMangledValue(getElementVar()); String elementVar = getElementVar(); String resultVar = "__result_" + getMangledValue(getElementVar()); String quantificationDomain = getQuantificationDomain(); Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 18:10:07 UTC (rev 37) @@ -15,12 +15,6 @@ public static final String REP_PREFIX = "__REP_"; - private static final String INV_GET_METHOD = "__JContractS__getInvariantList"; - - private static final String INV_SO_GET_METHOD = "__JContractS__getInvariantSourceList"; - - private static final String INVARIANT_TAG_NAME = "invariant"; - public static final String INVARIANT_CHECK_METHOD_NAME = "__check_invariant__"; public static final String INVARIANT_CHECK_AT_ENTRY = "__inv_check_at_entry__"; @@ -31,10 +25,6 @@ public static final char EXCEPTION_CLASS_MARKER = 35; - private static final String START_SEPARATION_STRING = "//#*#-------------------------------------------------------------------------------"; - - private static final String END_SEPARATION_STRING = "//-------------------------------------------------------------------------------#*#"; - public static boolean generateSuperCheckCallFlag = false; public static boolean doWrapExceptionOptionFlag = false; @@ -1804,7 +1794,7 @@ Method theIGMethod = c.getMethod("__JContractS__getInvariantList", noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-12-04 18:10:07 UTC (rev 37) @@ -19,10 +19,6 @@ { private static final Logger log = Logger.getLogger(Darwin.class); - private static final String LANGUAGE_START_TAG = "<idarwin language="; - - private static final String LANGUAGE_END_TAG = "</idarwin>"; - public static boolean process(String args[], Vector specset, boolean layoutLR, boolean directed, String outputfilename, boolean check, int componentDetailLevel, boolean showPackages, Vector quietList, Vector allFiles, Vector changedFiles, String srcbase, boolean do_not_show_dependecy_details, Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-12-04 18:10:07 UTC (rev 37) @@ -15,12 +15,6 @@ public static final String REP_PREFIX = "__REP_"; - private static final String INV_GET_METHOD = " __JContractS__getInvariantList"; - - private static final String INV_SO_GET_METHOD = " __JContractS__getInvariantSourceList"; - - private static final String INVARIANT_TAG_NAME = "invariant"; - public Interface(String name, String filename, int line_number) { super(name, filename, line_number); @@ -1001,7 +995,7 @@ Method theIGMethod = c.getMethod(" __JContractS__getInvariantList", noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) Modified: trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-12-04 18:10:07 UTC (rev 37) @@ -286,10 +286,6 @@ DefaultExceptionOption defaultExceptionOption = null; for (int i = 0; i < options.size(); i++) { - if ("c".compareTo(((Option) options.elementAt(i)).getName()) == 0) - { - CompilerOption _tmp = (CompilerOption) options.elementAt(i); - } if ("n".compareTo(((Option) options.elementAt(i)).getName()) == 0) { noRepositoryCompilationOption = (NoRepositoryCompilationOption) options.elementAt(i); @@ -314,7 +310,6 @@ } if ("i".compareTo(((Option) options.elementAt(i)).getName()) == 0) { - InvCheckCallOption _tmp1 = (InvCheckCallOption) options.elementAt(i); Class.generateSuperCheckCallFlag = true; } if ("w".compareTo(((Option) options.elementAt(i)).getName()) == 0) Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 18:10:07 UTC (rev 37) @@ -13,34 +13,14 @@ { private static final Logger log = Logger.getLogger(Method.class); - private static final String PRECONDITION_TAG_NAME_1 = "pre"; - - private static final String PRECONDITION_TAG_NAME_2 = "require"; - - private static final String POSTCONDITION_TAG_NAME_1 = "post"; - - private static final String POSTCONDITION_TAG_NAME_2 = "ensure"; - public static final String REP_PREFIX = "__REP_"; - private static final String PRE_GET_METHOD = " __JContractS__getPreList"; - - private static final String POST_GET_METHOD = " __JContractS__getPostList"; - - private static final char EXCEPTION_CLASS_MARKER = 35; - public static final String RETURN_VALUE_HOLDER_NAME = "__return_value_holder_"; - private static final String START_SEPARATION_STRING = "//#*#-------------------------------------------------------------------------------"; - - private static final String END_SEPARATION_STRING = "//-------------------------------------------------------------------------------#*#"; - public static boolean doWrapExceptionOptionFlag = false; public static String defaultExceptionClassName = "RuntimeException"; - private static final String impli = "implies"; - public Method(String name, Vector parameterList, String filename, int line_number) { super(name, parameterList, filename, line_number); @@ -2485,7 +2465,7 @@ java.lang.reflect.Method theIGMethod = c.getMethod(mangleExpression(methodName), noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) @@ -2528,7 +2508,7 @@ java.lang.reflect.Method theIGMethod = c.getMethod(mangleExpression(methodName), noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java 2006-12-04 18:10:07 UTC (rev 37) @@ -15,23 +15,6 @@ this.label = label; } - private String basicRemoveIfsubstitutedIn(String r) - { - StringBuffer buf = new StringBuffer(); - String tag = "[" + label + "]"; - String inset = ""; - int lastpos = 0; - for (int pos = -1; (pos = r.indexOf(tag, lastpos)) != -1;) - { - buf.append(r.substring(lastpos, pos)); - buf.append(inset); - lastpos = pos + tag.length(); - } - - buf.append(r.substring(lastpos, r.length())); - return buf.toString(); - } - private String basicSubstituteIn(String r) { StringBuffer buf = new StringBuffer(); Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -19,8 +19,6 @@ private int _position; - private int _suspectedTokenStartPosition; - private static final long _tokenSet_0_data_[] = { -1032L, -1L, -1L, -1L, 0L, 0L, 0L, 0L @@ -33,7 +31,6 @@ super(cb); _data = null; _position = 0; - _suspectedTokenStartPosition = 0; super.literals = new Hashtable(); super.literals.put(new ANTLRHashString("mustnot", this), new Integer(6)); super.literals.put(new ANTLRHashString("may", this), new Integer(5)); @@ -700,22 +697,18 @@ { case 92: // '\\' mBACKSLASH(true); - Token _tmp = super._returnToken; break; case 123: // '{' mCBOPEN(true); - Token _tmp1 = super._returnToken; break; case 125: // '}' mCBCLOSE(true); - Token _tmp2 = super._returnToken; break; case 44: // ',' mCOMMA(true); - Token _tmp3 = super._returnToken; break; case 9: // '\t' @@ -723,17 +716,14 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp4 = super._returnToken; break; case 47: // '/' mSL_COMMENT(true); - Token _tmp5 = super._returnToken; break; case 34: // '"' mCOMMENT(true); - Token _tmp6 = super._returnToken; break; case 36: // '$' @@ -806,7 +796,6 @@ case 121: // 'y' case 122: // 'z' mIDENT(true); - Token _tmp7 = super._returnToken; break; default: @@ -836,7 +825,6 @@ { super.resetText(); setData(null); - _suspectedTokenStartPosition = getPosition(); } protected void setData(Object o) Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-12-04 18:10:07 UTC (rev 37) @@ -63,28 +63,6 @@ return matchAny(s); } - private boolean matchAll(Pattern p) - { - boolean result = true; - for (int i = 0; result && i < patterns.length; i++) - { - result = p.match(patterns[i]); - } - - return result; - } - - private boolean matchAll(String s) - { - boolean result = true; - for (int i = 0; result && i < patterns.length; i++) - { - result = patterns[i].match(s); - } - - return result; - } - private boolean matchAny(Pattern p) { for (int i = 0; i < patterns.length; i++) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |