JNAerator: added -libraryOverrides symbol1=lib1,symbol2=lib2 for library overrides (issue #518)

ochafik · ochafik · commit ffaea76528f0 · 2014-06-26T22:03:14.000+01:00
diff --git a/libraries/jnaerator/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Element.java b/libraries/jnaerator/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Element.java
@@ -70,6 +70,15 @@ public Identifier getResolvedJavaIdentifier() {
         return resolvedJavaIdentifier;
     }
 
+    public static Identifier getName(Element element) {
+        if (element instanceof Function)
+            return ((Function) element).getName();
+        if (element instanceof TaggedTypeRefDeclaration)
+            return getName(((TaggedTypeRefDeclaration) element).getTaggedTypeRef());
+        if (element instanceof TypeRef.TaggedTypeRef)
+            return ((TypeRef.TaggedTypeRef) element).getTag();
+        return null;
+    }
     
     public Map<Object, Object> getAttributes() {
         return attributes == null ? Collections.EMPTY_MAP : Collections.unmodifiableMap(attributes);
diff --git a/libraries/jnaerator/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifiableElement.java b/libraries/jnaerator/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifiableElement.java
@@ -25,7 +25,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 
 public abstract class ModifiableElement extends Element {
 	protected final List<Modifier> modifiers = new ArrayList<Modifier>();
-	
+    
 	@Override
 	public void accept(Visitor visitor) {
 		visitor.visitModifiableElement(this);
diff --git a/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java b/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java
@@ -320,6 +320,9 @@ List<String> parsed(ParsedArg a) throws Exception {
                         case SkipIncludedFrameworks:
                             config.skipIncludedFrameworks = true;
                             break;
+                        case LibraryOverrides:
+                            config.libraryOverrides.putAll(a.getMapParam(0));
+                            break;
                         case GenPrivateMembers:
                             config.skipPrivateMembers = false;
                             break;
diff --git a/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorCommandLineArgs.java b/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorCommandLineArgs.java
@@ -57,6 +57,10 @@ public String getStringParam(int pos) {
                 return (String) params[pos];
             }
 
+            public Map<String, String> getMapParam(int pos) {
+                return (Map) params[pos];
+            }
+
             public MessageFormat getMessageFormatParam(int pos) {
                 return (MessageFormat) params[pos];
             }
@@ -186,6 +190,7 @@ public enum OptionDef {
         BeautifyNames("-beautifyNames", "Transform C names to Java-looking names : some_func() => someFunc()"),
         ConvertBodies("-convertBodies", "Experimental conversion of function bodies to equivalent Java code (BridJ only)."),
         JarOut("-jar", "Jar file where all generated sources and the compiled classes go", new ArgDef(Type.OutputFile, "outFile")),
+        LibraryOverrides("-libraryOverrides", "Comma-separated list of `symbol=library` library overrides (when isolated functions are located in a different library than their surrounding code).", new ArgDef(Type.Map, "list")),
         ScalaStructSetters("-scalaStructSetters", "Generate Scala-style setters for BridJ structs (with a name like fieldName_$eq)"),
         WCharAsShort("-wcharAsShort", "Force treatment of wchar_t as short (char by default)"),
         CallbackInvokeName("-callbacksInvokeMethodName", "Name of the invocation method of callbacks ('apply' by default)", new ArgDef(Type.String, "methodName")),
@@ -316,7 +321,10 @@ private boolean isDeprecated() {
 
         public enum Type {
 
-            ExistingFile, ExistingDir, File, MessageFormat, String, Int, ExistingFileOrDir, OutputDir, OutputFile, OptionalFile, Enum
+            ExistingFile, ExistingDir, File, MessageFormat, String, Int,
+            ExistingFileOrDir, OutputDir, OutputFile, OptionalFile,
+            Map,
+            Enum
         }
 
         public static class ArgDef {
@@ -378,6 +386,8 @@ public String format(Object arg) {
                         return arg == null ? null : ((File) arg).toString();
                     case String:
                         return (String) arg;
+                    case Map:
+                        return ((Map) arg).toString();
                     case Int:
                         return ((Integer) arg).toString();
                     default:
@@ -414,6 +424,13 @@ Object convertArg(String arg, ArgsParser parser) throws FileNotFoundException {
                             throw new FileNotFoundException(f.toString());
                         }
                         return f;
+                    case Map:
+                        Map<String, String> map = new LinkedHashMap<String, String>();
+                        for (String pair : arg.split(",")) {
+                            int i = pair.indexOf("=");
+                            map.put(pair.substring(0, i), pair.substring(i + 1));
+                        }
+                        return map;
                     case File:
                         return findFile(arg, parser);
                     case Int:
diff --git a/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfig.java b/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfig.java
@@ -409,6 +409,7 @@ public Map<String, String> getAllMacros() {
     public boolean reification;
     public boolean convertBodies;
     public boolean removeInlineAsm;
+    public Map<String, String> libraryOverrides = new HashMap<String, String>();
     public Map<String, String> extraJavaSourceFilesContents = new LinkedHashMap<String, String>();
     public Set<String> frameworks = new LinkedHashSet<String>();
     boolean skipIncludedFrameworks;
@@ -602,7 +603,13 @@ public Set<String> getLibraries() {
     public boolean noCPlusPlus;
     public String mavenGroupId = "com.mycompany", mavenArtifactId = "my-native-bindings", mavenVersion = "1.0-SNAPSHOT";
 
-    public String getLibrary(String elementFile) {
+    public String getLibrary(String elementFile, Identifier elementName) {
+        if (elementName != null) {
+            String libraryOverride = libraryOverrides.get(elementName.toString());
+            if (libraryOverride != null) {
+                return libraryOverride;
+            }
+        }
         if (elementFile == null) {
             return libraryForElementsInNullFile;
         }
diff --git a/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java b/libraries/jnaerator/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java
@@ -430,7 +430,7 @@ String guessFramework(String file) {
 
     String getLibrary(Element decl) {
         String file = resolveFile(decl);
-        String library = config.getLibrary(file);
+        String library = config.getLibrary(file, Element.getName(decl));
         if (library == null) {
             SourceFile f = decl.findParentOfType(SourceFile.class);
             if (f != null) {
