added more features from master branch

Doxyfile

@@ -0,0 +1,314 @@
+# Doxyfile 1.8.9.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = "JSON for Modern C++"
+PROJECT_NUMBER         = 3.0
+PROJECT_BRIEF          = 
+PROJECT_LOGO           =
+OUTPUT_DIRECTORY       = .
+CREATE_SUBDIRS         = NO
+ALLOW_UNICODE_NAMES    = NO
+OUTPUT_LANGUAGE        = English
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       =
+ALWAYS_DETAILED_SEC    = YES
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 4
+ALIASES                =
+TCL_SUBST              =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+AUTOLINK_SUPPORT       = YES
+BUILTIN_STL_SUPPORT    = YES
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
+TYPEDEF_HIDES_STRUCT   = NO
+LOOKUP_CACHE_SIZE      = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_PACKAGE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = YES
+EXTRACT_ANON_NSPACES   = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = NO
+HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
+SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = YES
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           =
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = src/json.hpp
+INPUT_ENCODING         = UTF-8
+FILE_PATTERNS          =
+RECURSIVE              = NO
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = YES
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          =
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_TIMESTAMP         = YES
+HTML_DYNAMIC_SECTIONS  = NO
+HTML_INDEX_NUM_ENTRIES = 100
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
+DISABLE_INDEX          = NO
+GENERATE_TREEVIEW      = YES
+ENUM_VALUES_PER_LINE   = 4
+TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = YES
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
+LATEX_BIB_STYLE        = plain
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+RTF_SOURCE_CODE        = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_SUBDIR             =
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+MSCGEN_PATH            =
+DIA_PATH               =
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = YES
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           = Helvetica
+DOT_FONTSIZE           = 10
+DOT_FONTPATH           =
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = YES
+UML_LIMIT_NUM_FIELDS   = 10
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = YES
+CALLER_GRAPH           = YES
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = svg
+INTERACTIVE_SVG        = YES
+DOT_PATH               =
+DOTFILE_DIRS           =
+MSCFILE_DIRS           =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_INCLUDE_PATH  =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES

src/json.hpp.re2c

@@ -196,25 +196,25 @@ class basic_json
 
             case (value_t::string):
             {
-                m_value.string = new string_t();
+                m_value.string = new string_t("");
                 break;
             }
 
             case (value_t::boolean):
             {
-                m_value.boolean = boolean_t();
+                m_value.boolean = boolean_t(false);
                 break;
             }
 
             case (value_t::number_integer):
             {
-                m_value.number_integer = number_integer_t();
+                m_value.number_integer = number_integer_t(0);
                 break;
             }
 
             case (value_t::number_float):
             {
-                m_value.number_float = number_float_t();
+                m_value.number_float = number_float_t(0.0);
                 break;
             }
         }
@@ -315,6 +315,7 @@ class basic_json
         : m_type(value_t::number_float), m_value(number_float_t(value))
     {}
 
+    /// create a container (array or object) from an initializer list
     inline basic_json(list_init_t l, bool type_deduction = true, value_t manual_type = value_t::array)
     {
         // the initializer list could describe an object
@@ -372,11 +373,13 @@ class basic_json
         }
     }
 
+    /// explicitly create an array from an initializer list
     inline static basic_json array(list_init_t l = list_init_t())
     {
         return basic_json(l, false, value_t::array);
     }
 
+    /// explicitly create an object from an initializer list
     inline static basic_json object(list_init_t l = list_init_t())
     {
         return basic_json(l, false, value_t::object);
@@ -733,6 +736,33 @@ class basic_json
     }
 
 
+    /// find an element in an object
+    inline iterator find(typename object_t::key_type key)
+    {
+        auto result = end();
+
+        if (m_type == value_t::object)
+        {
+            result.m_it.object_iterator = m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// find an element in an object
+    inline const_iterator find(typename object_t::key_type key) const
+    {
+        auto result = cend();
+
+        if (m_type == value_t::object)
+        {
+            result.m_it.object_iterator = m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+
     ///////////////
     // iterators //
     ///////////////
@@ -799,22 +829,20 @@ class basic_json
             {
                 return true;
             }
-            case (value_t::number_integer):
+
-            case (value_t::number_float):
-            case (value_t::boolean):
-            case (value_t::string):
-            {
-                return false;
-            }
             case (value_t::array):
             {
                 return m_value.array->empty();
             }
+
             case (value_t::object):
             {
                 return m_value.object->empty();
             }
         }
+
+        // all other types are nonempty
+        return false;
     }
 
     /// returns the number of elements
@@ -826,22 +854,20 @@ class basic_json
             {
                 return 0;
             }
-            case (value_t::number_integer):
+
-            case (value_t::number_float):
-            case (value_t::boolean):
-            case (value_t::string):
-            {
-                return 1;
-            }
             case (value_t::array):
             {
                 return m_value.array->size();
             }
+
             case (value_t::object):
             {
                 return m_value.object->size();
             }
         }
+
+        // all other types have size 1
+        return 1;
     }
 
     /// returns the maximum possible number of elements
@@ -853,22 +879,20 @@ class basic_json
             {
                 return 0;
             }
-            case (value_t::number_integer):
+
-            case (value_t::number_float):
-            case (value_t::boolean):
-            case (value_t::string):
-            {
-                return 1;
-            }
             case (value_t::array):
             {
                 return m_value.array->max_size();
             }
+
             case (value_t::object):
             {
                 return m_value.object->max_size();
             }
         }
+
+        // all other types have max_size 1
+        return 1;
     }
 
 
