From 038882e74baf697e2fb5765914a6fcf21d4d92b9 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 3 May 2023 14:16:22 +0200
Subject: [PATCH] Remove all generated star imports except for node package

---
 src/main/java/org/sablecc/sablecc/node/AAlt.java             | 3 +--
 src/main/java/org/sablecc/sablecc/node/AAltTransform.java    | 3 +--
 src/main/java/org/sablecc/sablecc/node/AAst.java             | 3 +--
 src/main/java/org/sablecc/sablecc/node/AAstAlt.java          | 3 +--
 src/main/java/org/sablecc/sablecc/node/AAstProd.java         | 3 +--
 src/main/java/org/sablecc/sablecc/node/ACharBasic.java       | 3 +--
 src/main/java/org/sablecc/sablecc/node/ACharChar.java        | 3 +--
 src/main/java/org/sablecc/sablecc/node/AConcat.java          | 3 +--
 src/main/java/org/sablecc/sablecc/node/ADecChar.java         | 3 +--
 src/main/java/org/sablecc/sablecc/node/AElem.java            | 3 +--
 src/main/java/org/sablecc/sablecc/node/AGrammar.java         | 3 +--
 src/main/java/org/sablecc/sablecc/node/AHelperDef.java       | 3 +--
 src/main/java/org/sablecc/sablecc/node/AHelpers.java         | 3 +--
 src/main/java/org/sablecc/sablecc/node/AHexChar.java         | 3 +--
 src/main/java/org/sablecc/sablecc/node/AIdBasic.java         | 3 +--
 src/main/java/org/sablecc/sablecc/node/AIgnTokens.java       | 3 +--
 src/main/java/org/sablecc/sablecc/node/AIntervalSet.java     | 3 +--
 src/main/java/org/sablecc/sablecc/node/AListTerm.java        | 3 +--
 src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java      | 3 +--
 src/main/java/org/sablecc/sablecc/node/ANewListTerm.java     | 3 +--
 src/main/java/org/sablecc/sablecc/node/ANewTerm.java         | 3 +--
 src/main/java/org/sablecc/sablecc/node/ANullTerm.java        | 3 +--
 src/main/java/org/sablecc/sablecc/node/AOperationSet.java    | 3 +--
 src/main/java/org/sablecc/sablecc/node/APlusBinOp.java       | 3 +--
 src/main/java/org/sablecc/sablecc/node/APlusUnOp.java        | 3 +--
 src/main/java/org/sablecc/sablecc/node/AProd.java            | 3 +--
 src/main/java/org/sablecc/sablecc/node/AProdName.java        | 3 +--
 .../java/org/sablecc/sablecc/node/AProductionSpecifier.java  | 3 +--
 src/main/java/org/sablecc/sablecc/node/AProductions.java     | 3 +--
 src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java       | 3 +--
 src/main/java/org/sablecc/sablecc/node/ARegExp.java          | 3 +--
 src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java     | 3 +--
 src/main/java/org/sablecc/sablecc/node/ASetBasic.java        | 3 +--
 src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java  | 3 +--
 src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java      | 3 +--
 src/main/java/org/sablecc/sablecc/node/AStarUnOp.java        | 3 +--
 src/main/java/org/sablecc/sablecc/node/AStateList.java       | 3 +--
 src/main/java/org/sablecc/sablecc/node/AStateListTail.java   | 3 +--
 src/main/java/org/sablecc/sablecc/node/AStates.java          | 3 +--
 src/main/java/org/sablecc/sablecc/node/AStringBasic.java     | 3 +--
 src/main/java/org/sablecc/sablecc/node/ATokenDef.java        | 3 +--
 src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java  | 3 +--
 src/main/java/org/sablecc/sablecc/node/ATokens.java          | 3 +--
 src/main/java/org/sablecc/sablecc/node/ATransition.java      | 3 +--
 src/main/java/org/sablecc/sablecc/node/AUnExp.java           | 3 +--
 src/main/java/org/sablecc/sablecc/node/EOF.java              | 2 +-
 src/main/java/org/sablecc/sablecc/node/Start.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TAbstract.java        | 2 +-
 src/main/java/org/sablecc/sablecc/node/TArrow.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TBar.java             | 2 +-
 src/main/java/org/sablecc/sablecc/node/TBlank.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TChar.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TColon.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TComma.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TComment.java         | 2 +-
 src/main/java/org/sablecc/sablecc/node/TDDot.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TDecChar.java         | 2 +-
 src/main/java/org/sablecc/sablecc/node/TDot.java             | 2 +-
 src/main/java/org/sablecc/sablecc/node/TEqual.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/THelpers.java         | 2 +-
 src/main/java/org/sablecc/sablecc/node/THexChar.java         | 2 +-
 src/main/java/org/sablecc/sablecc/node/TId.java              | 2 +-
 src/main/java/org/sablecc/sablecc/node/TIgnored.java         | 2 +-
 src/main/java/org/sablecc/sablecc/node/TLBkt.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TLBrace.java          | 2 +-
 src/main/java/org/sablecc/sablecc/node/TLPar.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TMinus.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TNew.java             | 2 +-
 src/main/java/org/sablecc/sablecc/node/TNull.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TPackage.java         | 2 +-
 src/main/java/org/sablecc/sablecc/node/TPkgId.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TPlus.java            | 2 +-
 .../java/org/sablecc/sablecc/node/TProductionSpecifier.java  | 2 +-
 src/main/java/org/sablecc/sablecc/node/TProductions.java     | 2 +-
 src/main/java/org/sablecc/sablecc/node/TQMark.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TRBkt.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TRBrace.java          | 2 +-
 src/main/java/org/sablecc/sablecc/node/TRPar.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TSemicolon.java       | 2 +-
 src/main/java/org/sablecc/sablecc/node/TSlash.java           | 2 +-
 src/main/java/org/sablecc/sablecc/node/TStar.java            | 2 +-
 src/main/java/org/sablecc/sablecc/node/TStates.java          | 2 +-
 src/main/java/org/sablecc/sablecc/node/TString.java          | 2 +-
 src/main/java/org/sablecc/sablecc/node/TSyntax.java          | 2 +-
 src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java  | 2 +-
 src/main/java/org/sablecc/sablecc/node/TTokens.java          | 2 +-
 src/main/java/org/sablecc/sablecc/node/TTree.java            | 2 +-
 src/main/java/org/sablecc/sablecc/parser/Parser.java         | 3 ++-
 src/main/java/org/sablecc/sablecc/parser/TokenIndex.java     | 2 +-
 src/main/resources/org/sablecc/sablecc/alternatives.txt      | 3 +--
 src/main/resources/org/sablecc/sablecc/parser.txt            | 5 +++--
 src/main/resources/org/sablecc/sablecc/tokens.txt            | 4 ++--
 src/main/resources/org/sablecc/sablecc/utils.txt             | 4 ++--
 93 files changed, 98 insertions(+), 142 deletions(-)

