archive-gh-me/jsweet
1
0
Fork 0
mirror of https://github.com/cincheo/jsweet.git synced 2025-12-15 15:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Avoid name clashes in foreach loops when the iteration variable is named 'index', and generate humain-friendly name

Browse Source
This commit is contained in:
Renaud Pawlak 2021-03-09 07:23:15 +01:00
parent 1e274cb9cb
commit 73e94fe7e9
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
transpiler/src/main/java/org/jsweet/transpiler/Java2TypeScriptTranslator.java
View File

@ -5054,17 +5054,19 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
private String getFreeVariableName(String variablePrefix, int index) { private String getFreeVariableName(String variablePrefix, int index) {
String name = variablePrefix + (index == 0 ? "" : "" + index); String name = variablePrefix + (index == 0 ? "" : "" + index);
Set<String> generatedVariableNames = getGeneratedVariableNames(); Set<String> generatedVariableNames = getGeneratedVariableNames();
while (generatedVariableNames.contains(name)) { while (generatedVariableNames.contains(name)) {
name = variablePrefix + (++index); name = variablePrefix + (++index);
} }
System.out.println(" => " + getCurrent());
int position = stack.size() - 2; int position = stack.size() - 2;
while(position >= 0 && !(stack.get(position) instanceof JCMethodDecl)) { while (position >= 0 && !(stack.get(position) instanceof JCMethodDecl)) {
if (stack.get(position) instanceof JCBlock) { if (stack.get(position) instanceof JCBlock) {
JCBlock block = (JCBlock)stack.get(position); JCBlock block = (JCBlock) stack.get(position);
// analyze all the previous declarations in the block // analyze all the previous declarations in the block
for (JCTree t : block.stats) { for (JCTree t : block.stats) {
if (t == stack.get(position + 1)) { if (t == stack.get(position + 1)) {
@ -5072,7 +5074,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
break; break;
} }
// name clash: we try again with another index // name clash: we try again with another index
if (t instanceof JCVariableDecl && name.equals(((JCVariableDecl)t).name.toString())) { if (t instanceof JCVariableDecl && name.equals(((JCVariableDecl) t).name.toString())) {
return getFreeVariableName(variablePrefix, index + 1); return getFreeVariableName(variablePrefix, index + 1);
} }
} }
@ -5080,13 +5082,30 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
position--; position--;
} }
if (position >= 0 && stack.get(position) instanceof JCMethodDecl) { if (position >= 0 && stack.get(position) instanceof JCMethodDecl) {
for (JCVariableDecl param : ((JCMethodDecl)stack.get(position)).params) { for (JCVariableDecl param : ((JCMethodDecl) stack.get(position)).params) {
if (name.equals(param.name.toString())) { if (name.equals(param.name.toString())) {
// name clash with method parameters // name clash with method parameters
return getFreeVariableName(variablePrefix, index + 1); return getFreeVariableName(variablePrefix, index + 1);
} }
} }
} }
if (getCurrent() instanceof JCEnhancedForLoop) {
JCEnhancedForLoop loop = (JCEnhancedForLoop) getCurrent();
if (name.equals(loop.var.name.toString())) {
return getFreeVariableName(variablePrefix, index + 1);
}
JCStatement body = loop.body;
if (body instanceof JCBlock) {
JCBlock block = (JCBlock) body;
// analyze all the previous declarations in the loop body
for (JCTree t : block.stats) {
// name clash: we try again with another index
if (t instanceof JCVariableDecl && name.equals(((JCVariableDecl) t).name.toString())) {
return getFreeVariableName(variablePrefix, index + 1);
}
}
}
}
return name; return name;
} }
@ -5095,7 +5114,8 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
*/ */
@Override @Override
public void visitForeachLoop(JCEnhancedForLoop foreachLoop) { public void visitForeachLoop(JCEnhancedForLoop foreachLoop) {
String indexVarName = getFreeVariableName("index", getIndexVariableCount()); String indexVarName = getFreeVariableName(
"index".equals(foreachLoop.var.name.toString()) ? "loopIndex" : "index", getIndexVariableCount());
boolean[] hasLength = { false }; boolean[] hasLength = { false };
TypeSymbol targetType = foreachLoop.expr.type.tsym; TypeSymbol targetType = foreachLoop.expr.type.tsym;
Util.scanMemberDeclarationsInType(targetType, getAdapter().getErasedTypes(), element -> { Util.scanMemberDeclarationsInType(targetType, getAdapter().getErasedTypes(), element -> {