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

broekn

v1
Brett 2024-05-10 21:36:38 -04:00
parent 83329f6736
commit c3cd00cf04
2 changed files with 22 additions and 12 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.1) set(BLT_VERSION 0.17.2)
set(BLT_TEST_VERSION 0.0.1) set(BLT_TEST_VERSION 0.0.1)
set(BLT_TARGET BLT) set(BLT_TARGET BLT)

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

@ -324,7 +324,6 @@ namespace blt
{ {
return if_func(); return if_func();
} }
BLT_TRACE(next.token);
return blt::unexpected(template_parser_failure_t::UNKNOWN_STATEMENT_ERROR); return blt::unexpected(template_parser_failure_t::UNKNOWN_STATEMENT_ERROR);
} }
@ -347,10 +346,13 @@ 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::PAR_CLOSE)
return blt::unexpected(template_parser_failure_t::IF_EXPECTED_PAREN); return blt::unexpected(template_parser_failure_t::IF_EXPECTED_PAREN);
BLT_TRACE("Statement");
auto true_statement = statement(); auto true_statement = statement();
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);
if (consumer.next().type == template_token_t::ELSE) if (consumer.next().type == template_token_t::ELSE)
{ {
consumer.advance(); consumer.advance();
@ -425,6 +427,14 @@ namespace blt
{ {
bool b1; bool b1;
auto next = consumer.next(); auto next = consumer.next();
bool invert = false;
// prefixes
if (next.type == template_token_t::NOT)
{
invert = true;
consumer.advance();
next = consumer.next();
}
if (next.type == template_token_t::PAR_OPEN) if (next.type == template_token_t::PAR_OPEN)
{ {
auto b = bool_statement(); auto b = bool_statement();
@ -433,13 +443,6 @@ namespace blt
b1 = b.value(); b1 = b.value();
} else } else
{ {
bool invert = false;
// prefixes
if (next.type == template_token_t::NOT)
{
invert = true;
consumer.advance();
}
if (consumer.next().type == template_token_t::PAR_OPEN) if (consumer.next().type == template_token_t::PAR_OPEN)
{ {
auto b = bool_statement(); auto b = bool_statement();
@ -451,11 +454,13 @@ 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();
} }
}
if (invert) if (invert)
b1 = !b1; b1 = !b1;
}
return b1; return b1;
} }
@ -492,8 +497,11 @@ namespace blt
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);
BLT_TRACE("Current State:");
for (auto b : values)
BLT_INFO(b);
if (next.type == template_token_t::PAR_CLOSE) if (next.type == template_token_t::PAR_CLOSE)
break; break;
consumer.advance(); consumer.advance();
@ -514,6 +522,8 @@ namespace blt
// return blt::unexpected(template_parser_failure_t::BOOL_TYPE_NOT_FOUND); // 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];