diff --git a/src/main/java/org/sablecc/sablecc/node/AAlt.java b/src/main/java/org/sablecc/sablecc/node/AAlt.java
index b856c3e..46fa13e 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAlt.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAlt extends PAlt
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
index c501998..40ae997 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAltTransform extends PAltTransform
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAst.java b/src/main/java/org/sablecc/sablecc/node/AAst.java
index e27ff6f..82a3c28 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAst.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAst.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAst extends PAst
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
index 3b59880..57f8d82 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAstAlt extends PAstAlt
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstProd.java b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
index a903a33..9548aa5 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAstProd extends PAstProd
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
index e2c2c29..270a06c 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ACharBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharChar.java b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
index c843556..0b11b64 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ACharChar extends PChar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AConcat.java b/src/main/java/org/sablecc/sablecc/node/AConcat.java
index 00173c3..76b5d87 100644
--- a/src/main/java/org/sablecc/sablecc/node/AConcat.java
+++ b/src/main/java/org/sablecc/sablecc/node/AConcat.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AConcat extends PConcat
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ADecChar.java b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
index 31c5033..0778ae0 100644
--- a/src/main/java/org/sablecc/sablecc/node/ADecChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ADecChar extends PChar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AElem.java b/src/main/java/org/sablecc/sablecc/node/AElem.java
index 70985fa..f961acc 100644
--- a/src/main/java/org/sablecc/sablecc/node/AElem.java
+++ b/src/main/java/org/sablecc/sablecc/node/AElem.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AElem extends PElem
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AGrammar.java b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
index e16f1d2..ef39aa3 100644
--- a/src/main/java/org/sablecc/sablecc/node/AGrammar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AGrammar extends PGrammar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
index 872f966..93742b9 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AHelperDef extends PHelperDef
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelpers.java b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
index ded0703..f083aec 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelpers.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AHelpers extends PHelpers
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AHexChar.java b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
index 0391372..ea2c910 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHexChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AHexChar extends PChar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
index 8ce3a09..2089831 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AIdBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
index ed818d0..21caa3f 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AIgnTokens extends PIgnTokens
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
index dbd1b00..aa6dcc6 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AIntervalSet extends PSet
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AListTerm.java b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
index 6058e15..d87e033 100644
--- a/src/main/java/org/sablecc/sablecc/node/AListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AListTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
index f83b25f..d707ff0 100644
--- a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AMinusBinOp extends PBinOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
index 55f4202..0d3d834 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ANewListTerm extends PListTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
index 1726c71..601f792 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ANewTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
index 7054505..dcd1f7f 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ANullTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
index d34ea90..0cd9593 100644
--- a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AOperationSet extends PSet
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
index 37600cb..653ce61 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class APlusBinOp extends PBinOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
index d31ac09..c18ef1b 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class APlusUnOp extends PUnOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProd.java b/src/main/java/org/sablecc/sablecc/node/AProd.java
index 961339d..ffa7289 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProd.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProd extends PProd
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProdName.java b/src/main/java/org/sablecc/sablecc/node/AProdName.java
index 48d5ed2..f5be37e 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProdName.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProdName.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProdName extends PProdName
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
index df84feb..cccd16d 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProductionSpecifier extends PSpecifier
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductions.java b/src/main/java/org/sablecc/sablecc/node/AProductions.java
index c26ba7c..f95ec5a 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductions.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductions.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProductions extends PProductions
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
index da78e87..4eb1cc4 100644
--- a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AQMarkUnOp extends PUnOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExp.java b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
index 8c053d8..ad35d8b 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ARegExp extends PRegExp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
index 1c29eec..8169e64 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ARegExpBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
index 9c26ab0..10040dd 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ASetBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
index 7821735..2efef46 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ASimpleListTerm extends PListTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
index 693bea1..1138d99 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ASimpleTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
index 65146a4..9e6fa0d 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStarUnOp extends PUnOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateList.java b/src/main/java/org/sablecc/sablecc/node/AStateList.java
index 7954c68..7af9133 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateList.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateList.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStateList extends PStateList
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
index b07fbfc..748b9db 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStateListTail extends PStateListTail
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStates.java b/src/main/java/org/sablecc/sablecc/node/AStates.java
index f270853..a191372 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStates.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStates.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStates extends PStates
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
index 79963c2..c52baeb 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStringBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
index b2e423d..21aa248 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATokenDef extends PTokenDef
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
index 596e939..4cabc05 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATokenSpecifier extends PSpecifier
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokens.java b/src/main/java/org/sablecc/sablecc/node/ATokens.java
index f07f185..d128831 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokens.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATokens extends PTokens
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATransition.java b/src/main/java/org/sablecc/sablecc/node/ATransition.java
index e0c6328..efc2ecb 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATransition.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATransition.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATransition extends PTransition
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AUnExp.java b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
index ea2d1e3..30185f0 100644
--- a/src/main/java/org/sablecc/sablecc/node/AUnExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AUnExp extends PUnExp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/EOF.java b/src/main/java/org/sablecc/sablecc/node/EOF.java
index db29f86..8d7e017 100644
--- a/src/main/java/org/sablecc/sablecc/node/EOF.java
+++ b/src/main/java/org/sablecc/sablecc/node/EOF.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class EOF extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/Start.java b/src/main/java/org/sablecc/sablecc/node/Start.java
index 0988c84..f9e230a 100644
--- a/src/main/java/org/sablecc/sablecc/node/Start.java
+++ b/src/main/java/org/sablecc/sablecc/node/Start.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class Start extends Node
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TAbstract.java b/src/main/java/org/sablecc/sablecc/node/TAbstract.java
index f66d260..ba9a910 100644
--- a/src/main/java/org/sablecc/sablecc/node/TAbstract.java
+++ b/src/main/java/org/sablecc/sablecc/node/TAbstract.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TAbstract extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TArrow.java b/src/main/java/org/sablecc/sablecc/node/TArrow.java
index a7ae840..9a22211 100644
--- a/src/main/java/org/sablecc/sablecc/node/TArrow.java
+++ b/src/main/java/org/sablecc/sablecc/node/TArrow.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TArrow extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TBar.java b/src/main/java/org/sablecc/sablecc/node/TBar.java
index 7b3d24d..36d967f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TBar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TBar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TBar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TBlank.java b/src/main/java/org/sablecc/sablecc/node/TBlank.java
index 3a9bccc..de51cb9 100644
--- a/src/main/java/org/sablecc/sablecc/node/TBlank.java
+++ b/src/main/java/org/sablecc/sablecc/node/TBlank.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TBlank extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TChar.java b/src/main/java/org/sablecc/sablecc/node/TChar.java
index 580f2ba..aecb775 100644
--- a/src/main/java/org/sablecc/sablecc/node/TChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TChar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TChar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TColon.java b/src/main/java/org/sablecc/sablecc/node/TColon.java
index 2747eb1..76e6ae6 100644
--- a/src/main/java/org/sablecc/sablecc/node/TColon.java
+++ b/src/main/java/org/sablecc/sablecc/node/TColon.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TColon extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TComma.java b/src/main/java/org/sablecc/sablecc/node/TComma.java
index bd6d1d6..485b422 100644
--- a/src/main/java/org/sablecc/sablecc/node/TComma.java
+++ b/src/main/java/org/sablecc/sablecc/node/TComma.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TComma extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TComment.java b/src/main/java/org/sablecc/sablecc/node/TComment.java
index 1174134..9f9f1a5 100644
--- a/src/main/java/org/sablecc/sablecc/node/TComment.java
+++ b/src/main/java/org/sablecc/sablecc/node/TComment.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TComment extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TDDot.java b/src/main/java/org/sablecc/sablecc/node/TDDot.java
index 2d3f331..0c2dd1f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDDot.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDDot.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TDDot extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TDecChar.java b/src/main/java/org/sablecc/sablecc/node/TDecChar.java
index e2d371d..22104e3 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDecChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDecChar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TDecChar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TDot.java b/src/main/java/org/sablecc/sablecc/node/TDot.java
index d70aab4..394e43f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDot.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDot.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TDot extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TEqual.java b/src/main/java/org/sablecc/sablecc/node/TEqual.java
index 45267a6..c5b4c7c 100644
--- a/src/main/java/org/sablecc/sablecc/node/TEqual.java
+++ b/src/main/java/org/sablecc/sablecc/node/TEqual.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TEqual extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/THelpers.java b/src/main/java/org/sablecc/sablecc/node/THelpers.java
index 73a6bf9..27b2966 100644
--- a/src/main/java/org/sablecc/sablecc/node/THelpers.java
+++ b/src/main/java/org/sablecc/sablecc/node/THelpers.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class THelpers extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/THexChar.java b/src/main/java/org/sablecc/sablecc/node/THexChar.java
index 7f9a467..2b09dc0 100644
--- a/src/main/java/org/sablecc/sablecc/node/THexChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/THexChar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class THexChar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TId.java b/src/main/java/org/sablecc/sablecc/node/TId.java
index 2358ae4..4323e68 100644
--- a/src/main/java/org/sablecc/sablecc/node/TId.java
+++ b/src/main/java/org/sablecc/sablecc/node/TId.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TId extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TIgnored.java b/src/main/java/org/sablecc/sablecc/node/TIgnored.java
index 650d981..3512dee 100644
--- a/src/main/java/org/sablecc/sablecc/node/TIgnored.java
+++ b/src/main/java/org/sablecc/sablecc/node/TIgnored.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TIgnored extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TLBkt.java b/src/main/java/org/sablecc/sablecc/node/TLBkt.java
index 162c1e3..8e5a837 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLBkt.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLBkt.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TLBkt extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TLBrace.java b/src/main/java/org/sablecc/sablecc/node/TLBrace.java
index 463e48b..a3dcb15 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLBrace.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLBrace.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TLBrace extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TLPar.java b/src/main/java/org/sablecc/sablecc/node/TLPar.java
index ed5fca6..8ba1e87 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLPar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLPar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TLPar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TMinus.java b/src/main/java/org/sablecc/sablecc/node/TMinus.java
index 2c9f4eb..044d65c 100644
--- a/src/main/java/org/sablecc/sablecc/node/TMinus.java
+++ b/src/main/java/org/sablecc/sablecc/node/TMinus.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TMinus extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TNew.java b/src/main/java/org/sablecc/sablecc/node/TNew.java
index 4a0ad79..fcbcd30 100644
--- a/src/main/java/org/sablecc/sablecc/node/TNew.java
+++ b/src/main/java/org/sablecc/sablecc/node/TNew.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TNew extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TNull.java b/src/main/java/org/sablecc/sablecc/node/TNull.java
index 8e34cb3..47800bb 100644
--- a/src/main/java/org/sablecc/sablecc/node/TNull.java
+++ b/src/main/java/org/sablecc/sablecc/node/TNull.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TNull extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TPackage.java b/src/main/java/org/sablecc/sablecc/node/TPackage.java
index 05d320d..b2854d6 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPackage.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPackage.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TPackage extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TPkgId.java b/src/main/java/org/sablecc/sablecc/node/TPkgId.java
index 4fd2441..63fd17a 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPkgId.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPkgId.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TPkgId extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TPlus.java b/src/main/java/org/sablecc/sablecc/node/TPlus.java
index e341608..5098ea0 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPlus.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPlus.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TPlus extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java b/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
index fca83af..35a585f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TProductionSpecifier extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TProductions.java b/src/main/java/org/sablecc/sablecc/node/TProductions.java
index 4c638ed..7f402c3 100644
--- a/src/main/java/org/sablecc/sablecc/node/TProductions.java
+++ b/src/main/java/org/sablecc/sablecc/node/TProductions.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TProductions extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TQMark.java b/src/main/java/org/sablecc/sablecc/node/TQMark.java
index caf4b18..aebf492 100644
--- a/src/main/java/org/sablecc/sablecc/node/TQMark.java
+++ b/src/main/java/org/sablecc/sablecc/node/TQMark.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TQMark extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TRBkt.java b/src/main/java/org/sablecc/sablecc/node/TRBkt.java
index af3b0d0..30552da 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRBkt.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRBkt.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TRBkt extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TRBrace.java b/src/main/java/org/sablecc/sablecc/node/TRBrace.java
index 1fea9e0..04be2a1 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRBrace.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRBrace.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TRBrace extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TRPar.java b/src/main/java/org/sablecc/sablecc/node/TRPar.java
index acd235f..c797774 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRPar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRPar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TRPar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TSemicolon.java b/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
index 31b4ad2..144ab07 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TSemicolon extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TSlash.java b/src/main/java/org/sablecc/sablecc/node/TSlash.java
index fd8ed56..6b2fd73 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSlash.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSlash.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TSlash extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TStar.java b/src/main/java/org/sablecc/sablecc/node/TStar.java
index 812ff23..c683591 100644
--- a/src/main/java/org/sablecc/sablecc/node/TStar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TStar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TStar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TStates.java b/src/main/java/org/sablecc/sablecc/node/TStates.java
index 18efef1..45a75a7 100644
--- a/src/main/java/org/sablecc/sablecc/node/TStates.java
+++ b/src/main/java/org/sablecc/sablecc/node/TStates.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TStates extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TString.java b/src/main/java/org/sablecc/sablecc/node/TString.java
index d328437..452162e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TString.java
+++ b/src/main/java/org/sablecc/sablecc/node/TString.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TString extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TSyntax.java b/src/main/java/org/sablecc/sablecc/node/TSyntax.java
index fc898d0..4e7340f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSyntax.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSyntax.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TSyntax extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java b/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
index dab3225..b37b101 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TTokenSpecifier extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TTokens.java b/src/main/java/org/sablecc/sablecc/node/TTokens.java
index ae2f7a0..fac6c7a 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTokens.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TTokens extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TTree.java b/src/main/java/org/sablecc/sablecc/node/TTree.java
index e168bc9..91100d3 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTree.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTree.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TTree extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java
index 051bcc2..a5f0174 100644
--- a/src/main/java/org/sablecc/sablecc/parser/Parser.java
+++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java
@@ -18,7 +18,8 @@ import de.hhu.stups.sablecc.patch.IToken;
 import de.hhu.stups.sablecc.patch.PositionedNode;
 import de.hhu.stups.sablecc.patch.SourcecodeRange;
 
