MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-02 13:48:53 +02:00
Code Issues Releases Wiki Activity

ircd::json: Move property.h into tuple/ dir.

Browse source
This commit is contained in:
Jason Volk 2018-01-31 19:06:31 -08:00
parent 8296adb6c3
commit e3f671a523
4 changed files with 63 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/json/json.h
View file

@ -72,7 +72,6 @@ struct ircd::json::strung
#include "vector.h"
#include "value.h"
#include "member.h"
#include "property.h"
#include "iov.h"
#include "tuple/tuple.h"

72
include/ircd/json/property.h
View file

@ -1,72 +0,0 @@
/*
* Copyright (C) 2017 Charybdis Development Team
* Copyright (C) 2017 Jason Volk <jason@zemos.net>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice is present in all copies.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#define HAVE_IRCD_JSON_PROPERTY_H
namespace ircd::json
{
template<const char *const &name, class value_type> struct property;
}
/// The property template specifies a key/value member of a json::tuple
///
///
template<const char *const &name,
class T>
struct ircd::json::property
{
using key_type = const char *const &;
using value_type = T;
static constexpr auto &key
{
name
};
T value;
operator const T &() const;
operator T &();
property(T&& value)
:value{value}
{}
property() = default;
};
template<const char *const &name,
class T>
ircd::json::property<name, T>::operator
T &()
{
return value;
}
template<const char *const &name,
class T>
ircd::json::property<name, T>::operator
const T &()
const
{
return value;
}

61
include/ircd/json/tuple/property.h Normal file
View file

@ -0,0 +1,61 @@
// Matrix Construct
//
// Copyright (C) Matrix Construct Developers, Authors & Contributors
// Copyright (C) 2016-2018 Jason Volk <jason@zemos.net>
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file.
#pragma once
#define HAVE_IRCD_JSON_PROPERTY_H
namespace ircd::json
{
template<const char *const &name, class value_type> struct property;
}
/// The property template specifies a key/value member of a json::tuple
///
///
template<const char *const &name,
class T>
struct ircd::json::property
{
using key_type = const char *const &;
using value_type = T;
static constexpr auto &key
{
name
};
T value;
operator const T &() const;
operator T &();
property(T&& value)
:value{value}
{}
property() = default;
};
template<const char *const &name,
class T>
ircd::json::property<name, T>::operator
T &()
{
return value;
}
template<const char *const &name,
class T>
ircd::json::property<name, T>::operator
const T &()
const
{
return value;
}

2
include/ircd/json/tuple/tuple.h
View file

@ -11,6 +11,8 @@
#pragma once
#define HAVE_IRCD_JSON_TUPLE_H
#include "property.h"
namespace ircd {
namespace json {