From e323e68aa5343fa92d12196f8c98353389559c1b Mon Sep 17 00:00:00 2001 From: "Grigory V." Date: Sat, 28 Jan 2012 21:20:55 +0400 Subject: [PATCH 1/2] Dump keywords --- src/tnetstrings/core.clj | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/tnetstrings/core.clj b/src/tnetstrings/core.clj index abdf843..88fd42d 100644 --- a/src/tnetstrings/core.clj +++ b/src/tnetstrings/core.clj @@ -105,12 +105,13 @@ (defn- boolean? [x] (or (= true x) (= false x))) (defn- dump-item [item] - (cond (nil? item) "0:~" ; Null - (string? item) (dump-str item) ; String - (integer? item) (dump-int item) ; Integer - (boolean? item) (dump-bool item) ; Boolean - (list? item) (dump-list item) ; List - (map? item) (dump-map item) ; Map + (cond (nil? item) "0:~" ; Null + (string? item) (dump-str item) ; String + (integer? item) (dump-int item) ; Integer + (boolean? item) (dump-bool item) ; Boolean + (list? item) (dump-list item) ; List + (map? item) (dump-map item) ; Map + (keyword? item) (dump-str (name item)) ; Keyword :else :INVALID)) From 366f9b9d22da8b3858c17d02b2805654ef46ed55 Mon Sep 17 00:00:00 2001 From: "Grigory V." Date: Sat, 28 Jan 2012 21:23:39 +0400 Subject: [PATCH 2/2] Dump vectors and sets --- src/tnetstrings/core.clj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tnetstrings/core.clj b/src/tnetstrings/core.clj index 88fd42d..2a2fdcd 100644 --- a/src/tnetstrings/core.clj +++ b/src/tnetstrings/core.clj @@ -110,6 +110,8 @@ (integer? item) (dump-int item) ; Integer (boolean? item) (dump-bool item) ; Boolean (list? item) (dump-list item) ; List + (vector? item) (dump-list item) ; Vector + (set? item) (dump-list item) ; Set (map? item) (dump-map item) ; Map (keyword? item) (dump-str (name item)) ; Keyword :else :INVALID))