Skip to content

Prepend _ for argument names that can collide with reserved argument names #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Berstanio merged 2 commits into from
Sep 11, 2026
Merged

Prepend _ for argument names that can collide with reserved argument names #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7772bc
Prepend _ for argument names that can collide with reserved argument …
0880880 Aug 31, 2026
48fab0e
move deduplication to JavaUtils
0880880 Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...iling/gdx-jnigen-generator/src/main/java/com/badlogic/gdx/jnigen/generator/Generator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,9 @@ public static FunctionSignature parseFunctionSignature(String functionName, CXTy
if (cursor != null) {
CXCursor paramCursor = clang_Cursor_getArgument(cursor, i);
String potentialName = clang_getCursorSpelling(paramCursor).getString();
if (!potentialName.isEmpty())
name = potentialName;
if (!potentialName.isEmpty()) {
name = JavaUtils.deduplicateArgumentName(potentialName);
}
}
TypeDefinition argTypeDefinition = registerCXType(argType, name, null);

Expand Down
12 changes: 12 additions & 0 deletions ...iling/gdx-jnigen-generator/src/main/java/com/badlogic/gdx/jnigen/generator/JavaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@ public static String javarizeName(String cName) {
return cName;
}

public static String deduplicateArgumentName(String cName) {
switch (cName) {
case "env":
return "_env";
case "clazz":
return "_clazz";
case "object":
return "_object";
}
return cName;
}

public static Expression getOffsetAsExpression(int index, OffsetCalculator calculator) {
return getSizeAsExpression((target) -> calculator.getOffset(index, target));
}
Expand Down
Loading