couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [48/54] jiffy commit: updated refs/heads/master to ef77de4
Date Tue, 28 Jul 2015 22:43:13 GMT
Fix map type spec

I was being lazy and relying on Travis. This fixes up the map spec for
newer VMs.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/32b89393
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/32b89393
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/32b89393

Branch: refs/heads/master
Commit: 32b89393d3d5cde1f9e34828671d8a2fe43a12a2
Parents: e132b63
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Fri Jul 17 12:16:48 2015 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Fri Jul 17 12:16:48 2015 -0500

----------------------------------------------------------------------
 src/jiffy.erl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/32b89393/src/jiffy.erl
----------------------------------------------------------------------
diff --git a/src/jiffy.erl b/src/jiffy.erl
index 4ee2a9e..4c9577f 100644
--- a/src/jiffy.erl
+++ b/src/jiffy.erl
@@ -21,10 +21,16 @@
 -type json_array()  :: [json_value()].
 -type json_string() :: atom() | binary().
 -type json_number() :: integer() | float().
+
+-ifdef(JIFFY_NO_MAPS).
+
 -type json_object() :: {[{json_string(),json_value()}]}.
 
--ifndef(JIFFY_NO_MAPS).
--type #{json_string() => json_value()}.
+-else.
+
+-type json_object() :: {[{json_string(),json_value()}]}
+                        | #{json_string() => json_value()}.
+
 -endif.
 
 -type jiffy_decode_result() :: json_value()


Mime
View raw message