Add stuff
This commit is contained in:
@@ -214,6 +214,69 @@ static inline ResultType(Nothing, charptr) parseSet(SolsParser* parser) {
|
||||
return Success(Nothing, charptr, {});
|
||||
}
|
||||
|
||||
static inline ResultType(Nothing, charptr) parseAdd(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_ADD) {
|
||||
break;
|
||||
}
|
||||
parserConsume(parser);
|
||||
addTokenToSolsTokens(&tokens.as.success, peek.as.success);
|
||||
}
|
||||
|
||||
// Create node
|
||||
ResultType(SolsNode, charptr) node = createSolsNode(SNT_OP_ADD);
|
||||
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 set 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);
|
||||
if (peek.error) {
|
||||
@@ -317,6 +380,7 @@ ResultType(Nothing, charptr) parse(SolsParser* parser) {
|
||||
case STT_LITERAL: PARSER_HANDLE(Literal);
|
||||
case STT_KW_PUTS: PARSER_HANDLE(Puts);
|
||||
case STT_OP_SET: PARSER_HANDLE(Set);
|
||||
case STT_OP_ADD: PARSER_HANDLE(Add);
|
||||
}
|
||||
}
|
||||
if (parser->errors.count > 0) {
|
||||
|
||||
Reference in New Issue
Block a user