Skip to content
Snippets Groups Projects
Commit 4590b17b authored by dgelessus's avatar dgelessus
Browse files

Remove no longer needed casts after clone calls

parent a7664fcb
No related branches found
No related tags found
No related merge requests found
Showing
with 28 additions and 34 deletions
......@@ -82,7 +82,7 @@ public class AddAstProductions extends DepthFirstAdapter
@Override
public void outAAlt(AAlt node)
{
TId aAltname = node.getAltName() == null ? null : (TId)node.getAltName().clone();
TId aAltname = node.getAltName() == null ? null : node.getAltName().clone();
AAstAlt astAlt = new AAstAlt(aAltname, listElems);
listOfAstAlts.add(astAlt);
......@@ -96,8 +96,7 @@ public class AddAstProductions extends DepthFirstAdapter
{
if(processingParsedAlt)
{
AElem tmp = (AElem)node.clone();
listElems.add(tmp);
listElems.add(node.clone());
}
}
......
......@@ -96,7 +96,7 @@ public class CharSet implements Cloneable
public CharSet union(CharSet chars)
{
CharSet result = (CharSet) clone();
CharSet result = clone();
Interval interval;
Interval largeInterval;
......@@ -104,7 +104,7 @@ public class CharSet implements Cloneable
for(Enumeration e = chars.intervals.elements(); e.hasMoreElements();)
{
interval = (Interval) ((Interval) e.nextElement()).clone();
interval = ((Interval) e.nextElement()).clone();
do
{
......@@ -130,14 +130,14 @@ public class CharSet implements Cloneable
public CharSet diff(CharSet chars)
{
CharSet result = (CharSet) clone();
CharSet result = clone();
Interval interval;
Interval overlap;
for(Enumeration e = chars.intervals.elements(); e.hasMoreElements();)
{
interval = (Interval) ((Interval) e.nextElement()).clone();
interval = ((Interval) e.nextElement()).clone();
do
{
......
......@@ -163,7 +163,7 @@ public class ComputeCGNomenclature extends DepthFirstAdapter
if(name.startsWith("P") )
{
//add termtail to the simpleterm
node.setSimpleTermTail( (TId)node.getId().clone() );
node.setSimpleTermTail(node.getId().clone());
}
}
else
......@@ -259,7 +259,7 @@ public class ComputeCGNomenclature extends DepthFirstAdapter
if( name.startsWith("P") )
{
//add termtail to the simpleterm
node.setSimpleTermTail( (TId)node.getId().clone() );
node.setSimpleTermTail(node.getId().clone());
}
}
else
......
......@@ -66,7 +66,7 @@ public class ComputeInlining
if( prod.getAlts().size() <= SableCC.inliningMaxAlts && !isProductionRecursive(prod) )
{
//This class construct a special data structure for the production to inline.
final In_Production in_production = new In_Production((AProd)prod.clone());
final In_Production in_production = new In_Production(prod.clone());
tree.apply(new DepthFirstAdapter()
{
......
......@@ -222,7 +222,7 @@ public class DFA
if(dest != null)
{
state.transitions.addElement(
new Transition((CharSet.Interval) interval.clone(), dest.intValue()));
new Transition(interval.clone(), dest.intValue()));
}
else
{
......@@ -231,7 +231,7 @@ public class DFA
finder.put(s.nfaStates, states.size() - 1);
state.transitions.addElement(
new Transition((CharSet.Interval) interval.clone(), states.size() - 1));
new Transition(interval.clone(), states.size() - 1));
}
}
......
......@@ -314,8 +314,7 @@ public final class Grammar
for(int i = 0; i < productions.length; i++)
{
SymbolSet before =
(SymbolSet) FIRST_Nonterminal[productions[i].leftside].clone();
SymbolSet before = FIRST_Nonterminal[productions[i].leftside].clone();
FIRST_Nonterminal[productions[i].leftside].
or(FIRST(productions[i].rightside()));
......@@ -429,8 +428,7 @@ public final class Grammar
{
if(!rightside[j].terminal)
{
SymbolSet before =
(SymbolSet) FOLLOW[rightside[j].index].clone();
SymbolSet before = FOLLOW[rightside[j].index].clone();
if(FIRST(rightside, j + 1).getEmpty())
{
......
......@@ -97,7 +97,7 @@ public class In_Production
for(int i=0; i<listOfElems.length; i++)
{
AElem tmpElem = (AElem)listOfElems[i].clone();
AElem tmpElem = listOfElems[i].clone();
if(tmpElem.getElemName() != null)
{
......
......@@ -251,8 +251,7 @@ public class Inlining
LinkedList listElems = inlineList(aParsed_alt.getElems(),
prod_to_inline.getAlternative(j).getElems(),
mapOfNewTermNames);
AAltTransform aAltTransform =
(AAltTransform)((AAltTransform)aParsed_alt.getAltTransform()).clone();
AAltTransform aAltTransform = ((AAltTransform)aParsed_alt.getAltTransform()).clone();
final Map<String, Node> currentMap = prod_to_inline.getAlternative(j).getProdTransform_AlTransformMap();
aAltTransform.apply(new DepthFirstAdapter()
......@@ -312,8 +311,8 @@ public class Inlining
public void caseANewTerm(ANewTerm node)
{
node_.replaceBy( new ANewListTerm( (AProdName)node.getProdName().clone(),
(TLPar)node.getLPar().clone(),
(LinkedList)cloneList(node.getParams())
node.getLPar().clone(),
cloneList(node.getParams())
)
);
}
......@@ -329,10 +328,10 @@ public class Inlining
}
if(node.getSimpleTermTail() != null)
{
simpleTermTail = (TId)node.getSimpleTermTail().clone();
simpleTermTail = node.getSimpleTermTail().clone();
}
node_.replaceBy( new ASimpleListTerm( specifier,
(TId)node.getId().clone(),
node.getId().clone(),
simpleTermTail
)
);
......@@ -384,7 +383,7 @@ public class Inlining
}
);
AAltTransform tmpaAltTransform = (AAltTransform)aAltTransform.clone();
AAltTransform tmpaAltTransform = aAltTransform.clone();
fixSimpleTermOrSimpleListTermNames(tmpaAltTransform, mapOfNewTermNames);
String newAltName;
if(aParsed_alt.getAltName() != null)
......
......@@ -18,7 +18,7 @@ public class IntSet
private IntSet(IntSet set
)
{
elements = (int[]) set.elements.clone();
elements = set.elements.clone();
}
public void and(IntSet set
......@@ -331,8 +331,7 @@ public class IntSet
if(set
== this)
{
set
= (IntSet) set.clone();
set = set.clone();
}
int length = 0;
......
......@@ -183,14 +183,14 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
if(node.getAltName() != null)
{
nameOfAlt = (TId)node.getAltName().clone();
nameOfAlt = node.getAltName().clone();
}
currentNewAltName = currentProd + "." + currentAltName.toLowerCase();
altIds.alts_elems.put(currentNewAltName, listElemsAltTransform);
altIds.alts_elems_list_elemName.put(currentNewAltName, listOfAlternativeElemsWHaveName);
AAltTransform altTransform = (AAltTransform)currentAltTransform.clone();
AAltTransform altTransform = currentAltTransform.clone();
AltTransformAdapter altTransformAdapter =
new AltTransformAdapter(simpleTermTransform, listSimpleTermTransform,
......@@ -247,7 +247,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
altIds.alts_elems.put(currentNewAltName, listElemsAltTransform);
altIds.alts_elems_list_elemName.put(currentNewAltName, listOfAlternativeElemsWHaveName);
altTransform = (AAltTransform)currentAltTransform.clone();
altTransform = currentAltTransform.clone();
AltTransformAdapter altTransformAdapter =
new AltTransformAdapter(simpleTermTransform, listSimpleTermTransform,
......
......@@ -138,8 +138,7 @@ final class LR1Collection
{
LR0ItemAndSetPair pair = (LR0ItemAndSetPair) e.nextElement();
SymbolSet before = (SymbolSet)
((SymbolSet) lookaheads[pair.set].get(pair.item)).clone();
SymbolSet before = ((SymbolSet) lookaheads[pair.set].get(pair.item)).clone();
((SymbolSet) lookaheads[pair.set].get(pair.item)).
or((SymbolSet) lookaheads[i].get(items[j]));
......
......@@ -50,8 +50,8 @@ final class SymbolSet implements Cloneable
private SymbolSet(SymbolSet set
)
{
this.terminals = (IntSet) set.terminals.clone();
this.nonterminals = (IntSet) set.nonterminals.clone();
this.terminals = set.terminals.clone();
this.nonterminals = set.nonterminals.clone();
this.empty = set.empty;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment