Skip to content
Snippets Groups Projects
Commit 3eff5c00 authored by dgelessus's avatar dgelessus
Browse files

Use generics for the last remaining field in GenParser

This actually uncovered a type mismatch, but I'm not sure whether it's
safer to fix the types or to just remove the dead code (because
apparently nobody in the last 20 years noticed that it's dead...).
parent b33c13ea
No related branches found
No related tags found
No related merge requests found
Pipeline #86555 passed
...@@ -19,12 +19,12 @@ public class AltTransformAdapter extends DepthFirstAdapter ...@@ -19,12 +19,12 @@ public class AltTransformAdapter extends DepthFirstAdapter
private Map<String, String> isElementIsAlist; private Map<String, String> isElementIsAlist;
private LinkedList listSimpleTermTransform; private List<Node> listSimpleTermTransform;
private Map<Node, String> simpleTermTransform; private Map<Node, String> simpleTermTransform;
private Map<Node, String> simpleTermOrsimpleListTermTypes; private Map<Node, String> simpleTermOrsimpleListTermTypes;
AltTransformAdapter(Map<Node, String> simpleTermTransform, AltTransformAdapter(Map<Node, String> simpleTermTransform,
LinkedList listSimpleTermTransform, List<Node> listSimpleTermTransform,
String currentNewAltName, String currentNewAltName,
ResolveAltIds altIds, Map<String, String> isElementIsAlist, ResolveAltIds altIds, Map<String, String> isElementIsAlist,
Map<Node, String> simpleTermOrsimpleListTermTypes) Map<Node, String> simpleTermOrsimpleListTermTypes)
......
...@@ -67,7 +67,7 @@ public class GenParser extends DepthFirstAdapter ...@@ -67,7 +67,7 @@ public class GenParser extends DepthFirstAdapter
//This tree-walker field generate the code of parsing and construction of the AST. //This tree-walker field generate the code of parsing and construction of the AST.
GenerateAlternativeCodeForParser aParsedAltAdapter; GenerateAlternativeCodeForParser aParsedAltAdapter;
private LinkedList listSimpleTermTransform = new LinkedList(); private List<Node> listSimpleTermTransform = new LinkedList<>();
public final Map<Node, String> simpleTermTransform = new HashMap<>(); public final Map<Node, String> simpleTermTransform = new HashMap<>();
......
...@@ -27,7 +27,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter ...@@ -27,7 +27,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
private ComputeSimpleTermPosition CTP; private ComputeSimpleTermPosition CTP;
private MacroExpander macros; private MacroExpander macros;
private Map<Node, String> simpleTermTransformMap; private Map<Node, String> simpleTermTransformMap;
private LinkedList listSimpleTermTransform; private List<Node> listSimpleTermTransform;
private Map<Node, String> simpleTermOrsimpleListTermTypes; private Map<Node, String> simpleTermOrsimpleListTermTypes;
private int popCount; private int popCount;
...@@ -40,7 +40,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter ...@@ -40,7 +40,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
ComputeSimpleTermPosition CTP, ComputeSimpleTermPosition CTP,
Map simpleTermTransformMap, Map simpleTermTransformMap,
MacroExpander macros, MacroExpander macros,
LinkedList listSimpleTermTransform, List<Node> listSimpleTermTransform,
Map<Node, String> simpleTermOrsimpleListTermTypes) Map<Node, String> simpleTermOrsimpleListTermTypes)
{ {
this.pkgDir = pkgDir; this.pkgDir = pkgDir;
...@@ -219,6 +219,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter ...@@ -219,6 +219,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
if(node.getSimpleTermTail() != null ) if(node.getSimpleTermTail() != null )
{ {
// FIXME This condition is always false, because listSimpleTermTransform contains ASimpleTerm/ASimpleListTerm and not String! Is it safe to remove this?
if( !listSimpleTermTransform.contains(node.getId().getText() ) ) if( !listSimpleTermTransform.contains(node.getId().getText() ) )
{ {
String type = CTP.positionsMap.get( realcurrentAlt+"."+node.getId().getText() ); String type = CTP.positionsMap.get( realcurrentAlt+"."+node.getId().getText() );
...@@ -294,6 +295,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter ...@@ -294,6 +295,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
if(node.getSimpleTermTail() != null ) if(node.getSimpleTermTail() != null )
{ {
// FIXME This condition is always false, because listSimpleTermTransform contains ASimpleTerm/ASimpleListTerm and not String! Is it safe to remove this?
if( !listSimpleTermTransform.contains(node.getId().getText()) ) if( !listSimpleTermTransform.contains(node.getId().getText()) )
{ {
String type = CTP.positionsMap.get( realcurrentAlt+"."+node.getId().getText() ); String type = CTP.positionsMap.get( realcurrentAlt+"."+node.getId().getText() );
......
...@@ -40,7 +40,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter ...@@ -40,7 +40,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
int count; int count;
int elem; int elem;
private LinkedList listSimpleTermTransform; private List<Node> listSimpleTermTransform;
public final Map<Node, String> simpleTermTransform; public final Map<Node, String> simpleTermTransform;
Map<String, List<PElem>> mapProductionTransformations; Map<String, List<PElem>> mapProductionTransformations;
...@@ -52,7 +52,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter ...@@ -52,7 +52,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
public InternalTransformationsToGrammar(ResolveIds ids, ResolveAltIds altIds, public InternalTransformationsToGrammar(ResolveIds ids, ResolveAltIds altIds,
ResolveTransformIds transformIds, ResolveTransformIds transformIds,
LinkedList listSimpleTermTransform, List<Node> listSimpleTermTransform,
Map<Node, String> simpleTermTransform, Map<Node, String> simpleTermTransform,
Map<String, List<PElem>> mapProductionTransformations, Map<String, List<PElem>> mapProductionTransformations,
Map<Node, String> simpleTermOrsimpleListTermTypes) Map<Node, String> simpleTermOrsimpleListTermTypes)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment