mirror of
https://github.com/hyprwm/hyprlang.git
synced 2024-11-16 18:25:57 +01:00
internal: move public stuff to include/hyprlang.hpp
This commit is contained in:
parent
d6bb511810
commit
8d538588ff
2 changed files with 179 additions and 182 deletions
|
@ -3,8 +3,184 @@
|
|||
#ifndef HYPRLANG_HPP
|
||||
#define HYPRLANG_HPP
|
||||
|
||||
#include "../src/public.hpp"
|
||||
#include <any>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
|
||||
namespace Hyprlang {};
|
||||
class CConfigImpl;
|
||||
|
||||
namespace Hyprlang {
|
||||
|
||||
/* types */
|
||||
struct SVector2D {
|
||||
float x = 0, y = 0;
|
||||
|
||||
//
|
||||
bool operator==(const SVector2D& rhs) const {
|
||||
return x == rhs.x && y == rhs.y;
|
||||
}
|
||||
|
||||
friend std::ostream& operator<<(std::ostream& os, const SVector2D& rhs) {
|
||||
return os << "[" << rhs.x << ", " << rhs.y << "]";
|
||||
}
|
||||
};
|
||||
|
||||
class CParseResult {
|
||||
public:
|
||||
bool error = false;
|
||||
/* Get this ParseResult's error string.
|
||||
Pointer valid until the error string is changed or this
|
||||
object gets destroyed. */
|
||||
const char* getError() const {
|
||||
return errorString;
|
||||
}
|
||||
/* Set an error contained by this ParseResult.
|
||||
Creates a copy of the string, does not take ownership. */
|
||||
void setError(const char* err);
|
||||
|
||||
private:
|
||||
void setError(const std::string& err);
|
||||
|
||||
std::string errorStdString = "";
|
||||
const char* errorString = nullptr;
|
||||
|
||||
friend class CConfig;
|
||||
};
|
||||
|
||||
/* Generic struct for options for handlers */
|
||||
struct SHandlerOptions {
|
||||
bool allowFlags = false;
|
||||
};
|
||||
|
||||
/* Generic struct for options for special categories */
|
||||
struct SSpecialCategoryOptions {
|
||||
/* a key is the name of a value that will be the identifier of a special category
|
||||
can be left null for no key, aka a generic one
|
||||
keys are always strings. Default key value is "0" */
|
||||
const char* key = nullptr;
|
||||
|
||||
/* don't pop up an error if the config value is missing */
|
||||
bool ignoreMissing = false;
|
||||
};
|
||||
|
||||
/* typedefs */
|
||||
typedef CParseResult (*PCONFIGHANDLERFUNC)(const char* COMMAND, const char* VALUE);
|
||||
|
||||
struct SConfigValueImpl;
|
||||
/* Container for a config value */
|
||||
class CConfigValue {
|
||||
public:
|
||||
CConfigValue();
|
||||
CConfigValue(const int64_t value);
|
||||
CConfigValue(const float value);
|
||||
CConfigValue(const char* value);
|
||||
CConfigValue(const SVector2D value);
|
||||
CConfigValue(const CConfigValue&);
|
||||
CConfigValue(CConfigValue&&);
|
||||
void operator=(const CConfigValue&);
|
||||
~CConfigValue();
|
||||
|
||||
void* dataPtr() const;
|
||||
std::any getValue() const {
|
||||
switch (m_eType) {
|
||||
case CONFIGDATATYPE_EMPTY: throw;
|
||||
case CONFIGDATATYPE_INT: return std::any(*reinterpret_cast<int64_t*>(m_pData));
|
||||
case CONFIGDATATYPE_FLOAT: return std::any(*reinterpret_cast<float*>(m_pData));
|
||||
case CONFIGDATATYPE_STR: return std::any(reinterpret_cast<const char*>(m_pData));
|
||||
case CONFIGDATATYPE_VEC2: return std::any(*reinterpret_cast<SVector2D*>(m_pData));
|
||||
default: throw;
|
||||
}
|
||||
return {}; // unreachable
|
||||
}
|
||||
|
||||
private:
|
||||
enum eDataType {
|
||||
CONFIGDATATYPE_EMPTY,
|
||||
CONFIGDATATYPE_INT,
|
||||
CONFIGDATATYPE_FLOAT,
|
||||
CONFIGDATATYPE_STR,
|
||||
CONFIGDATATYPE_VEC2,
|
||||
};
|
||||
eDataType m_eType = eDataType::CONFIGDATATYPE_EMPTY;
|
||||
void* m_pData = nullptr;
|
||||
|
||||
friend class CConfig;
|
||||
};
|
||||
|
||||
/* Base class for a config file */
|
||||
class CConfig {
|
||||
public:
|
||||
CConfig(const char* configPath);
|
||||
~CConfig();
|
||||
|
||||
/* Add a config value, for example myCategory:myValue.
|
||||
This has to be done before commence()
|
||||
Value provided becomes default */
|
||||
void addConfigValue(const char* name, const CConfigValue value);
|
||||
|
||||
/* Register a handler. Can be called anytime, though not recommended
|
||||
to do this dynamically */
|
||||
void registerHandler(PCONFIGHANDLERFUNC func, const char* name, SHandlerOptions options);
|
||||
|
||||
/* Commence the config state. Config becomes immutable, as in
|
||||
no new values may be added or removed. Required for parsing. */
|
||||
void commence();
|
||||
|
||||
/* Add a special category. Can be done dynamically. */
|
||||
void addSpecialCategory(const char* name, SSpecialCategoryOptions options);
|
||||
|
||||
/* Add a config value to a special category */
|
||||
void addSpecialConfigValue(const char* cat, const char* name, const CConfigValue value);
|
||||
|
||||
/* Parse the config. Refresh the values. */
|
||||
CParseResult parse();
|
||||
|
||||
/* Same as parse(), but parse a specific file, without any refreshing.
|
||||
recommended to use for stuff like source = path.conf */
|
||||
CParseResult parseFile(std::string file);
|
||||
|
||||
/* Parse a single "line", dynamically.
|
||||
Values set by this are temporary and will be overwritten
|
||||
by default / config on the next parse() */
|
||||
CParseResult parseDynamic(const char* line);
|
||||
CParseResult parseDynamic(const char* command, const char* value);
|
||||
|
||||
/* Get a config's value ptr. These are static.
|
||||
nullptr on fail */
|
||||
CConfigValue* getConfigValuePtr(const char* name);
|
||||
|
||||
/* Get a special category's config value ptr. These are only static for static (key-less)
|
||||
categories, unless a new variable is added via addSpecialConfigValue.
|
||||
key can be nullptr for static categories. Cannot be nullptr for id-based categories.
|
||||
nullptr on fail. */
|
||||
CConfigValue* getSpecialConfigValuePtr(const char* category, const char* name, const char* key = nullptr);
|
||||
|
||||
/* Get a config value's stored value. Empty on fail*/
|
||||
std::any getConfigValue(const char* name) {
|
||||
CConfigValue* val = getConfigValuePtr(name);
|
||||
if (!val)
|
||||
return {};
|
||||
return val->getValue();
|
||||
}
|
||||
|
||||
/* Get a special config value's stored value. Empty on fail. */
|
||||
std::any getSpecialConfigValue(const char* category, const char* name, const char* key = nullptr) {
|
||||
CConfigValue* val = getSpecialConfigValuePtr(category, name, key);
|
||||
if (!val)
|
||||
return {};
|
||||
return val->getValue();
|
||||
}
|
||||
|
||||
private:
|
||||
bool m_bCommenced = false;
|
||||
|
||||
CConfigImpl* impl;
|
||||
|
||||
CParseResult parseLine(std::string line, bool dynamic = false);
|
||||
CParseResult configSetValueSafe(const std::string& command, const std::string& value);
|
||||
CParseResult parseVariable(const std::string& lhs, const std::string& rhs, bool dynamic = false);
|
||||
void clearState();
|
||||
};
|
||||
};
|
||||
#endif
|
181
src/public.hpp
181
src/public.hpp
|
@ -1,181 +1,2 @@
|
|||
#pragma once
|
||||
#include <any>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
|
||||
class CConfigImpl;
|
||||
|
||||
namespace Hyprlang {
|
||||
|
||||
/* types */
|
||||
struct SVector2D {
|
||||
float x = 0, y = 0;
|
||||
|
||||
//
|
||||
bool operator==(const SVector2D& rhs) const {
|
||||
return x == rhs.x && y == rhs.y;
|
||||
}
|
||||
|
||||
friend std::ostream& operator<<(std::ostream& os, const SVector2D& rhs) {
|
||||
return os << "[" << rhs.x << ", " << rhs.y << "]";
|
||||
}
|
||||
};
|
||||
|
||||
class CParseResult {
|
||||
public:
|
||||
bool error = false;
|
||||
/* Get this ParseResult's error string.
|
||||
Pointer valid until the error string is changed or this
|
||||
object gets destroyed. */
|
||||
const char* getError() const {
|
||||
return errorString;
|
||||
}
|
||||
/* Set an error contained by this ParseResult.
|
||||
Creates a copy of the string, does not take ownership. */
|
||||
void setError(const char* err);
|
||||
|
||||
private:
|
||||
void setError(const std::string& err);
|
||||
|
||||
std::string errorStdString = "";
|
||||
const char* errorString = nullptr;
|
||||
|
||||
friend class CConfig;
|
||||
};
|
||||
|
||||
/* Generic struct for options for handlers */
|
||||
struct SHandlerOptions {
|
||||
bool allowFlags = false;
|
||||
};
|
||||
|
||||
/* Generic struct for options for special categories */
|
||||
struct SSpecialCategoryOptions {
|
||||
/* a key is the name of a value that will be the identifier of a special category
|
||||
can be left null for no key, aka a generic one
|
||||
keys are always strings. Default key value is "0" */
|
||||
const char* key = nullptr;
|
||||
|
||||
/* don't pop up an error if the config value is missing */
|
||||
bool ignoreMissing = false;
|
||||
};
|
||||
|
||||
/* typedefs */
|
||||
typedef CParseResult (*PCONFIGHANDLERFUNC)(const char* COMMAND, const char* VALUE);
|
||||
|
||||
struct SConfigValueImpl;
|
||||
/* Container for a config value */
|
||||
class CConfigValue {
|
||||
public:
|
||||
CConfigValue();
|
||||
CConfigValue(const int64_t value);
|
||||
CConfigValue(const float value);
|
||||
CConfigValue(const char* value);
|
||||
CConfigValue(const SVector2D value);
|
||||
CConfigValue(const CConfigValue&);
|
||||
CConfigValue(CConfigValue&&);
|
||||
void operator=(const CConfigValue&);
|
||||
~CConfigValue();
|
||||
|
||||
void* dataPtr() const;
|
||||
std::any getValue() const {
|
||||
switch (m_eType) {
|
||||
case CONFIGDATATYPE_EMPTY: throw;
|
||||
case CONFIGDATATYPE_INT: return std::any(*reinterpret_cast<int64_t*>(m_pData));
|
||||
case CONFIGDATATYPE_FLOAT: return std::any(*reinterpret_cast<float*>(m_pData));
|
||||
case CONFIGDATATYPE_STR: return std::any(reinterpret_cast<const char*>(m_pData));
|
||||
case CONFIGDATATYPE_VEC2: return std::any(*reinterpret_cast<SVector2D*>(m_pData));
|
||||
default: throw;
|
||||
}
|
||||
return {}; // unreachable
|
||||
}
|
||||
|
||||
private:
|
||||
enum eDataType {
|
||||
CONFIGDATATYPE_EMPTY,
|
||||
CONFIGDATATYPE_INT,
|
||||
CONFIGDATATYPE_FLOAT,
|
||||
CONFIGDATATYPE_STR,
|
||||
CONFIGDATATYPE_VEC2,
|
||||
};
|
||||
eDataType m_eType = eDataType::CONFIGDATATYPE_EMPTY;
|
||||
void* m_pData = nullptr;
|
||||
|
||||
friend class CConfig;
|
||||
};
|
||||
|
||||
/* Base class for a config file */
|
||||
class CConfig {
|
||||
public:
|
||||
CConfig(const char* configPath);
|
||||
~CConfig();
|
||||
|
||||
/* Add a config value, for example myCategory:myValue.
|
||||
This has to be done before commence()
|
||||
Value provided becomes default */
|
||||
void addConfigValue(const char* name, const CConfigValue value);
|
||||
|
||||
/* Register a handler. Can be called anytime, though not recommended
|
||||
to do this dynamically */
|
||||
void registerHandler(PCONFIGHANDLERFUNC func, const char* name, SHandlerOptions options);
|
||||
|
||||
/* Commence the config state. Config becomes immutable, as in
|
||||
no new values may be added or removed. Required for parsing. */
|
||||
void commence();
|
||||
|
||||
/* Add a special category. Can be done dynamically. */
|
||||
void addSpecialCategory(const char* name, SSpecialCategoryOptions options);
|
||||
|
||||
/* Add a config value to a special category */
|
||||
void addSpecialConfigValue(const char* cat, const char* name, const CConfigValue value);
|
||||
|
||||
/* Parse the config. Refresh the values. */
|
||||
CParseResult parse();
|
||||
|
||||
/* Same as parse(), but parse a specific file, without any refreshing.
|
||||
recommended to use for stuff like source = path.conf */
|
||||
CParseResult parseFile(std::string file);
|
||||
|
||||
/* Parse a single "line", dynamically.
|
||||
Values set by this are temporary and will be overwritten
|
||||
by default / config on the next parse() */
|
||||
CParseResult parseDynamic(const char* line);
|
||||
CParseResult parseDynamic(const char* command, const char* value);
|
||||
|
||||
/* Get a config's value ptr. These are static.
|
||||
nullptr on fail */
|
||||
CConfigValue* getConfigValuePtr(const char* name);
|
||||
|
||||
/* Get a special category's config value ptr. These are only static for static (key-less)
|
||||
categories, unless a new variable is added via addSpecialConfigValue.
|
||||
key can be nullptr for static categories. Cannot be nullptr for id-based categories.
|
||||
nullptr on fail. */
|
||||
CConfigValue* getSpecialConfigValuePtr(const char* category, const char* name, const char* key = nullptr);
|
||||
|
||||
/* Get a config value's stored value. Empty on fail*/
|
||||
std::any getConfigValue(const char* name) {
|
||||
CConfigValue* val = getConfigValuePtr(name);
|
||||
if (!val)
|
||||
return {};
|
||||
return val->getValue();
|
||||
}
|
||||
|
||||
/* Get a special config value's stored value. Empty on fail. */
|
||||
std::any getSpecialConfigValue(const char* category, const char* name, const char* key = nullptr) {
|
||||
CConfigValue* val = getSpecialConfigValuePtr(category, name, key);
|
||||
if (!val)
|
||||
return {};
|
||||
return val->getValue();
|
||||
}
|
||||
|
||||
private:
|
||||
bool m_bCommenced = false;
|
||||
|
||||
CConfigImpl* impl;
|
||||
|
||||
CParseResult parseLine(std::string line, bool dynamic = false);
|
||||
CParseResult configSetValueSafe(const std::string& command, const std::string& value);
|
||||
CParseResult parseVariable(const std::string& lhs, const std::string& rhs, bool dynamic = false);
|
||||
void clearState();
|
||||
};
|
||||
};
|
||||
#include "../include/hyprlang.hpp"
|
Loading…
Reference in a new issue