JNAerator: add explicit setFieldOrder call to struct constructors for JNA(erator) runtime outputs (BridJ does not need it as it has @field(i) annotations)

ochafik · ochafik · commit 4b70fd923536 · 2010-11-24T16:16:18.000Z
diff --git a/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/DeclarationsConverter.java b/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/DeclarationsConverter.java
@@ -1594,7 +1594,7 @@ public VariablesDeclaration convertVariablesDeclarationToJNA(String name, TypeRe
 						mul = expr(c.getFirst(), BinaryOperator.Multiply, mul);
 				}
 			}
-			initVal = new Expression.NewArray(jr.getTarget(), mul);
+			initVal = new Expression.NewArray(jr.getTarget(), new Expression[] { mul }, new Expression[0]);
 		}
 		if (javaType == null) {
 			throw new UnsupportedConversionException(mutatedType, "failed to convert type to Java");
@@ -1963,24 +1963,29 @@ private void addStructConstructors(Identifier structName, Struct structJavaClass
 			Pair<List<VariablesDeclaration>, List<VariablesDeclaration>> decls = getParentAndOwnDeclarations(structJavaClass, nativeStruct);
 			Map<Integer, String> namesById = new TreeMap<Integer, String>();
 			Set<String> names = new HashSet<String>();
+			List<Expression> orderedFieldNames = new ArrayList<Expression>();
 			int iArg = 0;
 			for (VariablesDeclaration vd : new CompoundCollection<VariablesDeclaration>(decls.getFirst(), decls.getSecond())) {
 				String name = chooseJavaArgName(vd.getDeclarators().get(0).resolveName(), iArg, names);
 				namesById.put(vd.getId(), name);
 				fieldsConstr.addArg(new Arg(name, vd.getValueType().clone()));
 				iArg++;
 			}
+            
 			FunctionCall superCall = methodCall("super");
+            // Adding parent fields
 			for (VariablesDeclaration vd : decls.getFirst()) {
 				String name = vd.getDeclarators().get(0).resolveName(), uname = namesById.get(vd.getId());
 				Struct parent = (Struct)vd.getParentElement();
 				Identifier parentTgName = result.getTaggedTypeIdentifierInJava(parent);
 				if (!result.config.noComments)
 					fieldsConstr.addToCommentBefore("@param " + name + " @see " + parentTgName + "#" + vd.getDeclarators().get(0).resolveName());
 				superCall.addArgument(varRef(uname));
+                orderedFieldNames.add(expr(name));
 			}
 			fieldsConstr.getBody().addStatement(stat(superCall));
 			
+			// Adding class' own fields
 			for (VariablesDeclaration vd : decls.getSecond()) {
 				String name = vd.getDeclarators().get(0).resolveName(), uname = namesById.get(vd.getId());
 				if (!result.config.noComments)
@@ -1990,7 +1995,25 @@ private void addStructConstructors(Identifier structName, Struct structJavaClass
 					fieldsConstr.getBody().addStatement(throwIfArraySizeDifferent(uname));
 				fieldsConstr.getBody().addStatement(stat(
 						new Expression.AssignmentOp(memberRef(thisRef(), MemberRefStyle.Dot, ident(name)), AssignmentOperator.Equal, varRef(uname))));
+                
+                orderedFieldNames.add(expr(name));
 			}
+            
+            if (result.config.runtime != JNAeratorConfig.Runtime.BridJ) {
+                String initOrderName = "initFieldOrder";
+                Function initOrder = new Function(Type.JavaMethod, ident(initOrderName), typeRef(Void.TYPE)).setBody(block(
+					stat(
+						methodCall("setFieldOrder", new Expression.NewArray(typeRef(String.class), new Expression[0], orderedFieldNames.toArray(new Expression[orderedFieldNames.size()])))
+					)
+				)).addModifiers(Modifier.Protected);
+                if (signatures.add(initOrder.computeSignature(false))) {
+                		structJavaClass.addDeclaration(initOrder);
+	                 Statement callInitOrder = stat(methodCall(initOrderName));
+					emptyConstructor.getBody().addStatement(callInitOrder);
+					fieldsConstr.getBody().addStatement(callInitOrder.clone());
+				}
+            }
+            
 			int nArgs = fieldsConstr.getArgs().size();
 			if (nArgs == 0)
 				System.err.println("Struct with no field : " + structName);