-import org.sablecc.sablecc.lexer.*;
+import org.sablecc.sablecc.lexer.Lexer;
+import org.sablecc.sablecc.lexer.LexerException;
 import org.sablecc.sablecc.node.*;
 
 @SuppressWarnings({"rawtypes","unchecked","unused"})
diff --git a/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java b/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java
index 6580115..37018e9 100644
--- a/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java
+++ b/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.parser;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.AnalysisAdapter;
 import org.sablecc.sablecc.node.*;
 
 class TokenIndex extends AnalysisAdapter
diff --git a/src/main/resources/org/sablecc/sablecc/alternatives.txt b/src/main/resources/org/sablecc/sablecc/alternatives.txt
index 4b15e03..e5cd53d 100644
--- a/src/main/resources/org/sablecc/sablecc/alternatives.txt
+++ b/src/main/resources/org/sablecc/sablecc/alternatives.txt
@@ -22,8 +22,7 @@ import java.util.ListIterator;
 $
 
 Macro:AlternativeHeader2
-import $0$analysis.*;
-
+import $0$analysis.Analysis;
 
 public final class $1$ extends $2$
 {
diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt
index 8bf2baa..f5b39aa 100644
--- a/src/main/resources/org/sablecc/sablecc/parser.txt
+++ b/src/main/resources/org/sablecc/sablecc/parser.txt
@@ -26,7 +26,8 @@ import de.hhu.stups.sablecc.patch.IToken;
 import de.hhu.stups.sablecc.patch.PositionedNode;
 import de.hhu.stups.sablecc.patch.SourcecodeRange;
 
-import $0$lexer.*;
+import $0$lexer.Lexer;
+import $0$lexer.LexerException;
 import $0$node.*;
 
 @SuppressWarnings({"rawtypes","unchecked","unused"})
@@ -582,7 +583,7 @@ Macro:TokenIndexHeader
 
 package $0$parser;
 
-import $0$analysis.*;
+import $0$analysis.AnalysisAdapter;
 import $0$node.*;
 
 class TokenIndex extends AnalysisAdapter
diff --git a/src/main/resources/org/sablecc/sablecc/tokens.txt b/src/main/resources/org/sablecc/sablecc/tokens.txt
index 32f9cd4..ce4cfbc 100644
--- a/src/main/resources/org/sablecc/sablecc/tokens.txt
+++ b/src/main/resources/org/sablecc/sablecc/tokens.txt
@@ -10,7 +10,7 @@ Macro:VariableTextToken
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class $1$ extends Token
 {
@@ -49,7 +49,7 @@ Macro:FixedTextToken
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class $1$ extends Token
 {
diff --git a/src/main/resources/org/sablecc/sablecc/utils.txt b/src/main/resources/org/sablecc/sablecc/utils.txt
index 4e4e20d..92ce086 100644
--- a/src/main/resources/org/sablecc/sablecc/utils.txt
+++ b/src/main/resources/org/sablecc/sablecc/utils.txt
@@ -10,7 +10,7 @@ Macro:Start
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class Start extends Node
 {
@@ -151,7 +151,7 @@ Macro:EOF
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class EOF extends Token
 {
-- 
GitLab