Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BFB2817864 for ; Sat, 25 Jul 2015 12:42:31 +0000 (UTC) Received: (qmail 47489 invoked by uid 500); 25 Jul 2015 12:42:31 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 47371 invoked by uid 500); 25 Jul 2015 12:42:31 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 46607 invoked by uid 99); 25 Jul 2015 12:42:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Jul 2015 12:42:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1003E6859; Sat, 25 Jul 2015 12:42:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Sat, 25 Jul 2015 12:42:44 -0000 Message-Id: <77920c49f26b47e184381c180a23f704@git.apache.org> In-Reply-To: <95b746ce527745f8b1ebc1ae1eb48bb8@git.apache.org> References: <95b746ce527745f8b1ebc1ae1eb48bb8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/19] jiffy commit: updated refs/heads/upstream to f661ee9 Strings can be atoms or binaries Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/f284a1b2 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/f284a1b2 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/f284a1b2 Branch: refs/heads/upstream Commit: f284a1b2b0799441665209a86ce14c1f0921d6ca Parents: a32a12f Author: Paul J. Davis Authored: Fri Jul 17 11:59:39 2015 -0500 Committer: Paul J. Davis Committed: Fri Jul 17 11:59:39 2015 -0500 ---------------------------------------------------------------------- src/jiffy.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/f284a1b2/src/jiffy.erl ---------------------------------------------------------------------- diff --git a/src/jiffy.erl b/src/jiffy.erl index 6fc0fa3..c987997 100644 --- a/src/jiffy.erl +++ b/src/jiffy.erl @@ -19,7 +19,7 @@ | json_array(). -type json_array() :: [json_value()]. --type json_string() :: binary(). +-type json_string() :: atom() | binary(). -type json_number() :: integer() | float(). -type json_object() :: {[{json_string(),json_value()}]}.