From 4df7c22b99349dcf2175d69679eafa175d49aa9f Mon Sep 17 00:00:00 2001 From: _ov4 Date: Sun, 26 Jul 2026 12:02:32 +0000 Subject: refactor: batch 1 - correctness and error contract - MID/RIGHT/LEFT integer args now coerced at call sites (RIGHT(s, n/2) no longer emits invalid IR); drop emitLeft's private conversion - FOR loop direction decided at run time via select on STEP sign; descending FOR works, STEP evaluated once per iteration - ArrayHandler: extract emitCheckedIndices/loadElement; index count is validated before emission, fixing a compiler-crash (vector OOB UB) on OUTPUT with too many indices - Error contract: Lexer/Parser/CodeGen track errors; all silent failure paths now print Error: diagnostics with line numbers; unterminated char literal no longer truncates the rest of the program; module is verified with verifyModule; driver exits non-zero on any error Co-Authored-By: Claude Fable 5 --- lib/Parser/ParserFunction.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/Parser/ParserFunction.cc') diff --git a/lib/Parser/ParserFunction.cc b/lib/Parser/ParserFunction.cc index 05b1e12..06348c4 100644 --- a/lib/Parser/ParserFunction.cc +++ b/lib/Parser/ParserFunction.cc @@ -5,7 +5,7 @@ using namespace cps; -std::vector> Parser::ParsePrototypeArgs() { +std::optional>> Parser::ParsePrototypeArgs() { std::vector> Args; if (CurTok != '(') return Args; getNextToken(); @@ -24,21 +24,21 @@ std::vector> Parser::ParsePrototypeAr if (CurTok != tok_identifier) { fprintf(stderr, "Error: Expected argument name\n"); - return Args; + return std::nullopt; } std::string Name = Lex.IdentifierStr; getNextToken(); if (CurTok != tok_colon) { fprintf(stderr, "Error: Expected ':' after argument name\n"); - return Args; + return std::nullopt; } getNextToken(); std::string Type = ParseTypeName(false); if (Type.empty()) { fprintf(stderr, "Error: Expected argument type for '%s'\n", Name.c_str()); - return Args; + return std::nullopt; } Args.emplace_back(Name, Type, IsRef); @@ -46,7 +46,7 @@ std::vector> Parser::ParsePrototypeAr if (CurTok == ')') break; if (CurTok != ',') { fprintf(stderr, "Error: Expected ',' or ')'\n"); - return Args; + return std::nullopt; } getNextToken(); } @@ -65,6 +65,7 @@ std::unique_ptr Parser::ParseFunction() { getNextToken(); auto Args = ParsePrototypeArgs(); + if (!Args) return nullptr; std::string RetType = "INTEGER"; if (CurTok == tok_returns) { @@ -76,7 +77,7 @@ std::unique_ptr Parser::ParseFunction() { } } - auto Proto = std::make_unique(Name, std::move(Args), RetType); + auto Proto = std::make_unique(Name, std::move(*Args), RetType); std::vector> Body; while (CurTok != tok_endfunction && CurTok != tok_eof) { @@ -105,7 +106,8 @@ std::unique_ptr Parser::ParseProcedure() { getNextToken(); auto Args = ParsePrototypeArgs(); - auto Proto = std::make_unique(Name, std::move(Args), "VOID"); + if (!Args) return nullptr; + auto Proto = std::make_unique(Name, std::move(*Args), "VOID"); std::vector> Body; while (CurTok != tok_endprocedure && CurTok != tok_eof) { -- cgit v1.3.1-4-g156e