Skip to content

Commit ab62f69

Browse files
committed
Doc updates
1 parent 246c579 commit ab62f69

20 files changed

+177
-177
lines changed

README.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -908,13 +908,13 @@ <h3>csv</h3>
908908
{
909909
std::ifstream <span class="pl-smi">is</span>(<span class="pl-s"><span class="pl-pds">"</span>input/tasks.csv<span class="pl-pds">"</span></span>);
910910

911-
json_decoder&lt;json&gt; encoder;
911+
json_decoder&lt;json&gt; decoder;
912912
csv_parameters params;
913913
params.<span class="pl-c1">assume_header</span>(<span class="pl-c1">true</span>)
914914
.<span class="pl-c1">trim</span>(<span class="pl-c1">true</span>)
915915
.<span class="pl-c1">ignore_empty_values</span>(<span class="pl-c1">true</span>)
916916
.<span class="pl-c1">column_types</span>({<span class="pl-s"><span class="pl-pds">"</span>integer<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>string<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>string<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>string<span class="pl-pds">"</span></span>});
917-
csv_reader <span class="pl-smi">reader</span>(is,encoder,params);
917+
csv_reader <span class="pl-smi">reader</span>(is,decoder,params);
918918
reader.<span class="pl-c1">read</span>();
919919
ojson tasks = encoder.<span class="pl-c1">get_result</span>();
920920

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,13 @@ int main()
445445
{
446446
std::ifstream is("input/tasks.csv");
447447

448-
json_decoder<json> encoder;
448+
json_decoder<json> decoder;
449449
csv_parameters params;
450450
params.assume_header(true)
451451
.trim(true)
452452
.ignore_empty_values(true)
453453
.column_types({"integer","string","string","string"});
454-
csv_reader reader(is,encoder,params);
454+
csv_reader reader(is,decoder,params);
455455
reader.read();
456456
ojson tasks = encoder.get_result();
457457

doc/html/csv_reader

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,9 @@ WLF,WALLIS &amp; FUTUNA ISLANDS
563563
<div class="highlight highlight-source-c++"><pre>std::string in_file = <span class="pl-s"><span class="pl-pds">"</span>countries.csv<span class="pl-pds">"</span></span>;
564564
std::ifstream <span class="pl-en">is</span>(in_file);
565565

566-
json_decoder&lt;json&gt; encoder;
566+
json_decoder&lt;json&gt; decoder;
567567

568-
csv_reader <span class="pl-en">reader</span>(is,encoder);
568+
csv_reader <span class="pl-en">reader</span>(is,decoder);
569569
reader.read();
570570
json countries = encoder.get_result();
571571

@@ -605,12 +605,12 @@ Dependable, trustworthy"
605605
<div class="highlight highlight-source-c++"><pre>std::string in_file = <span class="pl-s"><span class="pl-pds">"</span>employees.txt<span class="pl-pds">"</span></span>;
606606
std::ifstream <span class="pl-en">is</span>(in_file);
607607

608-
json_decoder&lt;json&gt; encoder;
608+
json_decoder&lt;json&gt; decoder;
609609
csv_parameters params;
610610
params.field_delimiter = <span class="pl-s"><span class="pl-pds">'</span><span class="pl-cce">\t</span><span class="pl-pds">'</span></span>
611611
.assume_header = <span class="pl-c1">true</span>;
612612

613-
csv_reader <span class="pl-en">reader</span>(is,encoder,params);
613+
csv_reader <span class="pl-en">reader</span>(is,decoder,params);
614614
reader.read();
615615
json employees = encoder.get_result();
616616

@@ -662,13 +662,13 @@ std::cout &lt;&lt; pretty_print(employees) &lt;&lt; std::endl;</pre></div>
662662
<div class="highlight highlight-source-c++"><pre>std::string in_file = <span class="pl-s"><span class="pl-pds">"</span>countries.csv<span class="pl-pds">"</span></span>;
663663
std::ifstream <span class="pl-en">is</span>(in_file);
664664

665-
json_decoder&lt;json&gt; encoder;
665+
json_decoder&lt;json&gt; decoder;
666666

667667
csv_parameters params;
668668
params.column_names({<span class="pl-s"><span class="pl-pds">"</span>Country Code<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>Name<span class="pl-pds">"</span></span>})
669669
.header_lines(<span class="pl-c1">1</span>);
670670

671-
csv_reader <span class="pl-en">reader</span>(is,encoder,params);
671+
csv_reader <span class="pl-en">reader</span>(is,decoder,params);
672672
reader.read();
673673
json countries = encoder.get_result();
674674

doc/html/csv_serializer

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,8 @@ You must ensure that the output stream exists as long as does <code>csv_serializ
525525
<div class="highlight highlight-source-c++"><pre>std::string in_file = <span class="pl-s"><span class="pl-pds">"</span>input/countries.json<span class="pl-pds">"</span></span>;
526526
std::ifstream <span class="pl-en">is</span>(in_file);
527527

528-
json_decoder&lt;json&gt; encoder;
529-
json_reader <span class="pl-en">reader</span>(is,encoder);
528+
json_decoder&lt;json&gt; decoder;
529+
json_reader <span class="pl-en">reader</span>(is,decoder);
530530
reader.read();
531531
json countries = encoder.get_result();
532532

@@ -590,11 +590,11 @@ WLF,WALLIS &amp; FUTUNA ISLANDS
590590
<div class="highlight highlight-source-c++"><pre>std::string in_file = <span class="pl-s"><span class="pl-pds">"</span>input/employees.json<span class="pl-pds">"</span></span>;
591591
std::ifstream <span class="pl-en">is</span>(in_file);
592592

593-
json_decoder&lt;json&gt; encoder;
593+
json_decoder&lt;json&gt; decoder;
594594
csv_parameters params;
595595
params.field_delimiter = <span class="pl-s"><span class="pl-pds">'</span><span class="pl-cce">\t</span><span class="pl-pds">'</span></span>;
596596

597-
json_reader <span class="pl-en">reader</span>(is,encoder);
597+
json_reader <span class="pl-en">reader</span>(is,decoder);
598598
reader.read();
599599
json employees = encoder.get_result();
600600

doc/html/json_reader

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,8 @@ size_t max_nesting_depth() const
568568
<span class="pl-k">throw</span> <span class="pl-smi">std::runtime_error</span>(<span class="pl-s"><span class="pl-pds">"</span>Cannot open file<span class="pl-pds">"</span></span>);
569569
}
570570

571-
json_decoder&lt;json&gt; encoder;
572-
json_reader <span class="pl-en">reader</span>(is,encoder);
571+
json_decoder&lt;json&gt; decoder;
572+
json_reader <span class="pl-en">reader</span>(is,decoder);
573573

574574
<span class="pl-k">while</span> (!reader.eof())
575575
{

doc/html/jsoncons.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -793,15 +793,15 @@ <h3>Converting CSV files to json<a name="ConvertingCSVfilestojson"></a>
793793

794794
std::fstream <span class="pl-en">is</span>(<span class="pl-s"><span class="pl-pds">"</span>tasks.csv<span class="pl-pds">"</span></span>);
795795

796-
json_decoder&lt;json&gt; encoder;
796+
json_decoder&lt;json&gt; decoder;
797797

798798
csv_parameters params;
799799
params.assume_header(<span class="pl-c1">true</span>)
800800
.trim(<span class="pl-c1">true</span>)
801801
.ignore_empty_values(<span class="pl-c1">true</span>)
802802
.column_types({<span class="pl-s"><span class="pl-pds">"</span>integer<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>string<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>string<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>string<span class="pl-pds">"</span></span>});
803803

804-
csv_reader <span class="pl-en">reader</span>(is,encoder,params);
804+
csv_reader <span class="pl-en">reader</span>(is,decoder,params);
805805
reader.read();
806806
json val = encoder.get_result();
807807

doc/md/Classes/csv_reader.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ Note
7979
std::string in_file = "countries.csv";
8080
std::ifstream is(in_file);
8181

82-
json_decoder<json> encoder;
82+
json_decoder<json> decoder;
8383

84-
csv_reader reader(is,encoder);
84+
csv_reader reader(is,decoder);
8585
reader.read();
8686
json countries = encoder.get_result();
8787

@@ -118,12 +118,12 @@ Note
118118
std::string in_file = "employees.txt";
119119
std::ifstream is(in_file);
120120

121-
json_decoder<json> encoder;
121+
json_decoder<json> decoder;
122122
csv_parameters params;
123123
params.field_delimiter = '\t'
124124
.assume_header = true;
125125

126-
csv_reader reader(is,encoder,params);
126+
csv_reader reader(is,decoder,params);
127127
reader.read();
128128
json employees = encoder.get_result();
129129

@@ -176,13 +176,13 @@ Note
176176
std::string in_file = "countries.csv";
177177
std::ifstream is(in_file);
178178

179-
json_decoder<json> encoder;
179+
json_decoder<json> decoder;
180180

181181
csv_parameters params;
182182
params.column_names({"Country Code","Name"})
183183
.header_lines(1);
184184

185-
csv_reader reader(is,encoder,params);
185+
csv_reader reader(is,decoder,params);
186186
reader.read();
187187
json countries = encoder.get_result();
188188

doc/md/Classes/csv_serializer.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ Note
5050
std::string in_file = "input/countries.json";
5151
std::ifstream is(in_file);
5252

53-
json_decoder<json> encoder;
54-
json_reader reader(is,encoder);
53+
json_decoder<json> decoder;
54+
json_reader reader(is,decoder);
5555
reader.read();
5656
json countries = encoder.get_result();
5757

@@ -112,11 +112,11 @@ Note
112112
std::string in_file = "input/employees.json";
113113
std::ifstream is(in_file);
114114

115-
json_decoder<json> encoder;
115+
json_decoder<json> decoder;
116116
csv_parameters params;
117117
params.field_delimiter = '\t';
118118

119-
json_reader reader(is,encoder);
119+
json_reader reader(is,decoder);
120120
reader.read();
121121
json employees = encoder.get_result();
122122

doc/md/Classes/json_reader.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ if (!is.is_open())
7979
throw std::runtime_error("Cannot open file");
8080
}
8181

82-
json_decoder<json> encoder;
83-
json_reader reader(is,encoder);
82+
json_decoder<json> decoder;
83+
json_reader reader(is,decoder);
8484

8585
while (!reader.eof())
8686
{

doc/md/Pages/jsoncons.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,15 +327,15 @@ using jsoncons::json_decoder;
327327

328328
std::fstream is("tasks.csv");
329329

330-
json_decoder<json> encoder;
330+
json_decoder<json> decoder;
331331

332332
csv_parameters params;
333333
params.assume_header(true)
334334
.trim(true)
335335
.ignore_empty_values(true)
336336
.column_types({"integer","string","string","string"});
337337

338-
csv_reader reader(is,encoder,params);
338+
csv_reader reader(is,decoder,params);
339339
reader.read();
340340
json val = encoder.get_result();
341341

0 commit comments

Comments
 (0)