tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

templating works for what i need 

might be bugs in it still
v1
Brett 2024-05-11 13:39:07 -04:00
parent c3cd00cf04
commit 7cd736cf6c
4 changed files with 60 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
include(cmake/color.cmake) include(cmake/color.cmake)
set(BLT_VERSION 0.17.2) set(BLT_VERSION 0.17.3)
set(BLT_TEST_VERSION 0.0.1) set(BLT_TEST_VERSION 0.0.1)
set(BLT_TARGET BLT) set(BLT_TARGET BLT)

123
include/blt/parse/templating.h
View File

@ -171,6 +171,7 @@ namespace blt
FUNCTION_DISCARD, FUNCTION_DISCARD,
STRING_EXPECTED_CONCAT, STRING_EXPECTED_CONCAT,
IF_EXPECTED_PAREN, IF_EXPECTED_PAREN,
IF_EXPECTED_CURLY,
BOOL_EXPECTED_PAREN, BOOL_EXPECTED_PAREN,
BOOL_TYPE_NOT_FOUND, BOOL_TYPE_NOT_FOUND,
UNKNOWN_STATEMENT_ERROR, UNKNOWN_STATEMENT_ERROR,
@ -235,6 +236,13 @@ namespace blt
current_index--; current_index--;
} }
auto prev()
{
if (current_index == 0)
throw std::runtime_error("Current Index cannot be zero!");
return storage[current_index - 1];
}
private: private:
std::string_view raw_string; std::string_view raw_string;
size_t last_read_index = 0; size_t last_read_index = 0;
@ -266,14 +274,26 @@ namespace blt
inline auto get(std::string_view token) inline auto get(std::string_view token)
{ {
return evaluate(substitutions[token]); return internal_evaluate(substitutions[token], true);
} }
static blt::expected<std::vector<template_token_data_t>, template_tokenizer_failure_t> process_string(std::string_view str); static blt::expected<std::vector<template_token_data_t>, template_tokenizer_failure_t> process_string(std::string_view str);
blt::expected<std::string, template_parser_failure_t> evaluate(std::string_view str); blt::expected<std::string, template_parser_failure_t> evaluate(std::string_view str)
{
auto eval = internal_evaluate(str, false);
if (eval.has_value())
return eval;
else
if (eval.error() == template_parser_failure_t::FUNCTION_DISCARD)
return "";
else
return eval;
}
private: private:
blt::expected<std::string, template_parser_failure_t> internal_evaluate(std::string_view str, bool discard);
blt::hashmap_t<std::string, std::string> substitutions; blt::hashmap_t<std::string, std::string> substitutions;
}; };
@ -307,7 +327,8 @@ namespace blt
if (next.type == template_token_t::STRING || next.type == template_token_t::QUOTE) if (next.type == template_token_t::STRING || next.type == template_token_t::QUOTE)
{ {
consumer.back(); consumer.back();
return string(); auto str = string();
return str;
} else if (next.type == template_token_t::FUNCTION) } else if (next.type == template_token_t::FUNCTION)
{ {
return function(); return function();
@ -330,6 +351,8 @@ namespace blt
estring function() estring function()
{ {
auto str = consumer.consume(); auto str = consumer.consume();
if (consumer.next().type == template_token_t::SEMI)
consumer.advance();
if (str.type != template_token_t::STRING) if (str.type != template_token_t::STRING)
return blt::unexpected(template_parser_failure_t::FUNCTION_EXPECTED_STRING); return blt::unexpected(template_parser_failure_t::FUNCTION_EXPECTED_STRING);
if (str.token == "DISCARD") if (str.token == "DISCARD")
@ -346,24 +369,31 @@ namespace blt
auto bool_eval = bool_statement(); auto bool_eval = bool_statement();
if (!bool_eval) if (!bool_eval)
return blt::unexpected(bool_eval.error()); return blt::unexpected(bool_eval.error());
BLT_TRACE(bool_eval.value());
if (consumer.consume().type != template_token_t::PAR_CLOSE) if (consumer.consume().type != template_token_t::CURLY_OPEN)
return blt::unexpected(template_parser_failure_t::IF_EXPECTED_PAREN); return blt::unexpected(template_parser_failure_t::IF_EXPECTED_CURLY);
BLT_TRACE("Statement");
auto true_statement = statement(); auto true_statement = statement();
if (consumer.consume().type != template_token_t::CURLY_CLOSE)
return blt::unexpected(template_parser_failure_t::IF_EXPECTED_CURLY);
estring false_statement = blt::unexpected(template_parser_failure_t::UNKNOWN_ERROR); estring false_statement = blt::unexpected(template_parser_failure_t::UNKNOWN_ERROR);
BLT_TRACE(consumer.next().token); bool has_false = false;
if (consumer.next().type == template_token_t::ELSE) if (consumer.next().type == template_token_t::ELSE)
{ {
consumer.advance(); consumer.advance();
if (consumer.consume().type != template_token_t::CURLY_OPEN)
return blt::unexpected(template_parser_failure_t::IF_EXPECTED_CURLY);
false_statement = statement(); false_statement = statement();
if (consumer.consume().type != template_token_t::CURLY_CLOSE)
return blt::unexpected(template_parser_failure_t::IF_EXPECTED_CURLY);
has_false = true;
} }
if (bool_eval.value()) if (bool_eval.value())
{
return true_statement; return true_statement;
} else else
{ {
if (false_statement) if (has_false)
return false_statement; return false_statement;
return ""; return "";
} }
@ -374,12 +404,15 @@ namespace blt
auto next = consumer.consume(); auto next = consumer.consume();
if (next.type == template_token_t::STRING) if (next.type == template_token_t::STRING)
{ {
if (!engine.contains(next.token)) //
return blt::unexpected(template_parser_failure_t::SUBSTITUTION_NOT_FOUND); // return blt::unexpected(template_parser_failure_t::SUBSTITUTION_NOT_FOUND);
if (consumer.next().type == template_token_t::SEMI || consumer.next().type == template_token_t::ELSE || if (consumer.next().type == template_token_t::SEMI || consumer.next().type == template_token_t::ELSE ||
consumer.next().type == template_token_t::CURLY_CLOSE || consumer.next().type == template_token_t::PAR_CLOSE) consumer.next().type == template_token_t::CURLY_CLOSE || consumer.next().type == template_token_t::PAR_CLOSE)
{ {
if (consumer.next().type == template_token_t::SEMI)
consumer.advance(); consumer.advance();
if (!engine.contains(next.token))
return "";
return engine.get(next.token); return engine.get(next.token);
} }
@ -454,8 +487,6 @@ namespace blt
auto b = statement(); auto b = statement();
if (!b) if (!b)
return blt::unexpected(b.error()); return blt::unexpected(b.error());
BLT_DEBUG(b.value());
BLT_DEBUG(consumer.next().token);
b1 = !b.value().empty(); b1 = !b.value().empty();
} }
} }
@ -468,7 +499,7 @@ namespace blt
{ {
// this whole thing is just bad. please redo. TODO // this whole thing is just bad. please redo. TODO
std::vector<int> values; std::vector<int> values;
while (consumer.next().type != template_token_t::PAR_CLOSE) while (consumer.next().type != template_token_t::CURLY_OPEN)
{ {
auto next = consumer.next(); auto next = consumer.next();
auto bv = bool_value(); auto bv = bool_value();
@ -494,74 +525,18 @@ namespace blt
values.push_back(b1 ^ b2); values.push_back(b1 ^ b2);
break; break;
default: default:
BLT_WARN("Unexpected token '%s'", std::string(next.token).c_str());
return blt::unexpected(template_parser_failure_t::BOOL_TYPE_NOT_FOUND); return blt::unexpected(template_parser_failure_t::BOOL_TYPE_NOT_FOUND);
} }
} }
next = consumer.next(); next = consumer.next();
BLT_TRACE(next.token); if (next.type == template_token_t::CURLY_OPEN)
BLT_TRACE("Current State:");
for (auto b : values)
BLT_INFO(b);
if (next.type == template_token_t::PAR_CLOSE)
break; break;
consumer.advance(); consumer.advance();
// bv = bool_value();
// if (!bv)
// return bv;
// values.push_back(bv.value());
//
// switch (next.type)
// {
// case template_token_t::AND:
// ret =
// case template_token_t::OR:
// break;
// case template_token_t::XOR:
// break;
// default:
// return blt::unexpected(template_parser_failure_t::BOOL_TYPE_NOT_FOUND);
// }
} }
BLT_INFO(consumer.next().token);
consumer.advance();
if (values.empty()) if (values.empty())
BLT_WARN("This is not possible!"); BLT_WARN("This is not possible!");
return values[0]; return values[0];
// if (next.type == template_token_t::NOT)
// {
// auto b = bool_statement();
// if (b)
// return !b.value();
// else
// return b;
// } else if (next.type == template_token_t::STRING)
// {
// auto bool_val = next.token.empty();
// next = consumer.next();
// if (next.type == template_token_t::PAR_CLOSE)
// return bool_val;
// consumer.advance();
// if (next.type == template_token_t::AND)
// {
// auto other_val = bool_expression();
// if (!other_val)
// return other_val;
// return bool_val && other_val.value();
// } else if (next.type == template_token_t::OR)
// {
// auto other_val = bool_expression();
// if (!other_val)
// return other_val;
// return bool_val || other_val.value();
// } else if (next.type == template_token_t::XOR)
// {
// auto other_val = bool_expression();
// if (!other_val)
// return other_val;
// return bool_val ^ other_val.value();
// }
// }
// return unexpected(template_parser_failure_t::UNKNOWN_ERROR);
} }
template_engine_t& engine; template_engine_t& engine;

