JNAerator: Allow BridJ generation tests.

Author: ochafik

jnaerator/pom.xml

@@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
   <groupId>com.jnaerator</groupId>
   <artifactId>jnaerator</artifactId>
-  <name>JNAerator CLI &amp; Studio Tools</name>
+  <name>JNAerator CLI and Studio Tools</name>
   <url>http://code.google.com/p/jnaerator/</url>
   <version>${jnaerator.version}</version>
   <packaging>jar</packaging>
@@ -17,7 +17,7 @@
   </parent>
 
   <description>
-JNAerator (pronounce "generator") simply parses C &amp; Objective-C headers and generates the corresponding JNA and Rococoa Java interfaces (it also has a very limited support for C++).
+JNAerator (pronounce "generator") simply parses C and Objective-C headers and generates the corresponding JNA and Rococoa Java interfaces (it also has a very limited support for C++).
 
 This lets Java programmers access native libraries transparently, with full IDE support and little to no hand-tweaking.
 

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java

@@ -1412,7 +1412,7 @@ public void jnaerationCore(SourceFiles sourceFiles, Result result) throws IOExce
 		}
 
 		/// Perform Objective-C-specific pre-transformation (javadoc conversion for enums + find name of enums based on next sibling integer typedefs)
-		sourceFiles.accept(new ObjectiveCToJavaPreScanner());
+		sourceFiles.accept(new ObjectiveCToJavaPreScanner(result));
 
 		/// Explode declarations to have only one direct declarator each
 		sourceFiles.accept(new CToJavaPreScanner());
