OctaForge
/
libcubescript
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

minor cleanups

master
Daniel Kolesa 2021-04-03 05:46:05 +02:00
parent 238e5a6ac5
commit ddb0799213
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/cubescript/cubescript.hh
View File

@ -41,29 +41,18 @@
namespace cubescript {
static_assert(std::is_integral_v<integer_type>, "integer_type must be integral");
static_assert(std::is_signed_v<integer_type>, "integer_type must be signed");
static_assert(std::is_floating_point_v<float_type>, "float_type must be floating point");
struct internal_error: std::runtime_error {
using std::runtime_error::runtime_error;
};
using alloc_func = void *(*)(void *, void *, size_t, size_t);
using alloc_func = void *(*)(void *, void *, size_t, size_t);
struct state;
struct ident;
struct any_value;
struct global_var;
using hook_func = callable<void, state &>;
using hook_func = callable<void, struct state &>;
using command_func = callable<
void, state &, std::span<any_value>, any_value &
void, struct state &, std::span<struct any_value>, struct any_value &
>;
struct internal_state;
struct thread_state;
struct ident_impl;
struct LIBCUBESCRIPT_EXPORT bcode_ref {
bcode_ref():
@ -132,6 +121,8 @@ enum class value_type {
NONE = 0, INT, FLOAT, STRING, CODE, IDENT
};
struct ident;
struct LIBCUBESCRIPT_EXPORT any_value {
any_value() = delete;
~any_value();
@ -244,7 +235,7 @@ protected:
friend struct state;
ident_impl *p_impl{};
struct ident_impl *p_impl{};
};
struct LIBCUBESCRIPT_EXPORT global_var: ident {
@ -304,6 +295,8 @@ enum class loop_state {
NORMAL = 0, BREAK, CONTINUE
};
struct thread_state;
struct LIBCUBESCRIPT_EXPORT state {
state();
state(alloc_func func, void *data);
@ -413,7 +406,7 @@ private:
LIBCUBESCRIPT_LOCAL state(internal_state *s);
ident *add_ident(ident *id, ident_impl *impl);
ident *add_ident(ident *id, struct ident_impl *impl);
void *alloc(void *ptr, size_t olds, size_t news);

18
include/cubescript/cubescript_conf.hh
View File

@ -1,6 +1,8 @@
#ifndef LIBCUBESCRIPT_CUBESCRIPT_CONF_HH
#define LIBCUBESCRIPT_CUBESCRIPT_CONF_HH
#include <type_traits>
namespace cubescript {
using integer_type = int;
using float_type = float;
@ -10,4 +12,20 @@ namespace cubescript {
constexpr auto const ROUND_FLOAT_FORMAT = "%.1f";
} /* namespace cubescript */
/* conf verification */
namespace cubescript {
static_assert(
std::is_integral_v<integer_type>, "integer_type must be integral"
);
static_assert(
std::is_signed_v<integer_type>, "integer_type must be signed"
);
static_assert(
std::is_floating_point_v<float_type>, "float_type must be floating point"
);
} /* namespace cubescript */
#endif /* LIBCUBESCRIPT_CUBESCRIPT_CONF_HH */