Add alias parsing

octachoron · octachoron · commit 0b0c1ae46d84 · 2014-08-14T20:09:01.000+02:00
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -901,15 +901,9 @@ private void parseAlias(Element root, ParsingContext context) {
 		String name = root.getAttributeValue("name");
 		Set<String> foundTypes = (Set<String>)context.getExtra(Constants.CONTEXT_EXTRA_DEFINED_TYPES);
 		foundTypes.add("" + context.getExtra(Constants.CONTEXT_EXTRA_NAMESPACE) + '.' + name);
-		ConvertedType convType = new ConvertedType(
-				context.getCm(),
-				(String)context.getExtra(Constants.CONTEXT_EXTRA_NAMESPACE),
-				name,
-				root.getAttributeValue("type",Constants.GIR_XMLNS_C),
-				false
-		);
-		convType.setJType(context.getCm().ref(Object.class));
-		context.registerType(convType);
+		
+		ConvertedType referred = findType(root, context);
+		context.registerTypeAs(referred, (String)context.getExtra(Constants.CONTEXT_EXTRA_NAMESPACE), name);
 	}
 	
 	@SuppressWarnings("unused")
diff --git a/src/gir2java/ParsingContext.java b/src/gir2java/ParsingContext.java
@@ -56,6 +56,10 @@ public void registerType(ConvertedType type) {
 		types.registerType(type);
 	}
 	
+	public void registerTypeAs(ConvertedType type, String namespace, String name) {
+		types.registerTypeAs(type, namespace, name);
+	}
+	
 	public ConvertedType lookupType(String namespace, String name) {
 		return types.lookupType(namespace, name);
 	}
diff --git a/src/gir2java/TypeRegistry.java b/src/gir2java/TypeRegistry.java
@@ -17,15 +17,18 @@ public class TypeRegistry {
 	Map<String, JDefinedClass> namespaceClasses = new HashMap<String, JDefinedClass>();
 	
 	public void registerType(ConvertedType type) {
-		String namespace = type.getNamespace();
+		registerTypeAs(type, type.getNamespace(), type.getType());
+	}
+	
+	public void registerTypeAs(ConvertedType type, String namespace, String name) {
 		Map<String, ConvertedType> nsStore = store.get(namespace);
 		
 		if (nsStore == null) {
 			nsStore = new HashMap<String, ConvertedType>();
 			store.put(namespace, nsStore);
 		}
 		
-		nsStore.put(type.getType(), type);
+		nsStore.put(name, type);
 	}
 	
 	/**

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ public void registerType(ConvertedType type) {`
`56`	`56`	`types.registerType(type);`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ public void registerTypeAs(ConvertedType type, String namespace, String name) {`
	`60`	`+ types.registerTypeAs(type, namespace, name);`
	`61`	`+ }`
	`62`	`+`
`59`	`63`	`public ConvertedType lookupType(String namespace, String name) {`
`60`	`64`	`return types.lookupType(namespace, name);`
`61`	`65`	`}`