luciano/coffi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix nested types serdes

Browse source
This commit is contained in:
Kristin Rutenkolk 2024-10-11 22:26:41 +02:00
parent 37b74fc638
commit eea1b43da3
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/clj/coffi/mem.clj
View file

@ -1600,7 +1600,7 @@
'floats [::array ::byte] 'floats [::array ::byte]
'doubles [::array ::byte]} 'doubles [::array ::byte]}
_type _type
_type)) (keyword (str *ns*) (str _type))))
(defn coffitype->array-fn [_type] (defn coffitype->array-fn [_type]
(get (get
@ -1659,6 +1659,7 @@
(generate-deserialize field-type (+ global-offset offset)))) (generate-deserialize field-type (+ global-offset offset))))
(reduce concat) (reduce concat)
(cons (symbol (str (name typename) "."))) (cons (symbol (str (name typename) ".")))
(list)
)))) ))))
(defmulti generate-serialize (fn [& xs] (if (vector? (first xs)) (first (first xs)) (first xs)))) (defmulti generate-serialize (fn [& xs] (if (vector? (first xs)) (first (first xs)) (first xs))))
@ -1689,8 +1690,9 @@
(->> typelist (->> typelist
(map-indexed (map-indexed
(fn [index [offset [_ field-type]]] (fn [index [offset [_ field-type]]]
(generate-serialize field-type (list (symbol (str "." (name (nth fieldnames index)))) source-form) (+ global-offset offset)))) (generate-serialize field-type (list (symbol (str "." (name (nth fieldnames index)))) 'source-obj) (+ global-offset offset))))
(cons `do))))) (concat [`let ['source-obj source-form]])
))))
(defmacro defstruct (defmacro defstruct
"Defines a struct type. all members need a type hint. "Defines a struct type. all members need a type hint.
@ -1721,9 +1723,9 @@
(register-new-struct-serialization coffi-typename struct-layout) (register-new-struct-serialization coffi-typename struct-layout)
`(do `(do
(defrecord ~typename ~typed-symbols) (defrecord ~typename ~typed-symbols)
(defmethod c-layout ~coffi-typename [~'_] ~struct-layout) (defmethod c-layout ~coffi-typename [~'_] (c-layout ~struct-layout))
(defmethod deserialize-from ~coffi-typename ~['segment '_type] (defmethod deserialize-from ~coffi-typename ~['segment '_type]
~(generate-deserialize coffi-typename 0)) ~(first (generate-deserialize coffi-typename 0)))
(defmethod serialize-into ~coffi-typename ~[(with-meta 'source-obj {:tag typename}) '_type 'segment '_] (defmethod serialize-into ~coffi-typename ~[(with-meta 'source-obj {:tag typename}) '_type 'segment '_]
~(generate-serialize coffi-typename (with-meta 'source-obj {:tag typename}) 0)) ~(generate-serialize coffi-typename (with-meta 'source-obj {:tag typename}) 0))
) )