Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
畅游知识海洋
json
提交
328eb55d
J
json
项目概览
畅游知识海洋
/
json
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
json
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
328eb55d
编写于
12月 30, 2016
作者:
N
Niels Lohmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🚧
started working on #397
上级
f7575dee
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
163 addition
and
3 deletion
+163
-3
src/json.hpp
src/json.hpp
+60
-1
src/json.hpp.re2c
src/json.hpp.re2c
+60
-1
test/CMakeLists.txt
test/CMakeLists.txt
+1
-0
test/Makefile
test/Makefile
+2
-1
test/src/unit-version.cpp
test/src/unit-version.cpp
+40
-0
未找到文件。
src/json.hpp
浏览文件 @
328eb55d
...
...
@@ -282,6 +282,64 @@ class basic_json
return
allocator_type
();
}
/*!
@brief returns version information on the library
*/
static
basic_json
version
()
{
basic_json
result
;
result
[
"copyright"
]
=
"(C) 2013-2016 Niels Lohmann"
;
result
[
"name"
]
=
"JSON for Modern C++"
;
result
[
"url"
]
=
"https://github.com/nlohmann/json"
;
result
[
"version"
]
=
{
{
"string"
,
"2.0.10"
},
{
"major"
,
2
},
{
"minor"
,
0
},
{
"patch"
,
10
},
};
#ifdef _WIN32
result
[
"platform"
]
=
"win32"
;
#elif defined __linux__
result
[
"platform"
]
=
"linux"
;
#elif defined __APPLE__
result
[
"platform"
]
=
"apple"
;
#elif defined __unix__
result
[
"platform"
]
=
"unix"
;
#else
result
[
"platform"
]
=
"unknown"
;
#endif
#if defined(__clang__)
result
[
"compiler"
]
=
{{
"family"
,
"clang"
},
{
"version"
,
CLANG_VERSION
}};
#elif defined(__ICC) || defined(__INTEL_COMPILER)
result
[
"compiler"
]
=
{{
"family"
,
"icc"
},
{
"version"
,
__INTEL_COMPILER
}};
#elif defined(__GNUC__) || defined(__GNUG__)
result
[
"compiler"
]
=
{{
"family"
,
"gcc"
},
{
"version"
,
GCC_VERSION
}};
#elif defined(__HP_cc) || defined(__HP_aCC)
result
[
"compiler"
]
=
"hp"
#elif defined(__IBMCPP__)
result
[
"compiler"
]
=
{{
"family"
,
"ilecpp"
},
{
"version"
,
__IBMCPP__
}};
#elif defined(_MSC_VER)
result
[
"compiler"
]
=
{{
"family"
,
"msvc"
},
{
"version"
,
_MSC_VER
}};
#elif defined(__PGI)
result
[
"compiler"
]
=
{{
"family"
,
"pgcpp"
},
{
"version"
,
__PGI
}};
#elif defined(__SUNPRO_CC)
result
[
"compiler"
]
=
{{
"family"
,
"sunpro"
},
{
"version"
,
__SUNPRO_CC
}};
#else
result
[
"compiler"
]
=
{{
"family"
,
"unknown"
},
{
"version"
,
"unknown"
}};
#endif
#ifdef __cplusplus
result
[
"compiler"
][
"c++"
]
=
std
::
to_string
(
__cplusplus
);
#else
result
[
"compiler"
][
"c++"
]
=
"unknown"
;
#endif
return
result
;
}
///////////////////////////
// JSON value data types //
...
...
@@ -882,7 +940,8 @@ class basic_json
{
if
(
t
==
value_t
::
null
)
{
throw
std
::
domain_error
(
"961c151d2e87f2686a955a9be24d316f1362bf21"
);
// echo "JSON for Modern C++" | sha1sum
throw
std
::
domain_error
(
"961c151d2e87f2686a955a9be24d316f1362bf21 2.0.10"
);
}
break
;
}
...
...
src/json.hpp.re2c
浏览文件 @
328eb55d
...
...
@@ -282,6 +282,64 @@ class basic_json
return allocator_type();
}
/*!
@brief returns version information on the library
*/
static basic_json version()
{
basic_json result;
result["copyright"] = "(C) 2013-2016 Niels Lohmann";
result["name"] = "JSON for Modern C++";
result["url"] = "https://github.com/nlohmann/json";
result["version"] =
{
{"string", "2.0.10"},
{"major", 2},
{"minor", 0},
{"patch", 10},
};
#ifdef _WIN32
result["platform"] = "win32";
#elif defined __linux__
result["platform"] = "linux";
#elif defined __APPLE__
result["platform"] = "apple";
#elif defined __unix__
result["platform"] = "unix";
#else
result["platform"] = "unknown";
#endif
#if defined(__clang__)
result["compiler"] = {{"family", "clang"}, {"version", CLANG_VERSION}};
#elif defined(__ICC) || defined(__INTEL_COMPILER)
result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
#elif defined(__GNUC__) || defined(__GNUG__)
result["compiler"] = {{"family", "gcc"}, {"version", GCC_VERSION}};
#elif defined(__HP_cc) || defined(__HP_aCC)
result["compiler"] = "hp"
#elif defined(__IBMCPP__)
result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
#elif defined(_MSC_VER)
result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
#elif defined(__PGI)
result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
#elif defined(__SUNPRO_CC)
result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
#else
result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
#endif
#ifdef __cplusplus
result["compiler"]["c++"] = std::to_string(__cplusplus);
#else
result["compiler"]["c++"] = "unknown";
#endif
return result;
}
///////////////////////////
// JSON value data types //
...
...
@@ -882,7 +940,8 @@ class basic_json
{
if (t == value_t::null)
{
throw std::domain_error("961c151d2e87f2686a955a9be24d316f1362bf21");
// echo "JSON for Modern C++" | sha1sum
throw std::domain_error("961c151d2e87f2686a955a9be24d316f1362bf21 2.0.10");
}
break;
}
...
...
test/CMakeLists.txt
浏览文件 @
328eb55d
...
...
@@ -35,6 +35,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
"src/unit-serialization.cpp"
"src/unit-testsuites.cpp"
"src/unit-unicode.cpp"
"src/unit-version.cpp"
)
set_target_properties
(
${
JSON_UNITTEST_TARGET_NAME
}
PROPERTIES
...
...
test/Makefile
浏览文件 @
328eb55d
...
...
@@ -37,8 +37,9 @@ SOURCES = src/unit.cpp \
src/unit-reference_access.cpp
\
src/unit-regression.cpp
\
src/unit-serialization.cpp
\
src/unit-testsuites.cpp
\
src/unit-unicode.cpp
\
src/unit-
testsuites
.cpp
src/unit-
version
.cpp
OBJECTS
=
$(SOURCES:.cpp=.o)
...
...
test/src/unit-version.cpp
0 → 100644
浏览文件 @
328eb55d
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.9
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
Copyright (c) 2013-2016 Niels Lohmann <http://nlohmann.me>.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include "catch.hpp"
#include "json.hpp"
using
nlohmann
::
json
;
TEST_CASE
(
"version information"
)
{
SECTION
(
"version()"
)
{
CHECK
(
json
::
version
()[
"name"
]
==
"JSON for Modern C++"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录