This commit is contained in:
2026-02-27 14:54:16 +11:00
parent e7e5cc92d5
commit 8756dd08c8
4 changed files with 143 additions and 4 deletions

View File

@@ -19,6 +19,12 @@ SolsTokenPrecedence getPrecedence(SolsToken *token) {
// FIXME figure out how to do functions
case STT_OP_MUL: case STT_OP_DIV: return STP_MUL;
case STT_OP_ADD: case STT_OP_SUB: return STP_ADD;
case STT_OP_EQUAL:
case STT_OP_EQGREATER:
case STT_OP_EQLESSER:
case STT_OP_INEQUAL:
case STT_OP_GREATER:
case STT_OP_LESSER: return STP_COMPARE;
default: return STP_OTHER;
}
}
@@ -466,6 +472,68 @@ static inline ResultType(Nothing, charptr) parseDiv(SolsParser* parser) {
return Success(Nothing, charptr, {});
}
static inline ResultType(Nothing, charptr) parseEqual(SolsParser* parser) {
if (parser->currentParent->children.count < 1) {
return Error(Nothing, charptr, "Expecting something before '=='");
}
// Collect tokens for node
ResultType(SolsTokens, charptr) tokens = createSolsTokens();
if (tokens.error) {
return Error(Nothing, charptr, tokens.as.error);
}
// Get the previous node
SolsNode idNode = parser->currentParent->children.at[parser->currentParent->children.count - 1];
ResultType(SolsToken, Nothing) peek = parserPeek(parser, 0);
if (peek.error) return Error(Nothing, charptr, "ruh roh");
for (;;) {
ResultType(SolsToken, Nothing) peek = parserPeek(parser, 1);
if (peek.error) break;
if (getPrecedence(&peek.as.success) <= STP_COMPARE) {
break;
}
parserConsume(parser);
addTokenToSolsTokens(&tokens.as.success, peek.as.success);
}
// Create node
ResultType(SolsNode, charptr) node = createSolsNode(SNT_OP_EQUAL);
if (node.error) return Error(Nothing, charptr, node.as.error);
node.as.success.line = peek.as.success.line;
// Parse selected tokens
ResultType(SolsParser, charptr) putsParser = createSolsParser(&tokens.as.success);
if (putsParser.error) return Error(Nothing, charptr, putsParser.as.error);
putsParser.as.success.currentParent = &putsParser.as.success.output;
ResultType(Nothing, charptr) parsed = parse(&putsParser.as.success);
// Add any error messages from parsing
if (parsed.error) {
addToParserErrors(parser, parsed.as.error);
return Success(Nothing, charptr, {});
}
if (putsParser.as.success.output.children.count < 1) {
return Error(Nothing, charptr, "Expecting token after '=='");
}
// Copy idnode into set node
addChildToSolsNode(&node.as.success, idNode);
// Copy nodes into the set node
for (size_t i = 0; i < putsParser.as.success.output.children.count; i++) {
addChildToSolsNode(&node.as.success, putsParser.as.success.output.children.at[i]);
}
// Put the equal node where the idNode was
parser->currentParent->children.count--;
addChildToSolsNode(parser->currentParent, node.as.success);
return Success(Nothing, charptr, {});
}
static inline ResultType(Nothing, charptr) parseLiteral(SolsParser* parser) {
ResultType(SolsToken, Nothing) peek = parserPeek(parser, 0);
@@ -574,6 +642,7 @@ ResultType(Nothing, charptr) parse(SolsParser* parser) {
case STT_OP_SUB: PARSER_HANDLE(Sub);
case STT_OP_MUL: PARSER_HANDLE(Mul);
case STT_OP_DIV: PARSER_HANDLE(Div);
case STT_OP_EQUAL: PARSER_HANDLE(Equal);
}
}
if (parser->errors.count > 0) {