Make generated methods without an instance-parameter static

octachoron · octachoron · commit becb71e3e0d7 · 2014-08-14T22:37:53.000+02:00
This is still not a perfect way of deciding what should be static
and what not. It results in things like GList.nth_data(list) instead
of the sensible list.nth_data() because while list here is obviously
an instance parameter, it is not declared so in the gir file. But,
rather have this than GList.alloc() not being static, or everything
being static, I think.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -780,13 +780,15 @@ private void parseMethodOrFunction(Element root, ParsingContext context) {
 		}		
 		
 		int nativeVisibility = (returnsPointer || takesPointer) ? JMod.PROTECTED : JMod.PUBLIC;
+		int staticModifier = ParameterDescriptor.containsInstanceParameter(parametersList) ? 0 : JMod.STATIC;
+		int nativeModifiers = nativeVisibility | staticModifier | JMod.NATIVE;
 		
 		JMethod nativeMethod;
 		if (returnsPointer) {
-			nativeMethod = enclosing.method(nativeVisibility | JMod.NATIVE, long.class, nativeName);
+			nativeMethod = enclosing.method(nativeModifiers | JMod.NATIVE, long.class, nativeName);
 			nativeMethod.annotate(Ptr.class);
 		} else {
-			nativeMethod = enclosing.method(nativeVisibility | JMod.NATIVE, returnType.getJType(), nativeName);
+			nativeMethod = enclosing.method(nativeModifiers | JMod.NATIVE, returnType.getJType(), nativeName);
 		}
 		
 		if (parametersList != null) { //null if the function has no arguments
@@ -812,9 +814,14 @@ private void parseMethodOrFunction(Element root, ParsingContext context) {
 				name = nativeName;
 			}
 			name = NameUtils.neutralizeKeyword(name);
-			JMethod wrapper = enclosing.method(JMod.PUBLIC, returnType.getJType(), name);
+			JMethod wrapper = enclosing.method(JMod.PUBLIC | staticModifier, returnType.getJType(), name);
 			
-			JInvocation nativeCall = JExpr._this().invoke(nativeMethod);
+			JInvocation nativeCall;
+			if (staticModifier == 0) {
+				nativeCall = JExpr._this().invoke(nativeMethod);
+			} else {
+				nativeCall = enclosing.staticInvoke(nativeMethod);
+			}
 			if (parametersList != null) {
 				for (ParameterDescriptor paramDesc : parametersList) {
 					if (paramDesc.isInstance()) {
diff --git a/src/gir2java/ParameterDescriptor.java b/src/gir2java/ParameterDescriptor.java
@@ -37,4 +37,16 @@ public static boolean containsPointer(List<ParameterDescriptor> list) {
 		}
 		return false;
 	}
+	
+	public static boolean containsInstanceParameter(List<ParameterDescriptor> list) {
+		if (list == null) {
+			return false;
+		}
+		for (ParameterDescriptor desc : list) {
+			if (desc.isInstance()) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,16 @@ public static boolean containsPointer(List<ParameterDescriptor> list) {`
`37`	`37`	`}`
`38`	`38`	`return false;`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ public static boolean containsInstanceParameter(List<ParameterDescriptor> list) {`
	`42`	`+ if (list == null) {`
	`43`	`+ return false;`
	`44`	`+ }`
	`45`	`+ for (ParameterDescriptor desc : list) {`
	`46`	`+ if (desc.isInstance()) {`
	`47`	`+ return true;`
	`48`	`+ }`
	`49`	`+ }`
	`50`	`+ return false;`
	`51`	`+ }`
`40`	`52`	`}`