Handle manually given typedefs

octachoron · octachoron · commit 28ae508cc80d · 2014-08-26T17:16:28.000+02:00
This is made necessary at least by the gpointer c:type. The problem
is that its name does not contain any *s, but it represents a pointer
type, so this simple heuristic is not sufficient. A type with the c:type
gpointer may not be treated as a pointer, resulting in functions like
gst_object_unref() being skipped because it is believed to take a struct
by value. This mechanism fixes the issue described.
diff --git a/c-typedefs b/c-typedefs
@@ -0,0 +1,4 @@
+# This should eventually be generated automatically from gir <c:include>s.
+# Columns: original, new (like in C typedefs)
+
+void*,gpointer
diff --git a/src/gir2java/ConvertedType.java b/src/gir2java/ConvertedType.java
@@ -121,6 +121,8 @@ public ConvertedType forCType(ParsingContext context, String ctype) {
 			return this;
 		}
 		
+		String ctypeAfterTypedef = context.applyTypedefs(ctype);
+		
 		ConvertedType pointerConvType = new ConvertedType(this);
 		
 		JType currentJType = getJType();
@@ -135,14 +137,14 @@ public ConvertedType forCType(ParsingContext context, String ctype) {
 		}
 		
 		JType indirectJType = getJType();
-		int indirection = NameUtils.getIndirectionLevel(ctype) - currentIndirection;
+		int indirection = NameUtils.getIndirectionLevel(ctypeAfterTypedef) - currentIndirection;
 		
 		for (; indirection > 0; indirection--) {
 			indirectJType = context.getCm().ref(Pointer.class).narrow(indirectJType);
 		}
 		
 		pointerConvType.setJType(indirectJType);
-		pointerConvType.setCtype(ctype);
+		pointerConvType.setCtype(ctypeAfterTypedef);
 		return pointerConvType;
 	}
 	
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -99,6 +99,7 @@ public GirParser(JCodeModel cm) {
 		referencedTypes = new HashSet<String>();
 		
 		fillStaticTypeMappings();
+		fillStaticTypedefs();
 	}
 	
 	public void outputTypes(File found, File referenced, File undefined) {
@@ -193,6 +194,40 @@ private void fillStaticTypeMappings() {
 		foundTypes.add("none");
 	}
 	
+	private void fillStaticTypedefs() {
+		BufferedReader staticTypedefs;
+		try {
+			staticTypedefs = new BufferedReader(new InputStreamReader(new FileInputStream("c-typedefs")));
+		} catch (FileNotFoundException e) {
+			System.err.println("No typedefs file found, not using any typedefs");
+			return;
+		}
+		
+		String line;
+		try {
+			line = staticTypedefs.readLine();
+			while (line != null) {
+				//Skip lines containing only whitespace and/or a comment
+				String preprocessedLine = line.trim().replaceFirst("#.*$", "");
+				if (preprocessedLine.length() == 0) {
+					line = staticTypedefs.readLine();
+					continue;
+				}
+				
+				StringTokenizer st = new StringTokenizer(preprocessedLine, ",");
+				String orig = st.nextToken();
+				String alias = st.nextToken();
+				
+				typeRegistry.addTypedef(orig, alias);
+				
+				line = staticTypedefs.readLine();
+			}
+		} catch (IOException e) {
+			System.err.println("Error while reading typedefs file, not using all typedefs");
+			e.printStackTrace();
+		}
+	}
+	
 	/**
 	 * Get a descriptor of the namespace defined in the given .gir Document. This assumes
 	 * there is at most one such namespace.
diff --git a/src/gir2java/ParsingContext.java b/src/gir2java/ParsingContext.java
@@ -72,6 +72,10 @@ public JDefinedClass getCurrentNamespaceClass() {
 		return types.getNamespaceClass((String)getExtra(Constants.CONTEXT_EXTRA_NAMESPACE), this);
 	}
 	
+	public String applyTypedefs(String ctype) {
+		return types.applyTypedefs(ctype);
+	}
+	
 	public Object getExtra(String key) {
 		return extras.get(key);
 	}
diff --git a/src/gir2java/TypeRegistry.java b/src/gir2java/TypeRegistry.java
@@ -18,6 +18,7 @@ public class TypeRegistry {
 	
 	Map<String, Map<String, ConvertedType>> store = new HashMap<String, Map<String, ConvertedType>>();
 	Map<String, JDefinedClass> namespaceClasses = new HashMap<String, JDefinedClass>();
+	Map<String, String> ctypedefs = new HashMap<String, String>();
 	
 	public void registerType(ConvertedType type) {
 		registerTypeAs(type, type.getNamespace(), type.getType());
@@ -100,4 +101,18 @@ public JDefinedClass getNamespaceClass(String namespace, ParsingContext context)
 		}
 		return ret;
 	}
+	
+	public void addTypedef(String ctype, String alias) {
+		ctypedefs.put(alias, ctype);
+	}
+	
+	public String applyTypedefs(String ctype) {
+		String ret = ctype;
+		String next = ctypedefs.get(ret);
+		while(next != null) {
+			ret = next;
+			next = ctypedefs.get(next);
+		}
+		return ret;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,8 @@ public ConvertedType forCType(ParsingContext context, String ctype) {`
`121`	`121`	`return this;`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ String ctypeAfterTypedef = context.applyTypedefs(ctype);`
	`125`	`+`
`124`	`126`	`ConvertedType pointerConvType = new ConvertedType(this);`
`125`	`127`
`126`	`128`	`JType currentJType = getJType();`
`@@ -135,14 +137,14 @@ public ConvertedType forCType(ParsingContext context, String ctype) {`
`135`	`137`	`}`
`136`	`138`
`137`	`139`	`JType indirectJType = getJType();`
`138`		`- int indirection = NameUtils.getIndirectionLevel(ctype) - currentIndirection;`
	`140`	`+ int indirection = NameUtils.getIndirectionLevel(ctypeAfterTypedef) - currentIndirection;`
`139`	`141`
`140`	`142`	`for (; indirection > 0; indirection--) {`
`141`	`143`	`indirectJType = context.getCm().ref(Pointer.class).narrow(indirectJType);`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`pointerConvType.setJType(indirectJType);`
`145`		`- pointerConvType.setCtype(ctype);`
	`147`	`+ pointerConvType.setCtype(ctypeAfterTypedef);`
`146`	`148`	`return pointerConvType;`
`147`	`149`	`}`
`148`	`150`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,10 @@ public JDefinedClass getCurrentNamespaceClass() {`
`72`	`72`	`return types.getNamespaceClass((String)getExtra(Constants.CONTEXT_EXTRA_NAMESPACE), this);`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ public String applyTypedefs(String ctype) {`
	`76`	`+ return types.applyTypedefs(ctype);`
	`77`	`+ }`
	`78`	`+`
`75`	`79`	`public Object getExtra(String key) {`
`76`	`80`	`return extras.get(key);`
`77`	`81`	`}`