support arbitrary emit values, not just seqs

Author: jgpc42

CHANGELOG.md

@@ -6,7 +6,7 @@
 * Add support for custom index objects via the `LocalIndex` protocol
 * Generate default constructor for :abstract classes too if one not provided
 * Support passing parameter and return types separately when defining methods
-* Experimental new map compilation facilitated by `:emit-seq-fn`.
+* Experimental new map-style ops facilitated by `:emit-fn`.
 
 ## 0.5.4 (2022-04-14)
 

src/insn/core.clj

@@ -69,12 +69,12 @@
 
     :debug        string of arbitrary debug information - optional.
 
-    :emit-seq-fn  fn to call with each bytecode seq. This is an advanced
-                  option and, if present, will be passed both the ASM
-                  MethodVisitor and the raw (possibly nested) :emit op
-                  seq for each method. Can be used to support new op
-                  data types. For example, the `insn.op-map/emit-seq` fn
-                  can be used to enable map-style op sequences.
+    :emit-fn      fn to be called to emit method bytecode. This is an
+                  advanced option and, if present, will be passed both
+                  the ASM MethodVisitor and the raw :emit value for each
+                  method. Can be used to support new op data types. For
+                  example, the `insn.op-map/emit-seq` fn can be used to
+                  enable map-style op sequences.
 
   Each field and method can also be given :annotations and a :signature
   as per above.
@@ -200,13 +200,13 @@
                      :emit [[:aload 0]
                             [:invokespecial :super :init [:void]]
                             [:return]]}))
-        emit-seq (:emit-seq-fn t op/emit-seq)]
+        emit-fn (:emit-fn t op/emit-seq)]
     (binding [util/*this* this
               util/*super* super]
       (doseq [f (:fields t)]
         (visit-field cv f))
       (doseq [m (:methods t)]
-        (visit-method cv m emit-seq))
+        (visit-method cv m emit-fn))
       (doto cv
         (ann/visit (:annotations t))
         .visitEnd))
@@ -225,7 +225,7 @@
     (ann/visit fv (:annotations f))
     (.visitEnd fv)))
 
-(defn- visit-method [^ClassVisitor cv m emit-seq]
+(defn- visit-method [^ClassVisitor cv m emit-fn]
   (let [mname (util/method-name (:name m))
         clinit? (= mname "<clinit>")
         init? (= mname "<init>")
@@ -255,7 +255,7 @@
     (binding [util/*labels* (atom {})]
       (if (fn? emit)
         (emit mv)
-        (emit-seq mv emit)))
+        (emit-fn mv emit)))
     (ann/visit mv (:annotations m))
     (doseq [[i anns] (or (:parameter-annotations m) (:param-annotations m))]
       (ann/visit mv i anns))

src/insn/op.clj

@@ -347,7 +347,7 @@
   (.visitLookupSwitchInsn v (util/label-from default) (int-array tkeys)
                           (util/label-array tlabels)))
 
-(defn lookupswitch
+(defn ^::op lookupswitch
   "Like `lookupswitch*` with the keys and labels given as a map."
   [v default m]
   (let [[tkeys tlabels] ((juxt identity (partial map m))
@@ -416,7 +416,8 @@
       (doseq [op ops]
         (apply (::fn op) v (::args op))))))
 
-(def ^:private keyword-opcode*
+(def keyword-opcodes
+  "Map of op keyword to ASM Opcode number."
   (into {} (for [var (vals (ns-publics *ns*))
                  :let [m (meta var)]
                  :when (::op m)]
@@ -429,7 +430,7 @@
   "Return the ASM opcode number as a long for the given op keyword. If
   the keyword is invalid an error is raised."
   ^long [k]
-  (let [v (util/check-valid "op keyword" keyword-opcode* k)]
+  (let [v (util/check-valid "op keyword" keyword-opcodes k)]
     (.longValue ^Integer v)))
 
 (defn emit-seq

src/insn/op_map.clj

@@ -105,7 +105,7 @@
       {:op :areturn}
       ..."
   (fn [v op] (:op op))
-  :default ::default)
+  :default ::invalid)
 
 (defmacro ^:private defops
   ([ops mkeys]

test/insn/core_test.clj

@@ -407,8 +407,8 @@
               :type (.getReturnType m)
               :anns (map #(.annotationType %) (aget (.getParameterAnnotations m) 0))})))))
 
-(deftest test-emit-seq-fn
-  (let [t {:emit-seq-fn op-map/emit-seq
+(deftest test-emit-fn
+  (let [t {:emit-fn op-map/emit-seq
            :methods [{:name :init :params []
                       :emit [{:op :aload :index 0}
                              {:op :invokespecial :class :super :name :init}