@@ -887,17 +911,17 @@ class basic_json
             }
             case (value_t::number_integer):
             {
-                m_value.number_integer = {};
+                m_value.number_integer = 0;
                 break;
             }
             case (value_t::number_float):
             {
-                m_value.number_float = {};
+                m_value.number_float = 0.0;
                 break;
             }
             case (value_t::boolean):
             {
-                m_value.boolean = {};
+                m_value.boolean = false;
                 break;
             }
             case (value_t::string):
@@ -1573,6 +1597,7 @@ class basic_json
     /// the value of the current element
     json_value m_value = {};
 
+
   public:
     ///////////////
     // iterators //
@@ -1601,7 +1626,9 @@ class basic_json
             /// the iterator points to the only value
             begin,
             /// the iterator points past the only value
-            end
+            end,
+            /// the iterator points to an invalid value
+            invalid
         };
 
         /// an iterator value
@@ -1674,6 +1701,7 @@ class basic_json
 
                 case (basic_json::value_t::null):
                 {
+                    // set to end so begin()==end() is true: null is empty
                     m_it.generic_iterator = generic_iterator_value::end;
                     break;
                 }
@@ -1794,8 +1822,15 @@ class basic_json
                 }
 
                 default:
+                {
+                    if (m_it.generic_iterator == generic_iterator_value::begin)
                     {
                         m_it.generic_iterator = generic_iterator_value::end;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -1821,8 +1856,15 @@ class basic_json
                 }
 
                 default:
+                {
+                    if (m_it.generic_iterator == generic_iterator_value::begin)
                     {
                         m_it.generic_iterator = generic_iterator_value::end;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -1849,9 +1891,22 @@ class basic_json
                     break;
                 }
 
+                case (basic_json::value_t::null):
+                {
+                    m_it.generic_iterator = generic_iterator_value::invalid;
+                    break;
+                }
+
                 default:
                 {
-                    m_it.generic_iterator = generic_iterator_value::uninitialized;
+                    if (m_it.generic_iterator == generic_iterator_value::end)
+                    {
+                        m_it.generic_iterator = generic_iterator_value::begin;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -1876,9 +1931,22 @@ class basic_json
                     break;
                 }
 
+                case (basic_json::value_t::null):
+                {
+                    m_it.generic_iterator = generic_iterator_value::invalid;
+                    break;
+                }
+
                 default:
                 {
-                    m_it.generic_iterator = generic_iterator_value::uninitialized;
+                    if (m_it.generic_iterator == generic_iterator_value::end)
+                    {
+                        m_it.generic_iterator = generic_iterator_value::begin;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -1949,7 +2017,9 @@ class basic_json
             /// the iterator points to the only value
             begin,
             /// the iterator points past the only value
-            end
+            end,
+            /// the iterator points to an invalid value
+            invalid
         };
 
         /// an iterator value
@@ -1995,6 +2065,7 @@ class basic_json
             }
         }
 
+        /// copy constructor given a nonconst iterator
         inline const_iterator(const iterator& other) : m_object(other.m_object), m_it(other.m_it)
         {}
 
@@ -2025,6 +2096,7 @@ class basic_json
 
                 case (basic_json::value_t::null):
                 {
+                    // set to end so begin()==end() is true: null is empty
                     m_it.generic_iterator = generic_iterator_value::end;
                     break;
                 }
@@ -2145,8 +2217,15 @@ class basic_json
                 }
 
                 default:
+                {
+                    if (m_it.generic_iterator == generic_iterator_value::begin)
                     {
                         m_it.generic_iterator = generic_iterator_value::end;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -2172,8 +2251,15 @@ class basic_json
                 }
 
                 default:
+                {
+                    if (m_it.generic_iterator == generic_iterator_value::begin)
                     {
                         m_it.generic_iterator = generic_iterator_value::end;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -2200,9 +2286,22 @@ class basic_json
                     break;
                 }
 
+                case (basic_json::value_t::null):
+                {
+                    m_it.generic_iterator = generic_iterator_value::invalid;
+                    break;
+                }
+
                 default:
                 {
-                    m_it.generic_iterator = generic_iterator_value::uninitialized;
+                    if (m_it.generic_iterator == generic_iterator_value::end)
+                    {
+                        m_it.generic_iterator = generic_iterator_value::begin;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -2227,9 +2326,22 @@ class basic_json
                     break;
                 }
 
+                case (basic_json::value_t::null):
+                {
+                    m_it.generic_iterator = generic_iterator_value::invalid;
+                    break;
+                }
+
                 default:
                 {
-                    m_it.generic_iterator = generic_iterator_value::uninitialized;
+                    if (m_it.generic_iterator == generic_iterator_value::end)
+                    {
+                        m_it.generic_iterator = generic_iterator_value::begin;
+                    }
+                    else
+                    {
+                        m_it.generic_iterator = generic_iterator_value::invalid;
+                    }
                     break;
                 }
             }
@@ -2277,6 +2389,7 @@ class basic_json
         internal_const_iterator m_it;
     };
 
+
   private:
     ////////////
     // parser //
@@ -2670,6 +2783,7 @@ inline void swap(nlohmann::json& j1,
 template <>
 struct hash<nlohmann::json>
 {
+    /// return a hash value for a JSON object
     size_t operator()(const nlohmann::json& j) const
     {
         // a naive hashing via the string representation

test/unit.cpp

@@ -72,6 +72,13 @@ TEST_CASE()
         std::cerr << j.dump(4) << std::endl;
         j["pi"] = {3, 1, 4, 1};
         std::cerr << j << std::endl;
+
+        const json jc(j);
+        CHECK(j.find("name") != j.end());
+        CHECK(j.find("foo") == j.end());
+        CHECK(*(j.find("name")) == json("Niels") );
+        CHECK(jc.find("name") != jc.end());
+        CHECK(jc.find("foo") == jc.end());
     }
     {
         // ways to express the empty array []