diff -Nru javacc-3.2/src/org/javacc/jjdoc/JJDoc.java javacc-3.2-gil/src/org/javacc/jjdoc/JJDoc.java --- javacc-3.2/src/org/javacc/jjdoc/JJDoc.java 2003-06-09 22:43:52.000000000 +0200 +++ javacc-3.2-gil/src/org/javacc/jjdoc/JJDoc.java 2009-06-27 17:04:46.000000000 +0200 @@ -95,8 +95,8 @@ private static void emitTokenProductions(Generator gen, Vector prods) { // gen.tokensStart(); - for (Enumeration enum = prods.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)enum.nextElement(); + for (Enumeration mune = prods.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)mune.nextElement(); // emitTopLevelSpecialTokens(ostr, tp.firstToken); // if (tp.isExplicit) { @@ -140,8 +140,8 @@ private static void emitNormalProductions(Generator gen, Vector prods) { gen.nonterminalsStart(); - for (Enumeration enum = prods.elements(); enum.hasMoreElements();) { - NormalProduction np = (NormalProduction)enum.nextElement(); + for (Enumeration mune = prods.elements(); mune.hasMoreElements();) { + NormalProduction np = (NormalProduction)mune.nextElement(); emitTopLevelSpecialTokens(np.firstToken, gen); @@ -205,11 +205,11 @@ } private static void emitExpansionChoice(Choice c, Generator gen) { - for (java.util.Enumeration enum = c.choices.elements(); - enum.hasMoreElements();) { - Expansion e = (Expansion)(enum.nextElement()); + for (java.util.Enumeration mune = c.choices.elements(); + mune.hasMoreElements();) { + Expansion e = (Expansion)(mune.nextElement()); emitExpansionTree(e, gen); - if (enum.hasMoreElements()) { + if (mune.hasMoreElements()) { gen.text(" | "); } } @@ -239,9 +239,9 @@ private static void emitExpansionSequence(Sequence s, Generator gen) { boolean firstUnit = true; - for (java.util.Enumeration enum = s.units.elements(); - enum.hasMoreElements();) { - Expansion e = (Expansion)enum.nextElement(); + for (java.util.Enumeration mune = s.units.elements(); + mune.hasMoreElements();) { + Expansion e = (Expansion)mune.nextElement(); if (e instanceof Lookahead || e instanceof Action) { continue; @@ -317,9 +317,9 @@ gen.text("~"); } gen.text("["); - for (java.util.Enumeration enum = cl.descriptors.elements(); - enum.hasMoreElements();) { - Object o = enum.nextElement(); + for (java.util.Enumeration mune = cl.descriptors.elements(); + mune.hasMoreElements();) { + Object o = mune.nextElement(); if (o instanceof SingleCharacter) { gen.text("\""); char s[] = { ((SingleCharacter)o).ch }; @@ -336,7 +336,7 @@ } else { System.out.println("Oops: unknown character list element type."); } - if (enum.hasMoreElements()) { + if (mune.hasMoreElements()) { gen.text(","); } } @@ -344,11 +344,11 @@ } else if (re instanceof RChoice) { RChoice c = (RChoice)re; - for (java.util.Enumeration enum = c.choices.elements(); - enum.hasMoreElements();) { - RegularExpression sub = (RegularExpression)(enum.nextElement()); + for (java.util.Enumeration mune = c.choices.elements(); + mune.hasMoreElements();) { + RegularExpression sub = (RegularExpression)(mune.nextElement()); emitRE(sub, gen); - if (enum.hasMoreElements()) { + if (mune.hasMoreElements()) { gen.text(" | "); } } @@ -368,9 +368,9 @@ } else if (re instanceof RSequence) { RSequence s = (RSequence)re; - for (java.util.Enumeration enum = s.units.elements(); - enum.hasMoreElements();) { - RegularExpression sub = (RegularExpression)(enum.nextElement()); + for (java.util.Enumeration mune = s.units.elements(); + mune.hasMoreElements();) { + RegularExpression sub = (RegularExpression)(mune.nextElement()); boolean needParens = false; if (sub instanceof RChoice) { needParens = true; @@ -382,7 +382,7 @@ if (needParens) { gen.text(")"); } - if (enum.hasMoreElements()) { + if (mune.hasMoreElements()) { gen.text(" "); } } @@ -416,8 +416,8 @@ private static String v2s(Vector v, boolean newLine) { String s = ""; boolean firstToken = true; - for (Enumeration enum = v.elements(); enum.hasMoreElements();) { - Token tok = (Token)enum.nextElement(); + for (Enumeration mune = v.elements(); mune.hasMoreElements();) { + Token tok = (Token)mune.nextElement(); Token stok = getPrecedingSpecialToken(tok); if (firstToken) { diff -Nru javacc-3.2/src/org/javacc/parser/ExpansionTreeWalker.java javacc-3.2-gil/src/org/javacc/parser/ExpansionTreeWalker.java --- javacc-3.2/src/org/javacc/parser/ExpansionTreeWalker.java 2003-06-09 22:45:04.000000000 +0200 +++ javacc-3.2-gil/src/org/javacc/parser/ExpansionTreeWalker.java 2009-06-27 17:19:21.000000000 +0200 @@ -37,12 +37,12 @@ opObj.action(node); if (opObj.goDeeper(node)) { if (node instanceof Choice) { - for (java.util.Enumeration enum = ((Choice)node).choices.elements(); enum.hasMoreElements();) { - preOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((Choice)node).choices.elements(); mune.hasMoreElements();) { + preOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof Sequence) { - for (java.util.Enumeration enum = ((Sequence)node).units.elements(); enum.hasMoreElements();) { - preOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((Sequence)node).units.elements(); mune.hasMoreElements();) { + preOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof OneOrMore) { preOrderWalk(((OneOrMore)node).expansion, opObj); @@ -58,12 +58,12 @@ } else if (node instanceof TryBlock) { preOrderWalk(((TryBlock)node).exp, opObj); } else if (node instanceof RChoice) { - for (java.util.Enumeration enum = ((RChoice)node).choices.elements(); enum.hasMoreElements();) { - preOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((RChoice)node).choices.elements(); mune.hasMoreElements();) { + preOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof RSequence) { - for (java.util.Enumeration enum = ((RSequence)node).units.elements(); enum.hasMoreElements();) { - preOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((RSequence)node).units.elements(); mune.hasMoreElements();) { + preOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof ROneOrMore) { preOrderWalk(((ROneOrMore)node).regexpr, opObj); @@ -85,12 +85,12 @@ static void postOrderWalk(Expansion node, TreeWalkerOp opObj) { if (opObj.goDeeper(node)) { if (node instanceof Choice) { - for (java.util.Enumeration enum = ((Choice)node).choices.elements(); enum.hasMoreElements();) { - postOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((Choice)node).choices.elements(); mune.hasMoreElements();) { + postOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof Sequence) { - for (java.util.Enumeration enum = ((Sequence)node).units.elements(); enum.hasMoreElements();) { - postOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((Sequence)node).units.elements(); mune.hasMoreElements();) { + postOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof OneOrMore) { postOrderWalk(((OneOrMore)node).expansion, opObj); @@ -106,12 +106,12 @@ } else if (node instanceof TryBlock) { postOrderWalk(((TryBlock)node).exp, opObj); } else if (node instanceof RChoice) { - for (java.util.Enumeration enum = ((RChoice)node).choices.elements(); enum.hasMoreElements();) { - postOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((RChoice)node).choices.elements(); mune.hasMoreElements();) { + postOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof RSequence) { - for (java.util.Enumeration enum = ((RSequence)node).units.elements(); enum.hasMoreElements();) { - postOrderWalk((Expansion)enum.nextElement(), opObj); + for (java.util.Enumeration mune = ((RSequence)node).units.elements(); mune.hasMoreElements();) { + postOrderWalk((Expansion)mune.nextElement(), opObj); } } else if (node instanceof ROneOrMore) { postOrderWalk(((ROneOrMore)node).regexpr, opObj); diff -Nru javacc-3.2/src/org/javacc/parser/OtherFilesGen.java javacc-3.2-gil/src/org/javacc/parser/OtherFilesGen.java --- javacc-3.2/src/org/javacc/parser/OtherFilesGen.java 2003-06-09 22:45:05.000000000 +0200 +++ javacc-3.2-gil/src/org/javacc/parser/OtherFilesGen.java 2009-06-27 17:33:55.000000000 +0200 @@ -86,8 +86,8 @@ ostr.println(""); RegularExpression re; ostr.println(" int EOF = 0;"); - for (java.util.Enumeration enum = ordered_named_tokens.elements(); enum.hasMoreElements();) { - re = (RegularExpression)enum.nextElement(); + for (java.util.Enumeration mune = ordered_named_tokens.elements(); mune.hasMoreElements();) { + re = (RegularExpression)mune.nextElement(); ostr.println(" int " + re.label + " = " + re.ordinal + ";"); } ostr.println(""); @@ -100,8 +100,8 @@ ostr.println(" String[] tokenImage = {"); ostr.println(" \"<EOF>\","); - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; for (java.util.Enumeration enum1 = respecs.elements(); enum1.hasMoreElements();) { RegExprSpec res = (RegExprSpec)(enum1.nextElement()); diff -Nru javacc-3.2/src/org/javacc/parser/ParseEngine.java javacc-3.2-gil/src/org/javacc/parser/ParseEngine.java --- javacc-3.2/src/org/javacc/parser/ParseEngine.java 2003-06-26 16:36:07.000000000 +0200 +++ javacc-3.2-gil/src/org/javacc/parser/ParseEngine.java 2009-06-27 17:24:41.000000000 +0200 @@ -244,8 +244,8 @@ indentAmt++; } printTokenSetup((Token)(la.action_tokens.elementAt(0))); - for (java.util.Enumeration enum = la.action_tokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = la.action_tokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -358,8 +358,8 @@ // the semantic check with the syntactic one. retval += " && ("; printTokenSetup((Token)(la.action_tokens.elementAt(0))); - for (java.util.Enumeration enum = la.action_tokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = la.action_tokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -450,16 +450,16 @@ ostr.print(" " + p.lhs + "("); if (p.parameter_list_tokens.size() != 0) { printTokenSetup((Token)(p.parameter_list_tokens.elementAt(0))); - for (java.util.Enumeration enum = p.parameter_list_tokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = p.parameter_list_tokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); printToken(t, ostr); } printTrailingComments(t, ostr); } ostr.print(") throws ParseException"); - for (java.util.Enumeration enum = p.throws_list.elements(); enum.hasMoreElements();) { + for (java.util.Enumeration mune = p.throws_list.elements(); mune.hasMoreElements();) { ostr.print(", "); - java.util.Vector name = (java.util.Vector)enum.nextElement(); + java.util.Vector name = (java.util.Vector)mune.nextElement(); for (java.util.Enumeration enum1 = name.elements(); enum1.hasMoreElements();) { t = (Token)enum1.nextElement(); ostr.print(t.image); @@ -475,8 +475,8 @@ } if (p.declaration_tokens.size() != 0) { printTokenSetup((Token)(p.declaration_tokens.elementAt(0))); cline--; - for (java.util.Enumeration enum = p.declaration_tokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = p.declaration_tokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); printToken(t, ostr); } printTrailingComments(t, ostr); @@ -513,8 +513,8 @@ retval += "\n"; if (e_nrw.lhsTokens.size() != 0) { printTokenSetup((Token)(e_nrw.lhsTokens.elementAt(0))); - for (java.util.Enumeration enum = e_nrw.lhsTokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = e_nrw.lhsTokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -535,8 +535,8 @@ retval += "\n"; if (e_nrw.lhsTokens.size() != 0) { printTokenSetup((Token)(e_nrw.lhsTokens.elementAt(0))); - for (java.util.Enumeration enum = e_nrw.lhsTokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = e_nrw.lhsTokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -545,8 +545,8 @@ retval += e_nrw.name + "("; if (e_nrw.argument_tokens.size() != 0) { printTokenSetup((Token)(e_nrw.argument_tokens.elementAt(0))); - for (java.util.Enumeration enum = e_nrw.argument_tokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = e_nrw.argument_tokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -557,8 +557,8 @@ retval += "\u0003\n"; if (e_nrw.action_tokens.size() != 0) { printTokenSetup((Token)(e_nrw.action_tokens.elementAt(0))); ccol = 1; - for (java.util.Enumeration enum = e_nrw.action_tokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = e_nrw.action_tokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -662,8 +662,8 @@ v = (java.util.Vector)(e_nrw.types.elementAt(i)); if (v.size() != 0) { printTokenSetup((Token)(v.elementAt(0))); - for (java.util.Enumeration enum = v.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = v.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -677,8 +677,8 @@ v = (java.util.Vector)(e_nrw.catchblks.elementAt(i)); if (v.size() != 0) { printTokenSetup((Token)(v.elementAt(0))); ccol = 1; - for (java.util.Enumeration enum = v.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = v.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -689,8 +689,8 @@ retval += " finally {\u0003\n"; if (e_nrw.finallyblk.size() != 0) { printTokenSetup((Token)(e_nrw.finallyblk.elementAt(0))); ccol = 1; - for (java.util.Enumeration enum = e_nrw.finallyblk.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = e_nrw.finallyblk.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); retval += printToken(t); } retval += printTrailingComments(t); @@ -904,8 +904,8 @@ ostr.println(" lookingAhead = true;"); ostr.print(" jj_semLA = "); printTokenSetup((Token)(la.action_tokens.elementAt(0))); - for (java.util.Enumeration enum = la.action_tokens.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (java.util.Enumeration mune = la.action_tokens.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); printToken(t, ostr); } printTrailingComments(t, ostr); @@ -1069,8 +1069,8 @@ ostr = ps; - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - p = (NormalProduction)enum.nextElement(); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + p = (NormalProduction)mune.nextElement(); if (p instanceof JavaCodeProduction) { jp = (JavaCodeProduction)p; t = (Token)(jp.return_type_tokens.elementAt(0)); @@ -1141,8 +1141,8 @@ } } - for (java.util.Enumeration enum = phase3table.elements(); enum.hasMoreElements();) { - buildPhase3Routine((Phase3Data)(enum.nextElement()), false); + for (java.util.Enumeration mune = phase3table.elements(); mune.hasMoreElements();) { + buildPhase3Routine((Phase3Data)(mune.nextElement()), false); } } diff -Nru javacc-3.2/src/org/javacc/parser/ParseGen.java javacc-3.2-gil/src/org/javacc/parser/ParseGen.java --- javacc-3.2/src/org/javacc/parser/ParseGen.java 2003-08-08 22:21:56.000000000 +0200 +++ javacc-3.2-gil/src/org/javacc/parser/ParseGen.java 2009-06-27 17:26:55.000000000 +0200 @@ -57,8 +57,8 @@ if (cu_to_insertion_point_1.size() != 0) { printTokenSetup((Token)(cu_to_insertion_point_1.elementAt(0))); ccol = 1; - for (Enumeration enum = cu_to_insertion_point_1.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (Enumeration mune = cu_to_insertion_point_1.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); if (t.kind == IMPLEMENTS) { implementsExists = true; } else if (t.kind == CLASS) { @@ -75,8 +75,8 @@ ostr.print(cu_name + "Constants "); if (cu_to_insertion_point_2.size() != 0) { printTokenSetup((Token)(cu_to_insertion_point_2.elementAt(0))); - for (Enumeration enum = cu_to_insertion_point_2.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (Enumeration mune = cu_to_insertion_point_2.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); printToken(t, ostr); } } @@ -124,8 +124,8 @@ for (int i = 0; i < tokenMaskSize; i++) { ostr.println(" private static void jj_la1_" + i + "() {"); ostr.print(" jj_la1_" + i + " = new int[] {"); - for (Enumeration enum = maskVals.elements(); enum.hasMoreElements();) { - int[] tokenMask = (int[])(enum.nextElement()); + for (Enumeration mune = maskVals.elements(); mune.hasMoreElements();) { + int[] tokenMask = (int[])(mune.nextElement()); ostr.print("0x" + Integer.toHexString(tokenMask[i]) + ","); } ostr.println("};"); @@ -666,8 +666,8 @@ if (cu_from_insertion_point_2.size() != 0) { printTokenSetup((Token)(cu_from_insertion_point_2.elementAt(0))); ccol = 1; - for (Enumeration enum = cu_from_insertion_point_2.elements(); enum.hasMoreElements();) { - t = (Token)enum.nextElement(); + for (Enumeration mune = cu_from_insertion_point_2.elements(); mune.hasMoreElements();) { + t = (Token)mune.nextElement(); printToken(t, ostr); } printTrailingComments(t, ostr); diff -Nru javacc-3.2/src/org/javacc/parser/Semanticize.java javacc-3.2-gil/src/org/javacc/parser/Semanticize.java --- javacc-3.2/src/org/javacc/parser/Semanticize.java 2003-06-09 22:45:05.000000000 +0200 +++ javacc-3.2-gil/src/org/javacc/parser/Semanticize.java 2009-06-27 17:32:47.000000000 +0200 @@ -55,15 +55,15 @@ * them to trivial choices. This way, their semantic lookahead specification * can be evaluated during other lookahead evaluations. */ - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - ExpansionTreeWalker.postOrderWalk(((NormalProduction)enum.nextElement()).expansion, new LookaheadFixer()); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + ExpansionTreeWalker.postOrderWalk(((NormalProduction)mune.nextElement()).expansion, new LookaheadFixer()); } /* * The following loop populates "production_table" */ - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - NormalProduction p = (NormalProduction)enum.nextElement(); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + NormalProduction p = (NormalProduction)mune.nextElement(); if (production_table.put(p.lhs, p) != null) { JavaCCErrors.semantic_error(p, p.lhs + " occurs on the left hand side of more than one production."); } @@ -73,8 +73,8 @@ * The following walks the entire parse tree to make sure that all * non-terminals on RHS's are defined on the LHS. */ - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - ExpansionTreeWalker.preOrderWalk(((NormalProduction)enum.nextElement()).expansion, new ProductionDefinedChecker()); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + ExpansionTreeWalker.preOrderWalk(((NormalProduction)mune.nextElement()).expansion, new ProductionDefinedChecker()); } /* @@ -87,8 +87,8 @@ * is set to true. In this case, <name> occurrences are OK, while * regular expression specs generate a warning. */ - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; for (java.util.Enumeration enum1 = respecs.elements(); enum1.hasMoreElements();) { RegExprSpec res = (RegExprSpec)(enum1.nextElement()); @@ -126,8 +126,8 @@ * "named_tokens_table" and "ordered_named_tokens". * Duplications are flagged as errors. */ - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; for (java.util.Enumeration enum1 = respecs.elements(); enum1.hasMoreElements();) { RegExprSpec res = (RegExprSpec)(enum1.nextElement()); @@ -158,8 +158,8 @@ */ tokenCount = 1; - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; if (tp.lexStates == null) { tp.lexStates = new String[lexstate_I2S.size()]; @@ -278,8 +278,8 @@ if (!Options.B("USER_TOKEN_MANAGER")) { FixRJustNames frjn = new FixRJustNames(); - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; for (java.util.Enumeration enum1 = respecs.elements(); enum1.hasMoreElements();) { RegExprSpec res = (RegExprSpec)(enum1.nextElement()); @@ -306,8 +306,8 @@ */ if (Options.B("USER_TOKEN_MANAGER")) { - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; for (java.util.Enumeration enum1 = respecs.elements(); enum1.hasMoreElements();) { RegExprSpec res = (RegExprSpec)(enum1.nextElement()); @@ -339,8 +339,8 @@ * file. */ if (Options.B("USER_TOKEN_MANAGER")) { - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; for (java.util.Enumeration enum1 = respecs.elements(); enum1.hasMoreElements();) { RegExprSpec res = (RegExprSpec)(enum1.nextElement()); @@ -361,8 +361,8 @@ boolean emptyUpdate = true; while (emptyUpdate) { emptyUpdate = false; - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - NormalProduction prod = (NormalProduction)enum.nextElement(); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + NormalProduction prod = (NormalProduction)mune.nextElement(); if (emptyExpansionExists(prod.expansion)) { if (!prod.emptyPossible) { emptyUpdate = prod.emptyPossible = true; @@ -375,15 +375,15 @@ // The following code checks that all ZeroOrMore, ZeroOrOne, and OneOrMore nodes // do not contain expansions that can expand to the empty token list. - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - ExpansionTreeWalker.preOrderWalk(((NormalProduction)enum.nextElement()).expansion, new EmptyChecker()); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + ExpansionTreeWalker.preOrderWalk(((NormalProduction)mune.nextElement()).expansion, new EmptyChecker()); } // The following code goes through the productions and adds pointers to other // productions that it can expand to without consuming any tokens. Once this is // done, a left-recursion check can be performed. - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - NormalProduction prod = (NormalProduction)enum.nextElement(); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + NormalProduction prod = (NormalProduction)mune.nextElement(); addLeftMost(prod, prod.expansion); } @@ -391,8 +391,8 @@ // actual left recursions. The way the algorithm is coded, once a node has // been determined to participate in a left recursive loop, it is not tried // in any other loop. - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - NormalProduction prod = (NormalProduction)enum.nextElement(); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + NormalProduction prod = (NormalProduction)mune.nextElement(); if (prod.walkStatus == 0) { prodWalk(prod); } @@ -403,8 +403,8 @@ // so we only need to do the equivalent of the above walk. // This is not done if option USER_TOKEN_MANAGER is set to true. if (!Options.B("USER_TOKEN_MANAGER")) { - for (java.util.Enumeration enum = rexprlist.elements(); enum.hasMoreElements();) { - TokenProduction tp = (TokenProduction)(enum.nextElement()); + for (java.util.Enumeration mune = rexprlist.elements(); mune.hasMoreElements();) { + TokenProduction tp = (TokenProduction)(mune.nextElement()); java.util.Vector respecs = tp.respecs; for (java.util.Enumeration enum1 = respecs.elements(); enum1.hasMoreElements();) { RegExprSpec res = (RegExprSpec)(enum1.nextElement()); @@ -425,8 +425,8 @@ * The following code performs the lookahead ambiguity checking. */ if (JavaCCErrors.get_error_count() == 0) { - for (java.util.Enumeration enum = bnfproductions.elements(); enum.hasMoreElements();) { - ExpansionTreeWalker.preOrderWalk(((NormalProduction)enum.nextElement()).expansion, new LookaheadChecker()); + for (java.util.Enumeration mune = bnfproductions.elements(); mune.hasMoreElements();) { + ExpansionTreeWalker.preOrderWalk(((NormalProduction)mune.nextElement()).expansion, new LookaheadChecker()); } } @@ -446,8 +446,8 @@ if (rexp != null && !rexp.tpContext.ignoreCase) { return false; } - for (java.util.Enumeration enum = table.elements(); enum.hasMoreElements();) { - rexp = (RegularExpression)(enum.nextElement()); + for (java.util.Enumeration mune = table.elements(); mune.hasMoreElements();) { + rexp = (RegularExpression)(mune.nextElement()); if (rexp.tpContext.ignoreCase) { other = rexp; return true; @@ -471,15 +471,15 @@ } else if (exp instanceof Lookahead) { return true; } else if (exp instanceof Choice) { - for (java.util.Enumeration enum = ((Choice)exp).choices.elements(); enum.hasMoreElements();) { - if (emptyExpansionExists((Expansion)enum.nextElement())) { + for (java.util.Enumeration mune = ((Choice)exp).choices.elements(); mune.hasMoreElements();) { + if (emptyExpansionExists((Expansion)mune.nextElement())) { return true; } } return false; } else if (exp instanceof Sequence) { - for (java.util.Enumeration enum = ((Sequence)exp).units.elements(); enum.hasMoreElements();) { - if (!emptyExpansionExists((Expansion)enum.nextElement())) { + for (java.util.Enumeration mune = ((Sequence)exp).units.elements(); mune.hasMoreElements();) { + if (!emptyExpansionExists((Expansion)mune.nextElement())) { return false; } } @@ -512,12 +512,12 @@ } else if (exp instanceof ZeroOrOne) { addLeftMost(prod, ((ZeroOrOne)exp).expansion); } else if (exp instanceof Choice) { - for (java.util.Enumeration enum = ((Choice)exp).choices.elements(); enum.hasMoreElements();) { - addLeftMost(prod, (Expansion)enum.nextElement()); + for (java.util.Enumeration mune = ((Choice)exp).choices.elements(); mune.hasMoreElements();) { + addLeftMost(prod, (Expansion)mune.nextElement()); } } else if (exp instanceof Sequence) { - for (java.util.Enumeration enum = ((Sequence)exp).units.elements(); enum.hasMoreElements();) { - Expansion e = (Expansion)enum.nextElement(); + for (java.util.Enumeration mune = ((Sequence)exp).units.elements(); mune.hasMoreElements();) { + Expansion e = (Expansion)mune.nextElement(); addLeftMost(prod, e); if (!emptyExpansionExists(e)) { break; @@ -595,15 +595,15 @@ } } } else if (rexp instanceof RChoice) { - for (java.util.Enumeration enum = ((RChoice)rexp).choices.elements(); enum.hasMoreElements();) { - if (rexpWalk((RegularExpression)enum.nextElement())) { + for (java.util.Enumeration mune = ((RChoice)rexp).choices.elements(); mune.hasMoreElements();) { + if (rexpWalk((RegularExpression)mune.nextElement())) { return true; } } return false; } else if (rexp instanceof RSequence) { - for (java.util.Enumeration enum = ((RSequence)rexp).units.elements(); enum.hasMoreElements();) { - if (rexpWalk((RegularExpression)enum.nextElement())) { + for (java.util.Enumeration mune = ((RSequence)rexp).units.elements(); mune.hasMoreElements();) { + if (rexpWalk((RegularExpression)mune.nextElement())) { return true; } }