hyprwm/hyprlang
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlang.git synced 2024-12-22 18:09:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: make dynamic variable changes affect lines where it is used

Browse source
This commit is contained in:
Vaxry 2023-12-29 11:48:55 +01:00
parent 158c66c5db
commit 582d35fee8
4 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/config.cpp
View file

@ -219,14 +219,29 @@ CParseResult CConfig::configSetValueSafe(const std::string& command, const std::
return result; return result;
} }
CParseResult CConfig::parseVariable(const std::string& lhs, const std::string& rhs) { CParseResult CConfig::parseVariable(const std::string& lhs, const std::string& rhs, bool dynamic) {
auto IT = std::find_if(impl->variables.begin(), impl->variables.end(), [&](const auto& v) { return v.name == lhs.substr(1); });
if (IT != impl->variables.end())
IT->value = rhs;
else {
impl->variables.push_back({lhs.substr(1), rhs}); impl->variables.push_back({lhs.substr(1), rhs});
std::sort(impl->variables.begin(), impl->variables.end(), [](const auto& lhs, const auto& rhs) { return lhs.name.length() > rhs.name.length(); }); std::sort(impl->variables.begin(), impl->variables.end(), [](const auto& lhs, const auto& rhs) { return lhs.name.length() > rhs.name.length(); });
}
if (dynamic) {
if (IT == impl->variables.end())
IT = std::find_if(impl->variables.begin(), impl->variables.end(), [&](const auto& v) { return v.name == lhs.substr(1); });
for (auto& l : IT->linesContainingVar) {
parseLine(l, true);
}
}
CParseResult result; CParseResult result;
return result; return result;
} }
CParseResult CConfig::parseLine(std::string line) { CParseResult CConfig::parseLine(std::string line, bool dynamic) {
CParseResult result; CParseResult result;
auto commentPos = line.find('#'); auto commentPos = line.find('#');
@ -271,7 +286,7 @@ CParseResult CConfig::parseLine(std::string line) {
} }
if (*LHS.begin() == '$') if (*LHS.begin() == '$')
return parseVariable(LHS, RHS); return parseVariable(LHS, RHS, dynamic);
// limit unwrapping iterations to 100. if exceeds, raise error // limit unwrapping iterations to 100. if exceeds, raise error
for (size_t i = 0; i < 100; ++i) { for (size_t i = 0; i < 100; ++i) {
@ -287,6 +302,8 @@ CParseResult CConfig::parseLine(std::string line) {
if (RHSIT == std::string::npos && LHSIT == std::string::npos) if (RHSIT == std::string::npos && LHSIT == std::string::npos)
break; break;
else
var.linesContainingVar.push_back(line);
anyMatch = true; anyMatch = true;
} }
@ -387,11 +404,11 @@ CParseResult CConfig::parse() {
} }
CParseResult CConfig::parseDynamic(const char* line) { CParseResult CConfig::parseDynamic(const char* line) {
return parseLine(line); return parseLine(line, true);
} }
CParseResult CConfig::parseDynamic(const char* command, const char* value) { CParseResult CConfig::parseDynamic(const char* command, const char* value) {
return parseLine(std::string{command} + "=" + std::string{value}); return parseLine(std::string{command} + "=" + std::string{value}, true);
} }
void CConfig::clearState() { void CConfig::clearState() {

1
src/config.hpp
View file

@ -13,6 +13,7 @@ struct SHandler {
struct SVariable { struct SVariable {
std::string name = ""; std::string name = "";
std::string value = ""; std::string value = "";
std::vector<std::string> linesContainingVar; // for dynamic updates
}; };
class CConfigImpl { class CConfigImpl {

4
src/public.hpp
View file

@ -137,9 +137,9 @@ namespace Hyprlang {
CConfigImpl* impl; CConfigImpl* impl;
CParseResult parseLine(std::string line); CParseResult parseLine(std::string line, bool dynamic = false);
CParseResult configSetValueSafe(const std::string& command, const std::string& value); CParseResult configSetValueSafe(const std::string& command, const std::string& value);
CParseResult parseVariable(const std::string& lhs, const std::string& rhs); CParseResult parseVariable(const std::string& lhs, const std::string& rhs, bool dynamic = false);
void clearState(); void clearState();
}; };
}; };

5
tests/main.cpp
View file

@ -111,6 +111,11 @@ int main(int argc, char** argv, char** envp) {
std::cout << " → Testing variables\n"; std::cout << " → Testing variables\n";
EXPECT(std::any_cast<int64_t>(config.getConfigValue("testVar")), 13371337); EXPECT(std::any_cast<int64_t>(config.getConfigValue("testVar")), 13371337);
// test dynamic variables
std::cout << " → Testing dynamic variables\n";
EXPECT(config.parseDynamic("$MY_VAR_2 = 420").error, false);
EXPECT(std::any_cast<int64_t>(config.getConfigValue("testVar")), 1337420);
} catch (const char* e) { } catch (const char* e) {
std::cout << Colors::RED << "Error: " << Colors::RESET << e << "\n"; std::cout << Colors::RED << "Error: " << Colors::RESET << e << "\n";
return 1; return 1;