java-gobject-introspection r163 - trunk/src/org/gnome/gir/compiler

[walters svn gnome org]

Author: walters
Date: Sun Jan 25 17:47:13 2009
New Revision: 163
URL: http://svn.gnome.org/viewvc/java-gobject-introspection?rev=163&view=rev

Log:
Fix array/index pairing for function (i.e. not method) case

Modified:
   trunk/src/org/gnome/gir/compiler/CodeFactory.java

Modified: trunk/src/org/gnome/gir/compiler/CodeFactory.java
==============================================================================
--- trunk/src/org/gnome/gir/compiler/CodeFactory.java	(original)
+++ trunk/src/org/gnome/gir/compiler/CodeFactory.java	Sun Jan 25 17:47:13 2009
@@ -1176,7 +1176,7 @@
 			/* Calculate how many arguments we deleted */
 			int nEliminated = 0;
 			for (Integer i : getAllEliminiated()) {
-				if (offset >= i)
+				if (offset > i)
 					nEliminated++;
 			}
 
@@ -1278,6 +1278,15 @@
 					return null;
 				}
 				firstSeenCallback = argOffset;
+				if (ctx.userDataIndices.size() > 0) {
+					/* This is really a bug in the code generator we should fix; but the offset
+					 * computation code is quite fragile, and there's only one function which
+					 * trips this in all of the public GObject stack right now.  So in the interest
+					 * of expediency for a release, just skip it. 
+					 */
+					logger.warning("Skipping callable with irregularly-placed user data: " + si.getIdentifier());
+					return null;
+				}
 			} else if (tag.equals(TypeTag.ARRAY) && arg.getDirection().equals(Direction.IN)) {
 				int lenIdx = arg.getType().getArrayLength();
 				if (lenIdx >= 0) {
@@ -1295,11 +1304,12 @@
 		}
 
 		/* Now go through and remove array length indices */
+		int off = (ctx.isMethod ? 1 : 0);		
 		List<Type> filteredTypes = new ArrayList<Type>();
-		for (int i = 1; i < types.size() + 1; i++) {
+		for (int i = off; i < types.size() + off; i++) {
 			Integer index = ctx.lengthOfArrayIndices.get(i);
 			if (index == null) {
-				filteredTypes.add(types.get(i - 1));
+				filteredTypes.add(types.get(i - off));
 			}
 		}