Skip to content
Snippets Groups Projects
Commit 3729e160 authored by dgelessus's avatar dgelessus
Browse files

Adjust a few types to match new generics in generated node classes

parent b876187e
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ import java.io.*; ...@@ -26,7 +26,7 @@ import java.io.*;
public class AddAstProductions extends DepthFirstAdapter public class AddAstProductions extends DepthFirstAdapter
{ {
List<AAstProd> listAstProd = new LinkedList<>(); List<PAstProd> listAstProd = new LinkedList<>();
private boolean firstAlt; private boolean firstAlt;
public AddAstProductions() public AddAstProductions()
...@@ -95,8 +95,8 @@ public class AddAstProductions extends DepthFirstAdapter ...@@ -95,8 +95,8 @@ public class AddAstProductions extends DepthFirstAdapter
} }
} }
List<AElem> listElems; List<PElem> listElems;
List<AAstAlt> listOfAstAlts; List<PAstAlt> listOfAstAlts;
public void error(Token token) public void error(Token token)
{ {
......
...@@ -79,7 +79,7 @@ public class Inlining ...@@ -79,7 +79,7 @@ public class Inlining
Once we detect that the production can be inline, Once we detect that the production can be inline,
we try to inline each of its alternatives. we try to inline each of its alternatives.
*/ */
List<AAlt> listOfAlts = new LinkedList<>(); List<PAlt> listOfAlts = new LinkedList<>();
for(int i=0; i<alts.length; i++) for(int i=0; i<alts.length; i++)
{ {
listOfAlts.addAll( inlineAlternative(alts[i]) ); listOfAlts.addAll( inlineAlternative(alts[i]) );
...@@ -107,7 +107,7 @@ public class Inlining ...@@ -107,7 +107,7 @@ public class Inlining
return false; return false;
} }
List<AAlt> removeAlternativeDoubloonsFromInlinedProduction(List<AAlt> inlinedAlternatives) List<PAlt> removeAlternativeDoubloonsFromInlinedProduction(List<PAlt> inlinedAlternatives)
{ {
AAlt[] alts = inlinedAlternatives.toArray(new AAlt[0]); AAlt[] alts = inlinedAlternatives.toArray(new AAlt[0]);
List<?>[] theWhole = new List<?>[alts.length]; List<?>[] theWhole = new List<?>[alts.length];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment