Merge branch 'develop' into feature/manual_lexer

This commit is contained in:
Niels Lohmann 2017-04-22 11:35:58 +02:00
commit 2a21146160
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
226 changed files with 341 additions and 234 deletions

View file

@ -1,4 +1,5 @@
#include <json.hpp> #include "json.hpp"
#include <iomanip> // for std::setw
using json = nlohmann::json; using json = nlohmann::json;
@ -29,7 +30,8 @@ int main()
j["new"]["key"]["value"] = {"another", "list"}; j["new"]["key"]["value"] = {"another", "list"};
// count elements // count elements
j["size"] = j.size(); auto s = j.size();
j["size"] = s;
// pretty print with indent of 4 spaces // pretty print with indent of 4 spaces
std::cout << std::setw(4) << j << '\n'; std::cout << std::setw(4) << j << '\n';

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/nv9fOg0XVVhWmFFy"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/Mi7u49cYwMR0cgTH"><b>online</b></a>

View file

@ -23,5 +23,5 @@
"value": 42.99 "value": 42.99
}, },
"pi": 3.141, "pi": 3.141,
"size": 9 "size": 8
} }

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/1fsm4gI55p83DOwU"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/dREyaxnVNgG1CAUx"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/8ldtT0NOhidn0fOA"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/rCEcfTCRY40LDvoR"><b>online</b></a>

View file

@ -1,3 +0,0 @@
"il brutto"
{"the bad":"il cattivo","the good":"il buono","the ugly":"il brutto"}
[json.exception.out_of_range.403] key 'the fast' not found

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/nfmFWMaJJHFJ7eVK"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/SIuocSXktJ2lxj0q"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/8UnQY256zGX2Lx6d"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/wB9tQWAyqeajJTVn"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/U1fv6LY7xZOAuSBs"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/s5MsN3WV6zsGcWY4"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/Fy2xBfZMols2DUQC"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/SXcTwaW8DVzDT34z"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/WxhV3mL9YX8FJonk"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/zOTLPM0c5dNFZhk3"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/CAv4NNr4D1FJhhUv"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/Sco4kIFMzpkYo37h"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
#include <deque> #include <deque>
#include <list> #include <list>
#include <forward_list> #include <forward_list>

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/VM7W2kpE7sIYJ5DW"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/n2KT4Yk3mzZXKnS5"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/oUU2X0pbZq7gawRB"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/gsHOHaLe3MfVhI2s"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/6Qfn12BDzb3vqO5p"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/zUmWzPFVFx6sEojX"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/iWYvmlA4qQmtvACX"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/1BjO38rdSmNGxpyn"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/iZzzxEpB7tbhz0cx"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/H0DDK6yuoCGZuoFw"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/CaDlatv1uXhQiu7o"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/nXd0SKQaR6tHukvy"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/9Tvfs2dJBW8m8ihA"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/AbLqRqEEN5N9W1Fj"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/IFZT4VL0oRotJBxl"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/ecx4xZQX7VXuhlAz"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/qdV5W2Lrljmjv4LG"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/bP03yg3IIbhARy2F"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/K4L4D6nibuGXbjfd"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/OY0l4CpfWuDJudyo"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/RMpEI2o935KgD2o2"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/zRdz49DwtK0gIJuc"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/0lW1WJ1ZP8g92Jp9"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/Q0QcnX1LAQT5k7IU"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/yarD6DyxYlIf8Ymg"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/ukuefRRIclE7D7IX"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/9oPbpnFNgKtKjB0O"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/nHLMXLRwA3QWSnsQ"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/wwsjMZP8U6bWhUil"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/WQS4WbZC6pX4qZE4"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/yv5TMrq9qREivvHf"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/mrJDlTQD3orHnAdF"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/GQz9A5y7HduQHVMw"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/XsC14rus4L6meQTg"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/Qom888gs2RM4wR4H"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/jr4aG41Zr1pWUlAw"><b>online</b></a>

View file

@ -1,4 +1,5 @@
#include <json.hpp> #include "json.hpp"
#include <iomanip> // for std::setw
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/hicmeOK39tBxaluM"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/KKfCy1yctyq7PBI1"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/rjYfsEq7v1RCHprk"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/jC8OLyTjE6EOcMZt"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/B6ILaoysGMliouEO"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/mvy0nMn3uStrP9tS"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/jdch45YEMX94DvlH"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/wvLvTvPt0dovixFE"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/rP64u8KqUJqB9lFd"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/g1mZBQAdSJE3cNCH"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/4Fbmy4IG012HmGKs"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/vp0L5nlCJewdlolt"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/W83LsQNBy5qCoABq"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/N0oo892iXEqaUzej"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/zGMngigiwwhsXEhB"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/SO3kgH5glqC18wJy"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/0eXbiM5KTPPXFkyP"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/wyOm5ERfxlXcwcSV"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/WXGKRKjzP22ggTEr"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/lxSvv5XGZ8Hmhnwl"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/Kk6nOpsa6KetydpZ"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/yqzasB01C3NGORaT"><b>online</b></a>

View file

@ -1,4 +1,5 @@
#include <json.hpp> #include "json.hpp"
#include <iomanip> // for std::setw
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/cdQa6jE0N2LyqFJe"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/qGLscdPoE6QH87oD"><b>online</b></a>

View file

@ -1,4 +1,5 @@
#include <json.hpp> #include "json.hpp"
#include <iomanip> // for std::setw
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/TDPaxmQ7PsvfWxrs"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/DUNMc8fjsGi5C7Ea"><b>online</b></a>

View file

@ -1,4 +1,5 @@
#include <json.hpp> #include "json.hpp"
#include <iomanip> // for std::setw
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/7vRGmLdVcYM7POhE"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/wSkYD6Q5RqJWmt3s"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/CUpMCzt6D9v3cYGM"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/fbTQdF5PwEeaC2lq"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/TRkhQoCdScWQqi3x"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/YwRJe95xb68JVjuI"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
#include <unordered_map> #include <unordered_map>
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/ksZAkIKQnYhJKLpN"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/FeK53w3zimBjOhtB"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/xYbUV0BmOfNtQcED"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/6DBW0AukFiY85CMq"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/lsl8Ex3d3SOYnKHu"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/868NoVK7iU0BZHKz"><b>online</b></a>

View file

@ -1,2 +0,0 @@
17 17
[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/ePN9gb4P3WTAiT6H"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/Af1lyC9TuTbIaNHy"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -1 +1 @@
<a target="_blank" href="http://melpon.org/wandbox/permlink/wnxritIWxpGS2SSt"><b>online</b></a> <a target="_blank" href="https://wandbox.org/permlink/J7tEcc5RiRckp3aH"><b>online</b></a>

View file

@ -1,4 +1,4 @@
#include <json.hpp> #include "json.hpp"
using json = nlohmann::json; using json = nlohmann::json;

Some files were not shown because too many files have changed in this diff Show more