Skip to content
Snippets Groups Projects
Commit 1ab81f06 authored by dgelessus's avatar dgelessus
Browse files

Fix misleadingly qualified static method calls

parent dcbcfca6
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 28 additions and 35 deletions
src/main/java/org/sablecc/sablecc/ComputeCGNomenclature.java
+ 4
− 4
View file @ 1ab81f06
......@@ -61,7 +61,7 @@ public class ComputeCGNomenclature extends DepthFirstAdapter
@Override
public void caseAProd(final AProd production)
{
currentProd = "P" + ids.name(production.getId().getText());
currentProd = "P" + ResolveIds.name(production.getId().getText());
Object []temp = production.getAlts().toArray();
for(int i = 0; i<temp.length; i++)
{
......@@ -77,7 +77,7 @@ public class ComputeCGNomenclature extends DepthFirstAdapter
if(nodeAlt.getAltName() != null)
{
currentAlt = "A"+
ids.name( nodeAlt.getAltName().getText() )+
ResolveIds.name( nodeAlt.getAltName().getText() )+
currentProd.substring(1);
}
else
......@@ -107,7 +107,7 @@ public class ComputeCGNomenclature extends DepthFirstAdapter
public void inANewTerm(ANewTerm node)
{
AProdName aProdName = (AProdName)node.getProdName();
String type = "P" + ids.name(aProdName.getId().getText());
String type = "P" + ResolveIds.name(aProdName.getId().getText());
altTransformElemTypes.put(node, type);
termNumbers.put(node, ++counter);
......@@ -117,7 +117,7 @@ public class ComputeCGNomenclature extends DepthFirstAdapter
public void inANewListTerm(ANewListTerm node)
{
AProdName aProdName = (AProdName)node.getProdName();
String type = "P" + ids.name(aProdName.getId().getText());
String type = "P" + ResolveIds.name(aProdName.getId().getText());
altTransformElemTypes.put(node, type);
termNumbers.put(node, ++counter);
......
src/main/java/org/sablecc/sablecc/ComputeSimpleTermPosition.java
+ 2
− 4
View file @ 1ab81f06
......@@ -32,7 +32,7 @@ public class ComputeSimpleTermPosition extends DepthFirstAdapter
@Override
public void inAProd(AProd node)
{
currentProd = ids.name(node.getId().getText());
currentProd = ResolveIds.name(node.getId().getText());
ids.names.put(node, currentProd);
}
......@@ -45,7 +45,7 @@ public class ComputeSimpleTermPosition extends DepthFirstAdapter
if(node.getAltName() != null)
{
currentAlt = "A" +
ids.name( node.getAltName().getText() ) +
ResolveIds.name( node.getAltName().getText() ) +
currentProd;
}
else
......@@ -80,8 +80,6 @@ public class ComputeSimpleTermPosition extends DepthFirstAdapter
return;
}
String name = ids.name( node.getId().getText() );
String elemType = ids.elemTypes.get(node);
if(processingParsedAlt && elemType.startsWith("P"))
{
......
src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java
+ 1
− 1
View file @ 1ab81f06
......@@ -57,7 +57,7 @@ public class ConstructParserGenerationDatas extends DepthFirstAdapter
@Override
public void caseAElem(AElem node)
{
String name = ids.name(node.getId().getText());
String name = ResolveIds.name(node.getId().getText());
if(node.getSpecifier() != null)
{
......
src/main/java/org/sablecc/sablecc/GenParser.java
+ 5
− 5
View file @ 1ab81f06
......@@ -283,7 +283,7 @@ public class GenParser extends DepthFirstAdapter
@Override
public void caseAProd(AProd node)
{
currentProd = ids.name(node.getId().getText());
currentProd = ResolveIds.name(node.getId().getText());
String name = "P" + currentProd;
ids.names.put(node, name);
......@@ -306,7 +306,7 @@ public class GenParser extends DepthFirstAdapter
@Override
public void outATokenDef(ATokenDef node)
{
String name = "T" + ids.name(node.getId().getText());
String name = "T" + ResolveIds.name(node.getId().getText());
ids.names.put(node, name);
}
......@@ -318,7 +318,7 @@ public class GenParser extends DepthFirstAdapter
{
currentAlt =
"A" +
ids.name(alt.getAltName().getText()) +
ResolveIds.name(alt.getAltName().getText()) +
currentProd;
ids.names.put(alt, currentAlt);
......@@ -345,11 +345,11 @@ public class GenParser extends DepthFirstAdapter
{
if(elem.getElemName() != null)
{
ids.names.put(elem, ids.name(elem.getElemName().getText()) );
ids.names.put(elem, ResolveIds.name(elem.getElemName().getText()) );
}
else
{
ids.names.put(elem, ids.name(elem.getId().getText()));
ids.names.put(elem, ResolveIds.name(elem.getId().getText()));
}
}
}
......
src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java
+ 9
− 14
View file @ 1ab81f06
......@@ -259,7 +259,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
aParsedAlt = new AAlt(new TId(currentAltName.toLowerCase()+(count + 1)), listElems, altTransform);
String currentAltInlining;
currentAltInlining = "A" + ids.name(aParsedAlt.getAltName().getText()) + currentProd;
currentAltInlining = "A" + ResolveIds.name(aParsedAlt.getAltName().getText()) + currentProd;
ids.names.put(aParsedAlt, currentAltInlining);
listOfAlts.add(aParsedAlt);
......@@ -314,11 +314,11 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
aElem = new AElem(aElemName, specifier, new TId(elemName), null);
if(elemNameOfElem != null)
{
ids.names.put(aElem, ids.name(elemNameOfElem));
ids.names.put(aElem, ResolveIds.name(elemNameOfElem));
}
else
{
ids.names.put(aElem, ids.name(elemName));
ids.names.put(aElem, ResolveIds.name(elemName));
}
ok = true;
}
......@@ -343,11 +343,11 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
if(elemNameOfElem != null)
{
ids.names.put(aElem, ids.name(elemNameOfElem));
ids.names.put(aElem, ResolveIds.name(elemNameOfElem));
}
else
{
ids.names.put(aElem, ids.name(elemName));
ids.names.put(aElem, ResolveIds.name(elemName));
}
ok = true;
......@@ -365,11 +365,11 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
if(elemNameOfElem != null)
{
ids.names.put(aElem, ids.name(elemNameOfElem));
ids.names.put(aElem, ResolveIds.name(elemNameOfElem));
}
else
{
ids.names.put(aElem, ids.name(elemName));
ids.names.put(aElem, ResolveIds.name(elemName));
}
ok = true;
......@@ -395,11 +395,11 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
if(elemNameOfElem != null)
{
ids.names.put(aElem, ids.name(elemNameOfElem));
ids.names.put(aElem, ResolveIds.name(elemNameOfElem));
}
else
{
ids.names.put(aElem, ids.name(elemName));
ids.names.put(aElem, ResolveIds.name(elemName));
}
ok = true;
......@@ -484,8 +484,6 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
//That means elem is token type
else
{
String name_resolved = ids.name(name);
LinkedList elemsProdTransform = new LinkedList();
elemsProdTransform.add( new AElem( null, new ATokenSpecifier(), new TId(rname), new AStarUnOp() ) );
nodeProdTransform = elemsProdTransform;
......@@ -566,7 +564,6 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
//creation of the first alternative
AAlt aParsedAlt = new AAlt(new TId("terminal"), elems, aAltTransform);
String terminal_altName = "ATerminal" + ids.name(name);
listOfAltsXelem.add(aParsedAlt);
......@@ -629,8 +626,6 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
aParsedAlt = new AAlt(new TId("non_terminal"), elems, aAltTransform);
String nonTerminal_altName = "ANonTerminal" + ids.name(name);
listOfAltsXelem.add(aParsedAlt);
AProd prodToReturn = new AProd(new TId(name), new TArrow(), nodeProdTransform, listOfAltsXelem);
......
src/main/java/org/sablecc/sablecc/ResolveAstIds.java
+ 7
− 7
View file @ 1ab81f06
......@@ -69,14 +69,14 @@ public class ResolveAstIds extends DepthFirstAdapter
if(listProds.size() > 0)
{
AAstProd firstAstProd = (AAstProd)listProds.getFirst();
firstAstProduction = "P" + astIds.name(firstAstProd.getId().getText());
firstAstProduction = "P" + ResolveIds.name(firstAstProd.getId().getText());
}
}
@Override
public void inAAstProd(AAstProd node)
{
currentProd = astIds.name(node.getId().getText());
currentProd = ResolveIds.name(node.getId().getText());
String name = "P" + currentProd;
......@@ -94,7 +94,7 @@ public class ResolveAstIds extends DepthFirstAdapter
{
currentAlt =
"A" +
astIds.name(alt.getAltName().getText()) +
ResolveIds.name(alt.getAltName().getText()) +
currentProd;
if(ast_alts.put(currentAlt, alt) != null)
......@@ -136,7 +136,7 @@ public class ResolveAstIds extends DepthFirstAdapter
}
elem_name = tid.getText();
name = currentAlt + "." + astIds.name(elem_name);
name = currentAlt + "." + ResolveIds.name(elem_name);
if(ast_elems.put(name, elem) != null)
{
......@@ -148,7 +148,7 @@ public class ResolveAstIds extends DepthFirstAdapter
error5(tid);
}
ast_names.put(elem, astIds.name(elem_name));
ast_names.put(elem, ResolveIds.name(elem_name));
}
@Override
......@@ -159,7 +159,7 @@ public class ResolveAstIds extends DepthFirstAdapter
@Override
public void caseAElem(AElem node)
{
String name = astIds.name(node.getId().getText());
String name = ResolveIds.name(node.getId().getText());
if(node.getSpecifier() != null)
{
......@@ -198,7 +198,7 @@ public class ResolveAstIds extends DepthFirstAdapter
@Override
public void caseAElem(AElem node)
{
String name = astIds.name(node.getId().getText());
String name = ResolveIds.name(node.getId().getText());
if(node.getSpecifier() != null)
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment