Starting to build some tooling for reading BridgeSupport files, makin…

…g improvements to the encoding parser along the way.

BridgeSupport/BridgeSupport.iml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Clojure" name="Clojure">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/clojure" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Clojure" level="project" />
+    <orderEntry type="module" module-name="Core" />
+  </component>
+</module>
+

BridgeSupport/build.xml

@@ -0,0 +1,68 @@
+<project name="BridgeSupport" basedir="." default="gen_all_bridge_metadata">
+    <property name="generated" value="generated"/>
+    <property name="bin" value="bin"/>
+
+
+    <target name="gen_bridge_metadata">
+        <exec executable="gen_bridge_metadata">
+            <arg value="--64-bit"/>
+            <arg value="-f"/>
+            <arg value="${framework.name}"/>
+            <arg value="-F"/>
+            <arg value="final"/>
+            <arg value="-o"/>
+            <arg value="${generated}/bridgesupport/${framework.name}.bridgesupport"/>
+        </exec>
+    </target>
+
+    <target name="gen_bridge_metadata_dylib">
+        <exec executable="gen_bridge_metadata">
+            <arg value="-f"/>
+            <arg value="${framework.name}"/>
+            <arg value="-F"/>
+            <arg value="dylib"/>
+            <arg value="-o"/>
+            <arg value="${bin}/${framework.name}_BridgeSupport.dylib"/>
+        </exec>
+    </target>
+
+    <target name="gen_bridge_xml_and_dylib">
+        <antcall target="gen_bridge_metadata"/>
+        <antcall target="gen_bridge_metadata_dylib"/>
+    </target>
+
+    <target name="gen_all_bridge_metadata">
+        <antcall target="gen_bridge_xml_and_dylib">
+            <param name="framework.name" value="Foundation"/>
+        </antcall>
+        <antcall target="gen_bridge_xml_and_dylib">
+            <param name="framework.name" value="AppKit"/>
+        </antcall>
+    </target>
+
+    <target name="get_bridgesupport">
+        <copy file="/System/Library/Frameworks/${framework.name}.framework/Resources/BridgeSupport/${framework.name}.bridgesupport" todir="${generated}/bridgesupport"/>
+    </target>
+
+    <target name="get_all_bridgesupport">
+        <antcall target="get_bridgesupport">
+            <param name="framework.name" value="Foundation"/>
+        </antcall>
+        <antcall target="get_bridgesupport">
+            <param name="framework.name" value="AppKit"/>
+        </antcall>
+    </target>
+
+    <target name="setupdirs">
+        <mkdir dir="${bin}"/>
+        <mkdir dir="${generated}"/>
+        <mkdir dir="${generated}/java"/>
+        <mkdir dir="${generated}/clojure"/>
+        <mkdir dir="${generated}/bridgesupport"/>
+    </target>
+
+    <target name="clean">
+        <delete dir="${bin}"/>
+        <delete dir="${generated}"/>
+    </target>
+</project>

BridgeSupport/src/clojure/couverjure/tools/bsgen.clj

@@ -0,0 +1,50 @@
+(ns couverjure.tools.bsgen
+  (:use clojure.xml couverjure.type-encoding)
+  (:import (java.io File)))
+
+(defmulti gen-java :kind)
+(defmulti gen-java-ref :kind)
+
+(defmethod gen-java :structure [s]
+  (format "public class %s {\n%s}"
+    (:name s)
+    (apply str (map gen-java (:fields s)))))
+
+(defmethod gen-java :field [f]
+  (format "    public %s %s;\n"
+    (gen-java-ref (:type f))
+    (:name f)))
+
+(defmethod gen-java-ref :structure [s]
+  (:name s))
+
+(defmethod gen-java-ref :array [a]
+  (format "%s[%d]"
+    (gen-java-ref (:type a)) (:size a)))
+
+(defmethod gen-java-ref :bitfield [b]
+  "long")
+
+(defmethod gen-java-ref :pointer [p]
+  (str (gen-java-ref (:type p)) "ByRef"))
+
+(defmethod gen-java-ref :primitive [p]
+  (.getName (primitive-java-types (:type p))))
+
+(defn generate-framework-classes
+  "Generates JNA-based java source files from the .bridgesupport XML file, using the supplied output directory and namespace"
+  [bsfilename namespace output-dir]
+  (let [file (File. bsfilename)
+        xml (xml-seq (parse file))]
+    (doall (for [elem xml :when (= :struct (:tag elem))]
+      (let [name (:name (:attrs elem))
+            type (or (:type64 (:attrs elem)) (:type (:attrs elem)))
+            objc-type (first (type-encoding type))]
+        ;(when-not objc-type (println type))
+        (println (gen-java objc-type))
+        )))
+    ))
+
+(if (= 3 (count *command-line-args*))
+  (apply generate-framework-classes *command-line-args*)
+  (println "Usage: bsgen <bridgesupport file> <output-dir> <namespace>"))

Core/src/clojure/couverjure/core.clj

@@ -327,7 +327,7 @@ The body of the implementation should consist of a set of (method) or (property)
   or set releaseOnFinalize and retain"
   [value type needs-retain?]
   (if (= (:kind type) :primitive)
-    (let [primitive (:primitive-type type)]
+    (let [primitive (:type type)]
         (condp (fn [set prim] (set prim)) primitive
           #{:id}
           (if needs-retain?
@@ -378,7 +378,7 @@ The body of the implementation should consist of a set of (method) or (property)
         method-encoding
         (.method_getTypeEncoding foundation target-method)
         return-sig
-        (:element-type (first (method-argument-encoding method-encoding))) ; parse first arg from encoding
+        (:type (first (method-argument-encoding method-encoding))) ; parse first arg from encoding
         raw-result
         (if super?
           (send-super id-or-super sel args)