From 53c2a2f983e503847f847001c0a05fb4740ab09b Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Mon, 25 Apr 2022 16:56:07 +0200
Subject: [PATCH] Clean up imports in non-generated code
---
.../org/sablecc/sablecc/AcceptStates.java | 5 ++---
.../sablecc/sablecc/AddAstProductions.java | 7 ++++---
...ntualEmptyTransformationToProductions.java | 6 +++---
.../AddProdTransformAndAltTransform.java | 7 ++++---
.../sablecc/sablecc/AltTransformAdapter.java | 7 ++++---
.../sablecc/AlternativeElementTypes.java | 7 ++++---
.../java/org/sablecc/sablecc/CharSet.java | 4 +++-
.../sablecc/ComputeCGNomenclature.java | 7 ++++---
.../org/sablecc/sablecc/ComputeInlining.java | 7 +++++--
.../sablecc/ComputeSimpleTermPosition.java | 7 ++++---
.../sablecc/sablecc/ConflictException.java | 1 -
.../org/sablecc/sablecc/ConstructNFA.java | 9 ++++++--
.../ConstructParserGenerationDatas.java | 5 +++--
.../sablecc/sablecc/ConstructProdsMap.java | 8 ++++---
.../org/sablecc/sablecc/DisplayLicense.java | 4 +++-
.../java/org/sablecc/sablecc/GenAlts.java | 13 +++++++++---
.../java/org/sablecc/sablecc/GenAnalyses.java | 13 +++++++++---
.../java/org/sablecc/sablecc/GenLexer.java | 21 +++++++++++++++----
.../java/org/sablecc/sablecc/GenParser.java | 20 +++++++++++++++---
.../java/org/sablecc/sablecc/GenProds.java | 12 +++++++----
.../java/org/sablecc/sablecc/GenTokens.java | 11 +++++++---
.../java/org/sablecc/sablecc/GenUtils.java | 13 ++++++++----
.../GenerateAlternativeCodeForParser.java | 10 ++++++---
.../java/org/sablecc/sablecc/Grammar.java | 7 ++++++-
.../org/sablecc/sablecc/In_Production.java | 7 +++++--
.../java/org/sablecc/sablecc/Inlining.java | 11 ++++++++--
.../InternalTransformationsToGrammar.java | 11 +++++++---
.../org/sablecc/sablecc/LR0Collection.java | 5 ++++-
.../java/org/sablecc/sablecc/LR0Item.java | 2 +-
.../java/org/sablecc/sablecc/LR0ItemSet.java | 4 +++-
.../org/sablecc/sablecc/LR1Collection.java | 5 ++++-
.../java/org/sablecc/sablecc/LR1Item.java | 2 --
.../java/org/sablecc/sablecc/LR1ItemSet.java | 6 +++++-
.../org/sablecc/sablecc/MacroExpander.java | 11 ++++++++--
src/main/java/org/sablecc/sablecc/NFA.java | 2 --
.../org/sablecc/sablecc/PrettyPrinter.java | 3 +--
.../java/org/sablecc/sablecc/Production.java | 5 ++++-
.../RecursiveProductionsDetections.java | 6 ++++--
.../org/sablecc/sablecc/ResolveAltIds.java | 9 +++++---
.../org/sablecc/sablecc/ResolveAstIds.java | 9 +++++---
.../java/org/sablecc/sablecc/ResolveIds.java | 11 +++++++---
.../sablecc/ResolveProdTransformIds.java | 10 ++++++---
.../sablecc/sablecc/ResolveTransformIds.java | 10 ++++++---
.../java/org/sablecc/sablecc/SableCC.java | 20 +++++++++++-------
src/main/java/org/sablecc/sablecc/Symbol.java | 5 ++++-
.../java/org/sablecc/sablecc/SymbolSet.java | 3 ++-
.../java/org/sablecc/sablecc/Transitions.java | 7 +++++--
47 files changed, 261 insertions(+), 114 deletions(-)
diff --git a/src/main/java/org/sablecc/sablecc/AcceptStates.java b/src/main/java/org/sablecc/sablecc/AcceptStates.java
index 76e46e1..33088aa 100644
--- a/src/main/java/org/sablecc/sablecc/AcceptStates.java
+++ b/src/main/java/org/sablecc/sablecc/AcceptStates.java
@@ -7,9 +7,8 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.util.*;
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.Start;
public class AcceptStates extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/AddAstProductions.java b/src/main/java/org/sablecc/sablecc/AddAstProductions.java
index 3215085..5051639 100644
--- a/src/main/java/org/sablecc/sablecc/AddAstProductions.java
+++ b/src/main/java/org/sablecc/sablecc/AddAstProductions.java
@@ -7,10 +7,11 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
/*
* AddAstProductions
diff --git a/src/main/java/org/sablecc/sablecc/AddEventualEmptyTransformationToProductions.java b/src/main/java/org/sablecc/sablecc/AddEventualEmptyTransformationToProductions.java
index 74641a9..145eafe 100644
--- a/src/main/java/org/sablecc/sablecc/AddEventualEmptyTransformationToProductions.java
+++ b/src/main/java/org/sablecc/sablecc/AddEventualEmptyTransformationToProductions.java
@@ -7,10 +7,10 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
/*
* AddEventualEmptyTransformationToProductions
diff --git a/src/main/java/org/sablecc/sablecc/AddProdTransformAndAltTransform.java b/src/main/java/org/sablecc/sablecc/AddProdTransformAndAltTransform.java
index 0b533ce..590d6a7 100644
--- a/src/main/java/org/sablecc/sablecc/AddProdTransformAndAltTransform.java
+++ b/src/main/java/org/sablecc/sablecc/AddProdTransformAndAltTransform.java
@@ -7,10 +7,11 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
/*
* AddProdTransformAndAltTransform
diff --git a/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java b/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java
index 8d215b1..51fd2d0 100644
--- a/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java
+++ b/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java
@@ -7,10 +7,11 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.List;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.io.*;
public class AltTransformAdapter extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/AlternativeElementTypes.java b/src/main/java/org/sablecc/sablecc/AlternativeElementTypes.java
index 209be94..37c9b38 100644
--- a/src/main/java/org/sablecc/sablecc/AlternativeElementTypes.java
+++ b/src/main/java/org/sablecc/sablecc/AlternativeElementTypes.java
@@ -7,10 +7,11 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
public class AlternativeElementTypes extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/CharSet.java b/src/main/java/org/sablecc/sablecc/CharSet.java
index f6ae0cb..3812087 100644
--- a/src/main/java/org/sablecc/sablecc/CharSet.java
+++ b/src/main/java/org/sablecc/sablecc/CharSet.java
@@ -7,7 +7,9 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
public class CharSet implements Cloneable
{
diff --git a/src/main/java/org/sablecc/sablecc/ComputeCGNomenclature.java b/src/main/java/org/sablecc/sablecc/ComputeCGNomenclature.java
index 06218a9..5047dbb 100644
--- a/src/main/java/org/sablecc/sablecc/ComputeCGNomenclature.java
+++ b/src/main/java/org/sablecc/sablecc/ComputeCGNomenclature.java
@@ -19,10 +19,11 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
public class ComputeCGNomenclature extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/ComputeInlining.java b/src/main/java/org/sablecc/sablecc/ComputeInlining.java
index 8a2e01e..dbbc766 100644
--- a/src/main/java/org/sablecc/sablecc/ComputeInlining.java
+++ b/src/main/java/org/sablecc/sablecc/ComputeInlining.java
@@ -7,8 +7,11 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
/*
diff --git a/src/main/java/org/sablecc/sablecc/ComputeSimpleTermPosition.java b/src/main/java/org/sablecc/sablecc/ComputeSimpleTermPosition.java
index c86f5f7..003e60d 100644
--- a/src/main/java/org/sablecc/sablecc/ComputeSimpleTermPosition.java
+++ b/src/main/java/org/sablecc/sablecc/ComputeSimpleTermPosition.java
@@ -7,10 +7,11 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
public class ComputeSimpleTermPosition extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/ConflictException.java b/src/main/java/org/sablecc/sablecc/ConflictException.java
index 8120a9a..d3e8db8 100644
--- a/src/main/java/org/sablecc/sablecc/ConflictException.java
+++ b/src/main/java/org/sablecc/sablecc/ConflictException.java
@@ -7,7 +7,6 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.node.*;
import java.util.Set;
@SuppressWarnings("serial")
diff --git a/src/main/java/org/sablecc/sablecc/ConstructNFA.java b/src/main/java/org/sablecc/sablecc/ConstructNFA.java
index 284d5e6..15a5708 100644
--- a/src/main/java/org/sablecc/sablecc/ConstructNFA.java
+++ b/src/main/java/org/sablecc/sablecc/ConstructNFA.java
@@ -7,8 +7,13 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
public class ConstructNFA extends DepthFirstAdapter
diff --git a/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java b/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java
index c43996f..41e525d 100644
--- a/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java
+++ b/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java
@@ -7,8 +7,9 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
public class ConstructParserGenerationDatas extends DepthFirstAdapter
diff --git a/src/main/java/org/sablecc/sablecc/ConstructProdsMap.java b/src/main/java/org/sablecc/sablecc/ConstructProdsMap.java
index b0725fe..16b86b8 100644
--- a/src/main/java/org/sablecc/sablecc/ConstructProdsMap.java
+++ b/src/main/java/org/sablecc/sablecc/ConstructProdsMap.java
@@ -7,9 +7,11 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.AProd;
public class ConstructProdsMap extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/DisplayLicense.java b/src/main/java/org/sablecc/sablecc/DisplayLicense.java
index 88c1f78..75452da 100644
--- a/src/main/java/org/sablecc/sablecc/DisplayLicense.java
+++ b/src/main/java/org/sablecc/sablecc/DisplayLicense.java
@@ -7,7 +7,9 @@
package org.sablecc.sablecc;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
class DisplayLicense
{
diff --git a/src/main/java/org/sablecc/sablecc/GenAlts.java b/src/main/java/org/sablecc/sablecc/GenAlts.java
index 5c670d7..e2e706c 100644
--- a/src/main/java/org/sablecc/sablecc/GenAlts.java
+++ b/src/main/java/org/sablecc/sablecc/GenAlts.java
@@ -7,10 +7,17 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
public class GenAlts extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/GenAnalyses.java b/src/main/java/org/sablecc/sablecc/GenAnalyses.java
index f5c0288..629a7f4 100644
--- a/src/main/java/org/sablecc/sablecc/GenAnalyses.java
+++ b/src/main/java/org/sablecc/sablecc/GenAnalyses.java
@@ -7,10 +7,17 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
public class GenAnalyses extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/GenLexer.java b/src/main/java/org/sablecc/sablecc/GenLexer.java
index 4f093a7..da9b0ca 100644
--- a/src/main/java/org/sablecc/sablecc/GenLexer.java
+++ b/src/main/java/org/sablecc/sablecc/GenLexer.java
@@ -7,10 +7,23 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.AnalysisAdapter;
+import org.sablecc.sablecc.node.ATokenDef;
+import org.sablecc.sablecc.node.Start;
public class GenLexer extends AnalysisAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/GenParser.java b/src/main/java/org/sablecc/sablecc/GenParser.java
index 06a6770..a927be8 100644
--- a/src/main/java/org/sablecc/sablecc/GenParser.java
+++ b/src/main/java/org/sablecc/sablecc/GenParser.java
@@ -7,10 +7,24 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.io.*;
/*
* GenParser
diff --git a/src/main/java/org/sablecc/sablecc/GenProds.java b/src/main/java/org/sablecc/sablecc/GenProds.java
index 140e579..a327e0a 100644
--- a/src/main/java/org/sablecc/sablecc/GenProds.java
+++ b/src/main/java/org/sablecc/sablecc/GenProds.java
@@ -7,10 +7,14 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.AAstProd;
public class GenProds extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/GenTokens.java b/src/main/java/org/sablecc/sablecc/GenTokens.java
index 4e863b7..f5abfaa 100644
--- a/src/main/java/org/sablecc/sablecc/GenTokens.java
+++ b/src/main/java/org/sablecc/sablecc/GenTokens.java
@@ -7,11 +7,16 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.List;
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.*;
+
public class GenTokens extends DepthFirstAdapter
{
private MacroExpander macros;
diff --git a/src/main/java/org/sablecc/sablecc/GenUtils.java b/src/main/java/org/sablecc/sablecc/GenUtils.java
index 6310ed2..051ab0f 100644
--- a/src/main/java/org/sablecc/sablecc/GenUtils.java
+++ b/src/main/java/org/sablecc/sablecc/GenUtils.java
@@ -7,10 +7,15 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
+import org.sablecc.sablecc.node.AAstProd;
+import org.sablecc.sablecc.node.Start;
public class GenUtils extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java b/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java
index 210d951..a2613bd 100644
--- a/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java
+++ b/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java
@@ -7,10 +7,14 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.io.*;
public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/Grammar.java b/src/main/java/org/sablecc/sablecc/Grammar.java
index 8ee609f..fd612ab 100644
--- a/src/main/java/org/sablecc/sablecc/Grammar.java
+++ b/src/main/java/org/sablecc/sablecc/Grammar.java
@@ -7,7 +7,12 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
public final class Grammar
{
diff --git a/src/main/java/org/sablecc/sablecc/In_Production.java b/src/main/java/org/sablecc/sablecc/In_Production.java
index 844dc51..63b00d5 100644
--- a/src/main/java/org/sablecc/sablecc/In_Production.java
+++ b/src/main/java/org/sablecc/sablecc/In_Production.java
@@ -7,8 +7,11 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
public class In_Production
diff --git a/src/main/java/org/sablecc/sablecc/Inlining.java b/src/main/java/org/sablecc/sablecc/Inlining.java
index 0450a29..4c6742d 100644
--- a/src/main/java/org/sablecc/sablecc/Inlining.java
+++ b/src/main/java/org/sablecc/sablecc/Inlining.java
@@ -16,8 +16,15 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
public class Inlining
diff --git a/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java b/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java
index a79d570..4957187 100644
--- a/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java
+++ b/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java
@@ -15,10 +15,15 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.AnalysisAdapter;
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.io.*;
public class InternalTransformationsToGrammar extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/LR0Collection.java b/src/main/java/org/sablecc/sablecc/LR0Collection.java
index 86afd73..669e54b 100644
--- a/src/main/java/org/sablecc/sablecc/LR0Collection.java
+++ b/src/main/java/org/sablecc/sablecc/LR0Collection.java
@@ -7,7 +7,10 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
final class LR0Collection
{
diff --git a/src/main/java/org/sablecc/sablecc/LR0Item.java b/src/main/java/org/sablecc/sablecc/LR0Item.java
index b9bf3bd..219ec70 100644
--- a/src/main/java/org/sablecc/sablecc/LR0Item.java
+++ b/src/main/java/org/sablecc/sablecc/LR0Item.java
@@ -7,7 +7,7 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.StringTokenizer;
final class LR0Item implements Cloneable, Comparable<LR0Item>
{
diff --git a/src/main/java/org/sablecc/sablecc/LR0ItemSet.java b/src/main/java/org/sablecc/sablecc/LR0ItemSet.java
index a8765d9..7ff6f80 100644
--- a/src/main/java/org/sablecc/sablecc/LR0ItemSet.java
+++ b/src/main/java/org/sablecc/sablecc/LR0ItemSet.java
@@ -7,7 +7,9 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
final class LR0ItemSet implements Cloneable, Comparable<LR0ItemSet>
{
diff --git a/src/main/java/org/sablecc/sablecc/LR1Collection.java b/src/main/java/org/sablecc/sablecc/LR1Collection.java
index ddd6200..74313fc 100644
--- a/src/main/java/org/sablecc/sablecc/LR1Collection.java
+++ b/src/main/java/org/sablecc/sablecc/LR1Collection.java
@@ -7,7 +7,10 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
final class LR1Collection
{
diff --git a/src/main/java/org/sablecc/sablecc/LR1Item.java b/src/main/java/org/sablecc/sablecc/LR1Item.java
index 0936d08..dc509d8 100644
--- a/src/main/java/org/sablecc/sablecc/LR1Item.java
+++ b/src/main/java/org/sablecc/sablecc/LR1Item.java
@@ -7,8 +7,6 @@
package org.sablecc.sablecc;
-import java.util.*;
-
final class LR1Item implements Cloneable, Comparable<LR1Item>
{
final LR0Item lr0Item;
diff --git a/src/main/java/org/sablecc/sablecc/LR1ItemSet.java b/src/main/java/org/sablecc/sablecc/LR1ItemSet.java
index 1155356..c5cd49e 100644
--- a/src/main/java/org/sablecc/sablecc/LR1ItemSet.java
+++ b/src/main/java/org/sablecc/sablecc/LR1ItemSet.java
@@ -7,7 +7,11 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
final class LR1ItemSet implements Cloneable, Comparable<LR1ItemSet>
{
diff --git a/src/main/java/org/sablecc/sablecc/MacroExpander.java b/src/main/java/org/sablecc/sablecc/MacroExpander.java
index 5ff476f..424011b 100644
--- a/src/main/java/org/sablecc/sablecc/MacroExpander.java
+++ b/src/main/java/org/sablecc/sablecc/MacroExpander.java
@@ -7,8 +7,15 @@
package org.sablecc.sablecc;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.TreeMap;
public class MacroExpander
{
diff --git a/src/main/java/org/sablecc/sablecc/NFA.java b/src/main/java/org/sablecc/sablecc/NFA.java
index 7ae0231..162cebb 100644
--- a/src/main/java/org/sablecc/sablecc/NFA.java
+++ b/src/main/java/org/sablecc/sablecc/NFA.java
@@ -7,8 +7,6 @@
package org.sablecc.sablecc;
-import java.util.*;
-
public class NFA implements Cloneable
{
public State[] states;
diff --git a/src/main/java/org/sablecc/sablecc/PrettyPrinter.java b/src/main/java/org/sablecc/sablecc/PrettyPrinter.java
index 362b160..c6ae145 100644
--- a/src/main/java/org/sablecc/sablecc/PrettyPrinter.java
+++ b/src/main/java/org/sablecc/sablecc/PrettyPrinter.java
@@ -7,8 +7,7 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
public class PrettyPrinter extends DepthFirstAdapter
diff --git a/src/main/java/org/sablecc/sablecc/Production.java b/src/main/java/org/sablecc/sablecc/Production.java
index 9fd864c..ce880de 100644
--- a/src/main/java/org/sablecc/sablecc/Production.java
+++ b/src/main/java/org/sablecc/sablecc/Production.java
@@ -7,7 +7,10 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
final class Production
{
diff --git a/src/main/java/org/sablecc/sablecc/RecursiveProductionsDetections.java b/src/main/java/org/sablecc/sablecc/RecursiveProductionsDetections.java
index 942c318..fd3acd4 100644
--- a/src/main/java/org/sablecc/sablecc/RecursiveProductionsDetections.java
+++ b/src/main/java/org/sablecc/sablecc/RecursiveProductionsDetections.java
@@ -7,8 +7,10 @@
package org.sablecc.sablecc;
-import java.util.*;
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
public class RecursiveProductionsDetections extends DepthFirstAdapter
diff --git a/src/main/java/org/sablecc/sablecc/ResolveAltIds.java b/src/main/java/org/sablecc/sablecc/ResolveAltIds.java
index 7f9df74..fadeb6e 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveAltIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveAltIds.java
@@ -17,10 +17,13 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
/**
* This class computes semantic verifications for AST alternatives
diff --git a/src/main/java/org/sablecc/sablecc/ResolveAstIds.java b/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
index d3116a2..cc98cbf 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
@@ -7,10 +7,13 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
/*
* Last Modification date : 18-10-2004
diff --git a/src/main/java/org/sablecc/sablecc/ResolveIds.java b/src/main/java/org/sablecc/sablecc/ResolveIds.java
index 4e7ea9c..27cc669 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveIds.java
@@ -7,10 +7,15 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.io.File;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
public class ResolveIds extends DepthFirstAdapter
{
diff --git a/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java b/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java
index d615942..8a310c7 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java
@@ -7,10 +7,14 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
/*
* ResolveProdTransformIds
diff --git a/src/main/java/org/sablecc/sablecc/ResolveTransformIds.java b/src/main/java/org/sablecc/sablecc/ResolveTransformIds.java
index cd2f224..6b84e67 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveTransformIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveTransformIds.java
@@ -11,10 +11,14 @@
*/
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
-import java.io.*;
/*
* ResolveTransformIds
diff --git a/src/main/java/org/sablecc/sablecc/SableCC.java b/src/main/java/org/sablecc/sablecc/SableCC.java
index 2936c01..2ed2bb3 100644
--- a/src/main/java/org/sablecc/sablecc/SableCC.java
+++ b/src/main/java/org/sablecc/sablecc/SableCC.java
@@ -7,16 +7,20 @@
package org.sablecc.sablecc;
-import java.io.*;
-import java.awt.*;
-import java.util.*;
-import org.sablecc.sablecc.node.*;
-import org.sablecc.sablecc.analysis.*;
-import org.sablecc.sablecc.lexer.*;
-import org.sablecc.sablecc.parser.*;
-
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PushbackReader;
+import java.util.ArrayList;
import java.util.List;
+import org.sablecc.sablecc.lexer.Lexer;
+import org.sablecc.sablecc.lexer.LexerException;
+import org.sablecc.sablecc.node.AGrammar;
+import org.sablecc.sablecc.node.Start;
+import org.sablecc.sablecc.parser.Parser;
+import org.sablecc.sablecc.parser.ParserException;
+
public class SableCC {
private static boolean processInlining = true;
static int inliningMaxAlts = 20;
diff --git a/src/main/java/org/sablecc/sablecc/Symbol.java b/src/main/java/org/sablecc/sablecc/Symbol.java
index 7a7947c..583639b 100644
--- a/src/main/java/org/sablecc/sablecc/Symbol.java
+++ b/src/main/java/org/sablecc/sablecc/Symbol.java
@@ -7,7 +7,10 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
final class Symbol implements Comparable<Symbol>
{
diff --git a/src/main/java/org/sablecc/sablecc/SymbolSet.java b/src/main/java/org/sablecc/sablecc/SymbolSet.java
index cf08444..6ed30a3 100644
--- a/src/main/java/org/sablecc/sablecc/SymbolSet.java
+++ b/src/main/java/org/sablecc/sablecc/SymbolSet.java
@@ -7,7 +7,8 @@
package org.sablecc.sablecc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
final class SymbolSet implements Cloneable
{
diff --git a/src/main/java/org/sablecc/sablecc/Transitions.java b/src/main/java/org/sablecc/sablecc/Transitions.java
index 59b3d52..e612a83 100644
--- a/src/main/java/org/sablecc/sablecc/Transitions.java
+++ b/src/main/java/org/sablecc/sablecc/Transitions.java
@@ -7,9 +7,12 @@
package org.sablecc.sablecc;
-import org.sablecc.sablecc.analysis.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.sablecc.sablecc.analysis.DepthFirstAdapter;
import org.sablecc.sablecc.node.*;
-import java.util.*;
public class Transitions extends DepthFirstAdapter
{
--
GitLab