From 3729e1601f120cba948864d54010efee95f403fe Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 6 Apr 2022 11:41:29 +0200
Subject: [PATCH] Adjust a few types to match new generics in generated node
classes
---
src/main/java/org/sablecc/sablecc/AddAstProductions.java | 6 +++---
src/main/java/org/sablecc/sablecc/Inlining.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/sablecc/sablecc/AddAstProductions.java b/src/main/java/org/sablecc/sablecc/AddAstProductions.java
index 43adccb..b5c9e6a 100644
--- a/src/main/java/org/sablecc/sablecc/AddAstProductions.java
+++ b/src/main/java/org/sablecc/sablecc/AddAstProductions.java
@@ -26,7 +26,7 @@ import java.io.*;
public class AddAstProductions extends DepthFirstAdapter
{
- List<AAstProd> listAstProd = new LinkedList<>();
+ List<PAstProd> listAstProd = new LinkedList<>();
private boolean firstAlt;
public AddAstProductions()
@@ -95,8 +95,8 @@ public class AddAstProductions extends DepthFirstAdapter
}
}
- List<AElem> listElems;
- List<AAstAlt> listOfAstAlts;
+ List<PElem> listElems;
+ List<PAstAlt> listOfAstAlts;
public void error(Token token)
{
diff --git a/src/main/java/org/sablecc/sablecc/Inlining.java b/src/main/java/org/sablecc/sablecc/Inlining.java
index 12ac903..a6b0a78 100644
--- a/src/main/java/org/sablecc/sablecc/Inlining.java
+++ b/src/main/java/org/sablecc/sablecc/Inlining.java
@@ -79,7 +79,7 @@ public class Inlining
Once we detect that the production can be inline,
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++)
{
listOfAlts.addAll( inlineAlternative(alts[i]) );
@@ -107,7 +107,7 @@ public class Inlining
return false;
}
- List<AAlt> removeAlternativeDoubloonsFromInlinedProduction(List<AAlt> inlinedAlternatives)
+ List<PAlt> removeAlternativeDoubloonsFromInlinedProduction(List<PAlt> inlinedAlternatives)
{
AAlt[] alts = inlinedAlternatives.toArray(new AAlt[0]);
List<?>[] theWhole = new List<?>[alts.length];
--
GitLab