tri11paragon
/
crowsite
mirror of https://github.com/Tri11Paragon/crowsite.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add else statements using '*'

main
Brett 2023-08-23 15:55:02 -04:00
parent 429b39cf08
commit a3b1d3b9d8
2 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crow_test/webcontent/menu_bar.part
View File

@ -4,12 +4,11 @@
<li class="left"><a id="research" href="/research.html">Research</a></li> <li class="left"><a id="research" href="/research.html">Research</a></li>
<li class="left"><a id="git" href="/git.html">Git</a></li> <li class="left"><a id="git" href="/git.html">Git</a></li>
<li class="left"><a id='about' href="/about.html">About</a></li> <li class="left"><a id='about' href="/about.html">About</a></li>
{{#_logged_in}} {{%_logged_in}}
<li class="right"><a href="/logout.html">Logout</a></li> <li class="right"><a href="/logout.html">Logout</a></li>
{{/_logged_in}} {{*_logged_in}}
{{#_not_logged_in}}
<li class="right"><a id='login' href="/login.html">Login</a></li> <li class="right"><a id='login' href="/login.html">Login</a></li>
{{/_not_logged_in}} {{/_logged_in}}
</ul> </ul>
<script> <script>
const path = window.location.pathname; const path = window.location.pathname;

60
src/crowsite/site/cache.cpp
View File

@ -66,7 +66,7 @@ namespace cs
while (!hasTemplateSuffix()) while (!hasTemplateSuffix())
{ {
if (!hasNext()) if (!hasNext())
blt_throw(LexerSyntaxError()); blt_throw(LexerSyntaxError());
token += consume(); token += consume();
} }
consumeTemplateSuffix(); consumeTemplateSuffix();
@ -119,8 +119,10 @@ namespace cs
CLOSE // ) CLOSE // )
}; };
static std::string decodeName(TokenType type){ static std::string decodeName(TokenType type)
switch (type){ {
switch (type)
{
case TokenType::AND: case TokenType::AND:
return "AND"; return "AND";
case TokenType::OR: case TokenType::OR:
@ -194,12 +196,12 @@ namespace cs
{ {
case '&': case '&':
if (consume() != '&') if (consume() != '&')
blt_throw(LexerSyntaxError("Unable to parse logical expression. Found single '&' missing second '&'")); blt_throw(LexerSyntaxError("Unable to parse logical expression. Found single '&' missing second '&'"));
tokens.emplace_back(TokenType::AND); tokens.emplace_back(TokenType::AND);
break; break;
case '|': case '|':
if (consume() != '|') if (consume() != '|')
blt_throw(LexerSyntaxError("Unable to parse logical expression. Found single '|' missing second '|'")); blt_throw(LexerSyntaxError("Unable to parse logical expression. Found single '|' missing second '|'"));
tokens.emplace_back(TokenType::OR); tokens.emplace_back(TokenType::OR);
break; break;
case '!': case '!':
@ -227,16 +229,18 @@ namespace cs
//BLT_DEBUG("isTrue for token '%s' contains? %s", token.c_str(), context.contains(token) ? "True" : "False"); //BLT_DEBUG("isTrue for token '%s' contains? %s", token.c_str(), context.contains(token) ? "True" : "False");
return context.contains(token) && !context.at(token).empty(); return context.contains(token) && !context.at(token).empty();
} }
// http://www.cs.unb.ca/~wdu/cs4613/a2ans.htm // http://www.cs.unb.ca/~wdu/cs4613/a2ans.htm
bool factor(const RuntimeContext& context) bool factor(const RuntimeContext& context)
{ {
if (!hasNextToken()) if (!hasNextToken())
blt_throw(LexerSyntaxError("Processing boolean factor but no token was found!")); blt_throw(LexerSyntaxError("Processing boolean factor but no token was found!"));
auto next = consumeToken(); auto next = consumeToken();
switch (next.type){ switch (next.type)
{
case TokenType::IDENT: case TokenType::IDENT:
if (!next.value.has_value()) if (!next.value.has_value())
blt_throw(LexerSyntaxError("Token identifier does not have a value!")); blt_throw(LexerSyntaxError("Token identifier does not have a value!"));
return isTrue(context, next.value.value()); return isTrue(context, next.value.value());
case TokenType::NOT: case TokenType::NOT:
return !factor(context); return !factor(context);
@ -248,7 +252,7 @@ namespace cs
return expr(context); return expr(context);
} }
default: default:
blt_throw(LexerSyntaxError("Weird token found while parsing tokens, type: " + decodeName(next.type))); blt_throw(LexerSyntaxError("Weird token found while parsing tokens, type: " + decodeName(next.type)));
} }
} }
@ -258,7 +262,8 @@ namespace cs
if (!hasNextToken()) if (!hasNextToken())
return fac; return fac;
auto next = consumeToken(); auto next = consumeToken();
switch (next.type) { switch (next.type)
{
case TokenType::AND: case TokenType::AND:
return fac && expr(context); return fac && expr(context);
case TokenType::OR: case TokenType::OR:
@ -298,11 +303,12 @@ namespace cs
} }
static void getTagLocations(std::vector<size_t>& tagLocations, const std::string& tag, const std::string& data){ static void getTagLocations(std::vector<size_t>& tagLocations, const std::string& tag, const std::string& data)
{
RuntimeLexer lexer(data); RuntimeLexer lexer(data);
while (lexer.hasNext()) while (lexer.hasNext())
{ {
if (lexer.hasTemplatePrefix('/')) if (lexer.hasTemplatePrefix('/') || lexer.hasTemplatePrefix('*'))
{ {
auto loc = lexer.index; auto loc = lexer.index;
auto token = lexer.consumeToken(); auto token = lexer.consumeToken();
@ -312,7 +318,7 @@ namespace cs
lexer.consume(); lexer.consume();
} }
if (tagLocations.empty()) if (tagLocations.empty())
blt_throw( LexerSearchFailure(tag)); blt_throw(LexerSearchFailure(tag));
} }
static size_t findLastTagLocation(const std::string& tag, const std::string& data) static size_t findLastTagLocation(const std::string& tag, const std::string& data)
@ -322,7 +328,8 @@ namespace cs
return tagLocations[tagLocations.size() - 1]; return tagLocations[tagLocations.size() - 1];
} }
static size_t findNextTagLocation(const std::string& tag, const std::string& data) { static size_t findNextTagLocation(const std::string& tag, const std::string& data)
{
std::vector<size_t> tagLocations{}; std::vector<size_t> tagLocations{};
getTagLocations(tagLocations, tag, data); getTagLocations(tagLocations, tag, data);
return tagLocations[0]; return tagLocations[0];
@ -342,17 +349,31 @@ namespace cs
auto internalData = searchField.substr(0, endTokenLoc); auto internalData = searchField.substr(0, endTokenLoc);
LogicalEval eval(token); LogicalEval eval(token);
bool expressionValue = eval.eval(context);
if (eval.eval(context)) { if (expressionValue)
{
results += searchAndReplace(internalData, context); results += searchAndReplace(internalData, context);
} }
lexer.index += endTokenLoc; lexer.index += endTokenLoc;
if (lexer.hasTemplatePrefix('*'))
{
lexer.consumeToken();
auto nextSearchField = lexer.str.substr(lexer.index);
auto nextEndLoc = RuntimeLexer::findNextTagLocation(token, nextSearchField);
auto nextInternalData = nextSearchField.substr(0, nextEndLoc);
if (!expressionValue)
{
results += searchAndReplace(nextInternalData, context);
}
lexer.index += nextEndLoc;
}
if (lexer.hasTemplatePrefix('/')) if (lexer.hasTemplatePrefix('/'))
lexer.consumeToken(); lexer.consumeToken();
else { else
blt_throw(LexerSyntaxError("Ending token not found!")); blt_throw(LexerSyntaxError("Ending token not found!"));
}
} else } else
results += lexer.consume(); results += lexer.consume();
@ -479,8 +500,9 @@ namespace cs
while (prunedAmount < amount) while (prunedAmount < amount)
{ {
auto page = cachedPages[0]; auto page = cachedPages[0];
BLT_TRACE("Pruning page (%d bytes) aged %f seconds", page.memoryUsage, BLT_TRACE(
toSeconds(blt::system::getCurrentTimeNanoseconds() - m_Pages[page.key].cacheTime)); "Pruning page (%d bytes) aged %f seconds", page.memoryUsage,
toSeconds(blt::system::getCurrentTimeNanoseconds() - m_Pages[page.key].cacheTime));
prunedAmount += page.memoryUsage; prunedAmount += page.memoryUsage;
m_Pages.erase(page.key); m_Pages.erase(page.key);
prunedPages++; prunedPages++;