2
libraries/parallel-hashmap

@ -1 +1 @@
Subproject commit 10368163ab1f4367d2f0685b5928b1c973ebd1ec Subproject commit 7ef2e733416953b222851f9a360d7fc72d068ee5

13
src/blt/parse/templating.cpp
View File

@ -183,7 +183,7 @@ namespace blt
return tokens; return tokens;
} }
blt::expected<std::string, template_parser_failure_t> template_engine_t::evaluate(std::string_view str) blt::expected<std::string, template_parser_failure_t> template_engine_t::internal_evaluate(std::string_view str, bool discard)
{ {
auto tokens = process_string(str); auto tokens = process_string(str);
@ -226,18 +226,19 @@ namespace blt
break; break;
if (auto result = parser.parse()) if (auto result = parser.parse())
{
BLT_DEBUG("Result parser: %s", result.value().c_str());
return_str += result.value(); return_str += result.value();
}else else
{ {
if (result.error() == template_parser_failure_t::FUNCTION_DISCARD) if (result.error() == template_parser_failure_t::FUNCTION_DISCARD)
continue; {
if (discard)
return blt::unexpected(template_parser_failure_t::FUNCTION_DISCARD);
} else
return result; return result;
} }
consumer.set_marker(); consumer.set_marker();
} }
while(consumer.hasNext()) while (consumer.hasNext())
consumer.advance(); consumer.advance();
return_str += consumer.from_last(); return_str += consumer.from_last();