Add <record>s and <class>es to the second pass if superclass undefined

octachoron · octachoron · commit b0e33641f918 · 2014-08-15T22:32:59.000+02:00
There are cases when a class is defined before its superclass. An example
is GInitiallyUnowned. Try parsing these again just like methods if there
is a superclass declared, but the superclass is not defined yet.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -481,17 +481,28 @@ private void parseRecordOrClass(Element root, ParsingContext context) {
 			//Normal struct, children are members
 			try {
 				System.out.println("Normal struct " + name + " becomes class " + className);
+				String superclassName = root.getAttributeValue("parent");
+				ConvertedType superclassConvType = null;
+				if (superclassName != null) {
+					superclassConvType = context.lookupType(superclassName);
+					if (superclassConvType == null) {
+						Set<ParsingSnapshot> snapshots =
+								(Set<ParsingSnapshot>) context.getExtra(Constants.CONTEXT_EXTRA_SNAPSHOTS);
+						
+						snapshots.add(new ParsingSnapshot(context, root));
+						return;
+					}
+				}
+				
 				parsedClass = cm._class(className);
 				
 				parsedClass.init().add(cm.ref(BridJ.class).staticInvoke("register"));
 				
-				String superclassName = root.getAttributeValue("parent");
-				ConvertedType superclassConvType = context.lookupType(superclassName);
 				if (superclassConvType == null) {
 					parsedClass._extends(StructObject.class);
 				} else {
 					parsedClass._extends((JClass)superclassConvType.getJType());
-					System.out.println("className extends " + superclassConvType.getType() + " " + superclassConvType.getCtype() + " " + superclassConvType.getJType());
+					System.out.println(className + " extends " + superclassConvType);
 				}
 				
 
