Skip to content

Commit

Permalink
Remove set_ and get_ from attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
@xpenatan
xpenatan committed Jan 27, 2024
1 parent 1708a99 commit a178a4e
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 23 deletions.
36 changes: 18 additions & 18 deletions example/app/core/src/main/java/com/github/xpenatan/jparser/example/app/AppTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private void initLib() {
System.out.println("EnumInNamespace e_namespace_val: " + EnumInNamespace.e_namespace_val);

ReturnClass returnValueObject = normalClass.getReturnValueObject();
System.out.println("returnValueObject: " + returnValueObject.get_value());
System.out.println("returnValueObject: " + returnValueObject.value());

normalClass.printText(10, "printText HELLO");
IDLFloat floatArray = IDLFloat.TMP_1;
Expand All @@ -101,12 +101,12 @@ private void initLib() {
System.out.println("NormalClass.subIntValue: " + NormalClass.subIntValue(2, 1));

OperatorClass operatorClass1 = new OperatorClass();
operatorClass1.set_value(41);
operatorClass1.value(41);
OperatorClass operatorClass2 = new OperatorClass();
operatorClass2.set_value(3);
operatorClass2.value(3);
operatorClass1.copy(operatorClass2);

System.out.println("operatorClass1 copy: " + operatorClass1.get_value());
System.out.println("operatorClass1 copy: " + operatorClass1.value());

testPrimitive();

Expand All @@ -116,35 +116,35 @@ private void initLib() {
private void testPrimitive() {
System.out.println("########## TESTING ATTRIBUTES ##########");

NormalClass.set_hiddenInt_static(22);
int hiddenIntStatic = NormalClass.get_hiddenInt_static();
NormalClass.hiddenInt_static(22);
int hiddenIntStatic = NormalClass.hiddenInt_static();
System.out.println("hiddenIntStatic: " + hiddenIntStatic);

ReturnClass nullPointerReturnClassStatic = NormalClass.get_nullPointerReturnClass_static();
ReturnClass nullPointerReturnClassStatic = NormalClass.nullPointerReturnClass_static();
System.out.println("nullPointerReturnClassStatic: " + nullPointerReturnClassStatic);

// ReturnClass pointerReturnClassStatic = NormalClass.get_pointerReturnClass_static();
// pointerReturnClassStatic.set_value(51);
// System.out.println("pointerReturnClassStatic: " + pointerReturnClassStatic.get_value());

ReturnClass valueReturnClassStatic = NormalClass.get_valueReturnClass_static();
System.out.println("valueReturnClassStatic: " + valueReturnClassStatic.get_value());
ReturnClass valueReturnClassStatic = NormalClass.valueReturnClass_static();
System.out.println("valueReturnClassStatic: " + valueReturnClassStatic.value());

NormalClass normalClass = new NormalClass();

normalClass.set_hiddenInt(4);
int hiddenInt = normalClass.get_hiddenInt();
normalClass.hiddenInt(4);
int hiddenInt = normalClass.hiddenInt();
System.out.println("hiddenInt: " + hiddenInt);

ReturnClass pointerReturnClass = normalClass.get_pointerReturnClass();
pointerReturnClass.set_value(11);
System.out.println("pointerReturnClass: " + pointerReturnClass.get_value());
ReturnClass pointerReturnClass = normalClass.pointerReturnClass();
pointerReturnClass.value(11);
System.out.println("pointerReturnClass: " + pointerReturnClass.value());

ReturnClass valueReturnClass = normalClass.get_valueReturnClass();
valueReturnClass.set_value(12);
System.out.println("valueReturnClass: " + valueReturnClass.get_value());
ReturnClass valueReturnClass = normalClass.valueReturnClass();
valueReturnClass.value(12);
System.out.println("valueReturnClass: " + valueReturnClass.value());

ReturnClass nullPointerReturnClass = normalClass.get_nullPointerReturnClass();
ReturnClass nullPointerReturnClass = normalClass.nullPointerReturnClass();
System.out.println("nullPointerReturnClass: " + nullPointerReturnClass);
}

Expand Down
2 changes: 1 addition & 1 deletion example/lib/generator/src/main/java/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private static void generateAndBuild() throws Exception {
ArrayList<BuildMultiTarget> targets = new ArrayList<>();
if(BuildTarget.isWindows() || BuildTarget.isUnix()) {
targets.add(getWindowTarget());
// targets.add(getEmscriptenTarget(idlReader));
targets.add(getEmscriptenTarget(idlReader));
// targets.add(getAndroidTarget());
}
if(BuildTarget.isUnix()) {
Expand Down
11 changes: 7 additions & 4 deletions jParser/idl/src/main/java/com/github/xpenatan/jparser/idl/parser/IDLAttributeParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@

public class IDLAttributeParser {

public static final String ATTRIBUTE_PREFIX_SET = "";
public static final String ATTRIBUTE_PREFIX_GET = "";

public static void generateAttribute(IDLDefaultCodeParser idlParser, JParser jParser, CompilationUnit unit, ClassOrInterfaceDeclaration classOrInterfaceDeclaration, IDLClass idlClass, IDLAttribute idlAttribute) {
if(idlAttribute.skip) {
return;
Expand Down Expand Up @@ -91,7 +94,7 @@ public static void generateAttribute(IDLDefaultCodeParser idlParser, JParser jPa
if(getMethodDeclaration != null) {
getMethodDeclaration.remove();
}
String getMethodName = "get_" + attributeName;
String getMethodName = ATTRIBUTE_PREFIX_GET + attributeName;
getMethodDeclaration = classOrInterfaceDeclaration.addMethod(getMethodName, Modifier.Keyword.PUBLIC);
getMethodDeclaration.setStatic(idlAttribute.isStatic);
getMethodDeclaration.setType(type);
Expand All @@ -111,7 +114,7 @@ public static void generateAttribute(IDLDefaultCodeParser idlParser, JParser jPa
if(setMethodDeclaration != null) {
setMethodDeclaration.remove();
}
String setMethodName = "set_" + attributeName;
String setMethodName = ATTRIBUTE_PREFIX_SET + attributeName;
setMethodDeclaration = classOrInterfaceDeclaration.addMethod(setMethodName, Modifier.Keyword.PUBLIC);
setMethodDeclaration.setStatic(idlAttribute.isStatic);
Parameter parameter = setMethodDeclaration.addAndGetParameter(type, attributeName);
Expand Down Expand Up @@ -180,7 +183,7 @@ public static boolean shouldSkipMethod(MethodDeclaration containsMethod) {
private static MethodDeclaration containsSetMethod(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, IDLAttribute idlAttribute) {
String[] paramTypes = new String[1];
paramTypes[0] = idlAttribute.type;
String methodName = "set_" + idlAttribute.name;
String methodName = ATTRIBUTE_PREFIX_SET + idlAttribute.name;
List<MethodDeclaration> methods = classOrInterfaceDeclaration.getMethodsBySignature(methodName, paramTypes);

if(methods.size() > 0) {
Expand All @@ -191,7 +194,7 @@ private static MethodDeclaration containsSetMethod(ClassOrInterfaceDeclaration c

private static MethodDeclaration containsGetMethod(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, IDLAttribute idlAttribute) {
String[] paramTypes = new String[0];
String methodName = "get_" + idlAttribute.name;
String methodName = ATTRIBUTE_PREFIX_GET + idlAttribute.name;
List<MethodDeclaration> methods = classOrInterfaceDeclaration.getMethodsBySignature(methodName, paramTypes);

if(methods.size() > 0) {
Expand Down

0 comments on commit a178a4e

Please sign in to comment.