From 9c0e1d736e13b4598451b7a0f15a2e56e5581010 Mon Sep 17 00:00:00 2001 From: Joshua Suskalo Date: Wed, 29 Sep 2021 10:18:45 -0500 Subject: [PATCH 1/3] Add unreleased section --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cca4903..638d9b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). +## [Unreleased] + ## [0.1.169] - 2021-09-28 ### Added - Macro for easily wrapping native functions with arbitrary logic @@ -11,4 +13,5 @@ All notable changes to this project will be documented in this file. This change - Support for serializing and deserializing arbitrary Clojure functions - Support for serializing and deserializing arbitrary Clojure data structures +[Unreleased]: https://github.com/IGJoshua/coffi/compare/v0.1.169...HEAD [0.1.169]: https://github.com/IGJoshua/coffi/compare/16f56bc31d69142ec4d2fb61b15b069d78b127ca...v0.1.169 From b01f4229e555207cec9483341568e03f2ff90be6 Mon Sep 17 00:00:00 2001 From: Joshua Suskalo Date: Wed, 29 Sep 2021 10:20:10 -0500 Subject: [PATCH 2/3] Fix invalid macroexpansion of `defcfn` without docstring --- CHANGELOG.md | 2 ++ src/clj/coffi/ffi.clj | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 638d9b5..80a7da0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). ## [Unreleased] +### Fixed +- Usage of `defcfn` without a docstring produced an invalid `def` form ## [0.1.169] - 2021-09-28 ### Added diff --git a/src/clj/coffi/ffi.clj b/src/clj/coffi/ffi.clj index 1d9c544..4c966e6 100644 --- a/src/clj/coffi/ffi.clj +++ b/src/clj/coffi/ffi.clj @@ -579,7 +579,8 @@ (mapv (comp symbol name) (:native-arglist args))))))) (:attr-map args))) - ~@(list (:doc args)) + ~@(when-let [doc (:doc args)] + (list doc)) fun#)))) (s/fdef defcfn :args ::defcfn-args) From b3864c769739e8d87094acf2a5f0571605fd4134 Mon Sep 17 00:00:00 2001 From: Joshua Suskalo Date: Wed, 29 Sep 2021 10:55:05 -0500 Subject: [PATCH 3/3] Update for new clojars release --- CHANGELOG.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a7da0..d783256 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). -## [Unreleased] +## [0.1.176] - 2021-09-29 ### Fixed - Usage of `defcfn` without a docstring produced an invalid `def` form diff --git a/README.md b/README.md index cd75f9d..614508e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This library is available on Clojars. Add one of the following entries to the `:deps` key of your `deps.edn`: ```clojure -org.suskalo/coffi {:mvn/version "0.1.169"} +org.suskalo/coffi {:mvn/version "0.1.176"} io.github.IGJoshua/coffi {:git/tag "v0.1.169" :git/sha "7ec2748"} ```