Skip to content

Commit c5c8cb9

Browse files
committed
Move operators to value.hh
1 parent 10db538 commit c5c8cb9

File tree

4 files changed

+188
-211
lines changed

4 files changed

+188
-211
lines changed

include/tao/json.hh

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,34 @@
44
#ifndef TAOCPP_JSON_INCLUDE_JSON_HH
55
#define TAOCPP_JSON_INCLUDE_JSON_HH
66

7+
// DOM value
78
#include "json/value.hh"
8-
#include "json/comparison_operators.hh"
9-
#include "json/object_operators.hh"
109

10+
// SAX producers
11+
#include "json/sax/from_string.hh" // includes PEGTL header/grammar
12+
#include "json/sax/parse_file.hh" // includes PEGTL header/grammar
13+
#include "json/sax/traverse_value.hh" // DOM to SAX
14+
15+
// SAX consumers
1116
#include "json/sax/to_stream.hh"
1217
#include "json/sax/to_pretty_stream.hh"
13-
#include "json/sax/to_value.hh"
18+
#include "json/sax/to_value.hh" // SAX to DOM
19+
20+
// SAX debug consumer
21+
#include "json/sax/debug.hh"
22+
23+
// DOM producers
24+
#include "json/from_string.hh" // includes PEGTL header/grammar
25+
#include "json/parse_file.hh" // includes PEGTL header/grammar
26+
27+
// DOM writers
1428
#include "json/stream.hh"
1529
#include "json/to_string.hh"
1630

17-
#include "json/sax/traverse_value.hh"
18-
#include "json/sax/from_string.hh"
19-
#include "json/sax/parse_file.hh"
20-
#include "json/from_string.hh"
21-
#include "json/parse_file.hh"
22-
31+
// DOM support
2332
#include "json/self_contained.hh"
2433
#include "json/patch.hh"
34+
//#include "json/diff.hh"
35+
//#include "json/schema.hh"
2536

2637
#endif

include/tao/json/comparison_operators.hh

Lines changed: 0 additions & 159 deletions
This file was deleted.

include/tao/json/object_operators.hh

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)