@@ -1516,9 +1516,9 @@ public List<Modifier> getStoMods(List<Modifier> mods) {
 
 		generateLibraryFiles(sourceFiles, result);
 
-		//if (config.verbose)
-		for (String unknownType : result.typeConverter.unknownTypes) 
-			System.out.println("Unknown Type: " + unknownType);
+		if (config.verbose)
+			for (String unknownType : result.typeConverter.unknownTypes) 
+				System.out.println("Unknown Type: " + unknownType);
 
 		if (result.config.choicesOutFile != null) {
 			PrintWriter out = new PrintWriter(result.config.choicesOutFile);

jnaerator/src/main/java/com/ochafik/lang/jnaerator/MissingNamesChooser.java

@@ -351,7 +351,7 @@ private boolean chooseNameIfMissing(TaggedTypeRef taggedTypeRef) {
 //			return true;
 //		}
 		//String betterTag = result.declarationsConverter.getActualTaggedTypeName(taggedTypeRef);
-		if (isNull(taggedTypeRef.getTag())) {
+		if (isNull(taggedTypeRef.getTag()) && !(taggedTypeRef.getParentElement() instanceof TaggedTypeRefDeclaration)) {
 			Identifier tag = result.declarationsConverter.getActualTaggedTypeName(taggedTypeRef);
 			if (isNull(tag)) {
 				List<String> ownerNames = JNAeratorUtils.guessOwnerName(taggedTypeRef);//.getParentElement() instanceof StructTypeRef ? struct.getParentElement() : struct);

jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCToJavaPreScanner.java

@@ -46,6 +46,10 @@ public class ObjectiveCToJavaPreScanner extends Scanner {
 //		else
 //			super.visitStruct(struct);
 //	}
+	Result result;
+	public ObjectiveCToJavaPreScanner(Result result) {
+		this.result = result;
+	}
 	@Override
 	public void visitEnum(Enum e) {
 		Element parent = e.getParentElement();
@@ -115,8 +119,8 @@ private boolean handleAppleEnumTypeDef(Element nextDeclaration, Enum e) {
 		ep.replaceBy(null);
 		typeDef.setValueType(e);
 
-		
-		System.err.println("Inferred enum name : " + name);
+		if (result.config.verbose)
+			System.err.println("Inferred enum name : " + name);
 		return false;
 	}
 }

jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAerationTest.java

@@ -32,6 +32,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import java.util.TreeSet;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
+import java.util.regex.Matcher;
 
 import junit.framework.Assert;
 
@@ -66,9 +67,11 @@ public JNAerationTest(String title, TestDesc test) {
 	static class TestDesc {
 		String cSource;
 		String libraryName = "test";
+		JNAeratorConfig.Runtime runtime;
 		Map<String, String> extraJavaSourceFilesContents = new HashMap<String, String>();
-		public TestDesc(String cSource) {
+		public TestDesc(String cSource, JNAeratorConfig.Runtime runtime) {
 			this.cSource = cSource;
+			this.runtime = runtime;
 		}
 		public TestDesc addSource(String className, String javaContent) {
 			extraJavaSourceFilesContents.put(className, javaContent);
@@ -80,9 +83,20 @@ public TestDesc addMainContentSource(String className, String javaContent) {
 			//String lib = libraryName + "." + StringUtils.capitalize(libraryName) + "Library";
 			//imports.add("import " + lib + ";");
 			//imports.add("import static " + lib + ".*;");
-			imports.add("import com.sun.jna.*;");
-			imports.add("import com.sun.jna.ptr.*;");
-			imports.add("import java.nio.*;");
+			switch (runtime) {
+				
+			case JNAerator:
+			case JNA:
+				imports.add("import com.sun.jna.*;");
+				imports.add("import com.sun.jna.ptr.*;");
+				imports.add("import java.nio.*;");
+				break;
+			case BridJ:
+				imports.add("import com.bridj.*;");
+				imports.add("import com.bridj.cpp.*;");
+				imports.add("import java.nio.*;");
+				break;
+			}
 
 			for (String line : javaContent.split("\r?\n")) {
 				if (line.matches("^\\s*import[^\\w].*"))
@@ -107,6 +121,7 @@ public void test() throws SyntaxException, IOException, LexerException, Recognit
 		JNAeratorConfig config = new JNAeratorConfig();
 		config.defaultLibrary = test.libraryName;
 		config.compile = true;
+		config.runtime = test.runtime;
 		config.preferJavac = true;
 		config.extraJavaSourceFilesContents.putAll(test.extraJavaSourceFilesContents);
 		config.libraryForElementsInNullFile = test.libraryName;//test.classNameToJavaContent;
@@ -178,7 +193,7 @@ public void wrappersGenerated(Result result) {
 			}
 		});
 	}
-	
+	static Pattern runtimePattern = Pattern.compile("(?m)#runtime\\((BridJ|JNAerator|JNA)\\).*");
 	@Parameters
 	public static List<Object[]> readParameters() throws IOException {
 		//List<String> lines = ReadText.readLines(ObjCppParsingTests.class.getClassLoader().getResource(TEST_FILE));
@@ -198,11 +213,25 @@ public boolean accept(String path) {
 		})) {
 			String t = ReadText.readText(testURL);
 			String[] tt = t.split("\n--\n");
-			data.add(new Object[] { 
-				//testURL.toString(), //
-				new File(URLDecoder.decode(testURL.toString(), "utf-8")).getName(), 
-				new TestDesc(tt[0]).addMainContentSource("Test", tt[1]) 
-			});
+			String cSource = tt[0];
+			String n = new File(URLDecoder.decode(testURL.toString(), "utf-8")).getName();
+			for (int i = 1; i < tt.length; i++) {
+				String rawSource = tt[i];
+				JNAeratorConfig.Runtime runtime = JNAeratorConfig.Runtime.JNAerator;
+				Matcher m = runtimePattern.matcher(rawSource);
+				if (m.find()) {
+					runtime = Enum.valueOf(JNAeratorConfig.Runtime.class, m.group(1).trim());	
+				}
+				String javaSource = rawSource.replaceAll("^#", "//#");
+				String testName = n + " / " + runtime.name();
+				data.add(new Object[] { 
+						testName, 
+						new TestDesc(cSource, runtime).addMainContentSource(
+							"Test" + runtime.name(),
+							"// " + testName + "\n" + javaSource
+						) 
+				});
+			}
 		}
 		return data;
 	}

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/anonymous types.test

@@ -9,6 +9,7 @@ void ComplexArgFunction(
         }* pArg
 );
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/apple enums name inference.test

@@ -26,6 +26,7 @@ typedef uint32_t E4; // too far away !
 
 
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 
@@ -34,3 +35,16 @@ i = _E1.E1A;
 i = E2.E2A;
 i = E3.E3A;
 i = E4A;
+--
+#runtime(BridJ)
+import test.*;
+import static test.TestLibrary.*;
+
+_E1 e1 = _E1.E1A;
+E2 e2 = E2.E2A;
+E3 e3 = E3.E3A;
+
+IntValuedEnum<_E1> v1 = e1;
+IntValuedEnum<E2> v2 = e2;
+IntValuedEnum<E3> v3 = e3;
+int i4 = E4A;

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/array fields.test

@@ -11,6 +11,7 @@ struct Months {
 	Str15	names[12];
 };
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/basic structs.test

@@ -6,6 +6,7 @@ struct B {
    A *pa;
 };
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/bit fields.test

@@ -7,6 +7,7 @@ struct BF {
 	float f;
 };
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/callback fields.test

@@ -4,6 +4,7 @@ struct S {
 	long (*foo[10])(union { long l; int i; });
 };
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/constants.test

@@ -2,6 +2,7 @@
 const int Expression = X + (1 + 2) * 4;
 const int unsignedValue = (UInt32)4294967288L;
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/cpp operators.test

@@ -1,5 +1,6 @@
 extern bool operator/=(int&, float);
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/enum name.test

@@ -13,6 +13,7 @@ void f(Choice c);
 void ff(_OtherChoice c);
 
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/enums.test

@@ -11,6 +11,7 @@ enum E {
 	Item2 = Item1 + 10
 };
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/function alternatives.test

@@ -1,6 +1,7 @@
 void CopyBytes(char* dest, const char* source, const wchar_t* wsource, size_t n, const int* intArray);
 int process(void* ptr);
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 import org.rococoa.cocoa.foundation.*;

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/modifiers as identifiers.test

@@ -8,6 +8,7 @@ typedef struct _outerstruct2 {
 } outerstruct2;
 
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/objective-c categories protocols.test

@@ -14,6 +14,7 @@
 @end
 
 --
+#runtime(JNAerator)
 import test.*;
 import test.protocols.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/objective-c class.test

@@ -7,6 +7,7 @@
 
 @end
 --
+#runtime(JNAerator)
 import test.*;
 
 NSMutableArray a = NSMutableArray.arrayWithCapacity(10);

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/simple globals.test

@@ -7,6 +7,7 @@ extern NSInteger nsi;
 extern CGFloat cgf;
 
 --
+#runtime(JNAerator)
 import test.*;
 import org.rococoa.cocoa.*;
 import com.ochafik.lang.jnaerator.runtime.*;

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/struct and enum fields constructors.test

@@ -19,6 +19,7 @@ struct S2 : S {
 };
 
 --
+#runtime(JNAerator)
 
 import test.*;
 import static test.TestLibrary.*;

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/struct arguments.test

@@ -9,6 +9,7 @@ void fp(S*);
 void fp_(_S*);
 
 --
+#runtime(JNAerator)
 
 import test.*;
 import static test.TestLibrary.*;

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/struct by value vs by reference.test

@@ -42,6 +42,7 @@ simplestruct myfuncV();
 void myfuncV(simplestruct);
 
 --
+#runtime(JNAerator)
 
 import test.*;
 import org.rococoa.cocoa.*;

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/struct fields.test

@@ -10,6 +10,7 @@ struct S2 {
 };
 
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/tagged types name correction.test

@@ -23,6 +23,7 @@ typedef struct _S2
 } K;
 
 --
+#runtime(JNAerator)
 import test.*;
 import static test.TestLibrary.*;
 

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/typedef scope.test

@@ -13,6 +13,7 @@ f(S, void (*fptr)(), T*, lfptr p2);
 
 
 --
+#runtime(JNAerator)
 import test.*;
 
 S s = new S();

jnaerator/src/test/resources/com/ochafik/lang/jnaerator/tests/unknown pointers.test

@@ -3,6 +3,7 @@ struct OpaqueStruct;
 const OpaqueStruct* GetInterestingMessage(UnknownPtr*);
 
 --
+#runtime(JNAerator)
 
 import test.*;
 import static test.TestLibrary.*;