Skip to content
Snippets Groups Projects
Commit 1d70a9ca authored by dgelessus's avatar dgelessus
Browse files

Use generics in GenLexer

parent 7526f91e
Branches
Tags
No related merge requests found
...@@ -227,11 +227,11 @@ public class GenLexer extends AnalysisAdapter ...@@ -227,11 +227,11 @@ public class GenLexer extends AnalysisAdapter
DFA dfa = acceptStatesArray[accSt].dfa; DFA dfa = acceptStatesArray[accSt].dfa;
file.write(" { // " + acceptStatesArray[accSt].stateName + System.getProperty("line.separator")); file.write(" { // " + acceptStatesArray[accSt].stateName + System.getProperty("line.separator"));
Vector outerArray = new Vector(); Vector<Vector<int[]>> outerArray = new Vector<>();
for(DFA.State state : dfa.states) for(DFA.State state : dfa.states)
{ {
Vector innerArray = new Vector(); Vector<int[]> innerArray = new Vector<>();
file.write(" {"); file.write(" {");
...@@ -254,14 +254,11 @@ public class GenLexer extends AnalysisAdapter ...@@ -254,14 +254,11 @@ public class GenLexer extends AnalysisAdapter
file.write(" }" + System.getProperty("line.separator")); file.write(" }" + System.getProperty("line.separator"));
out.writeInt(outerArray.size()); out.writeInt(outerArray.size());
for(Enumeration e = outerArray.elements(); e.hasMoreElements();) for(Vector<int[]> innerArray : outerArray)
{ {
Vector innerArray = (Vector) e.nextElement();
out.writeInt(innerArray.size()); out.writeInt(innerArray.size());
for(Enumeration n = innerArray.elements(); n.hasMoreElements();) for(int[] array : innerArray)
{ {
int[] array = (int[]) n.nextElement();
for(int i = 0; i < 3; i++) for(int i = 0; i < 3; i++)
{ {
out.writeInt(array[i]); out.writeInt(array[i]);
...@@ -274,12 +271,12 @@ public class GenLexer extends AnalysisAdapter ...@@ -274,12 +271,12 @@ public class GenLexer extends AnalysisAdapter
final int stateNumber = acceptStatesArray.length; final int stateNumber = acceptStatesArray.length;
Vector outerArray = new Vector(); Vector<Vector<Integer>> outerArray = new Vector<>();
for(int i = 0; i < stateNumber; i++) for(int i = 0; i < stateNumber; i++)
{ {
DFA dfa = acceptStatesArray[i].dfa; DFA dfa = acceptStatesArray[i].dfa;
Vector innerArray = new Vector(); Vector<Integer> innerArray = new Vector<>();
file.write(" // " + acceptStatesArray[i].stateName + System.getProperty("line.separator")); file.write(" // " + acceptStatesArray[i].stateName + System.getProperty("line.separator"));
file.write(" {"); file.write(" {");
...@@ -296,14 +293,12 @@ public class GenLexer extends AnalysisAdapter ...@@ -296,14 +293,12 @@ public class GenLexer extends AnalysisAdapter
} }
out.writeInt(outerArray.size()); out.writeInt(outerArray.size());
for(Enumeration e = outerArray.elements(); e.hasMoreElements();) for(Vector<Integer> innerArray : outerArray)
{ {
Vector innerArray = (Vector) e.nextElement();
out.writeInt(innerArray.size()); out.writeInt(innerArray.size());
for(Enumeration n = innerArray.elements(); n.hasMoreElements();) for(int i : innerArray)
{ {
Integer i = (Integer) n.nextElement(); out.writeInt(i);
out.writeInt(i.intValue());
} }
} }
out.close(); out.close();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment