Mercurial > mxe-octave

annotate src/rapidjson-1-prettywriter.patch @ 7183:eb3f7b3a457c default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge release to default
author John W. Eaton <jwe@octave.org>
date Mon, 29 Apr 2024 16:15:41 -0400
parents 15ad3e21dc17
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5537
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From ac0fc79c76fc92783d2a5267082a1f8f9c28df22 Mon Sep 17 00:00:00 2001
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: Gustav <sir.gustav.the.coder@gmail.com>
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Mon, 18 May 2020 14:06:39 +0200
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH] Fixes issue #1718
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 ---
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 include/rapidjson/writer.h | 4 ++--
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 1 file changed, 2 insertions(+), 2 deletions(-)
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 index e7fb873a4..51dd86d58 100644
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 --- a/include/rapidjson/writer.h
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 +++ b/include/rapidjson/writer.h
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 @@ -283,6 +283,8 @@ class Writer {
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 os_->Flush();
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 }
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 + static const size_t kDefaultLevelDepth = 32;
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 +
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 protected:
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 //! Information for each nested level
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 struct Level {
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 @@ -291,8 +293,6 @@ class Writer {
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 bool inArray; //!< true if in array, otherwise in object
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 };
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 - static const size_t kDefaultLevelDepth = 32;
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 -
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 bool WriteNull() {
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 PutReserve(*os_, 4);
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l'); return true;
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 From d88be8ef1649eca4602348d1aab5c16c36f83d4f Mon Sep 17 00:00:00 2001
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 From: Milo Yip <miloyip@gmail.com>
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 Date: Mon, 27 Mar 2017 14:05:03 +0800
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 Subject: [PATCH] Fix #905 unable to set writeFlags for PrettyWriter
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 ---
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 include/rapidjson/prettywriter.h | 2 +-
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 test/unittest/prettywritertest.cpp | 43 ++++++++++++++++++++++++++++++
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 2 files changed, 44 insertions(+), 1 deletion(-)
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 diff --git a/include/rapidjson/prettywriter.h b/include/rapidjson/prettywriter.h
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 index ef36a8c2a..98dfb3060 100644
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 --- a/include/rapidjson/prettywriter.h
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 +++ b/include/rapidjson/prettywriter.h
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 @@ -47,7 +47,7 @@ enum PrettyFormatOptions {
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 public:
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 - typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 + typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> Base;
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 typedef typename Base::Ch Ch;
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 //! Constructor
15ad3e21dc17 Add build rule for RapidJSON.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56