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/Parser.cc | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'lib/Parser/Parser.cc') diff --git a/lib/Parser/Parser.cc b/lib/Parser/Parser.cc index 322cdb9..049f99d 100644 --- a/lib/Parser/Parser.cc +++ b/lib/Parser/Parser.cc @@ -271,12 +271,18 @@ std::vector> Parser::Parse() { } std::unique_ptr Parser::ParseDeclare() { - getNextToken(); - if (CurTok != tok_identifier) return nullptr; + getNextToken(); + if (CurTok != tok_identifier) { + fprintf(stderr, "Error: Expected identifier after DECLARE at line %d\n", Lex.getLine()); + return nullptr; + } std::string Name = Lex.IdentifierStr; getNextToken(); - - if (CurTok != tok_colon) return nullptr; + + if (CurTok != tok_colon) { + fprintf(stderr, "Error: Expected ':' after variable name '%s' at line %d\n", Name.c_str(), Lex.getLine()); + return nullptr; + } getNextToken(); if (CurTok == tok_array) { @@ -485,6 +491,12 @@ std::unique_ptr Parser::ParseForStmt() { } std::unique_ptr Parser::ParseStatement() { + auto Stmt = ParseStatementImpl(); + if (!Stmt) ++NumErrors; + return Stmt; +} + +std::unique_ptr Parser::ParseStatementImpl() { if (CurTok == tok_declare) { return ParseDeclare(); } @@ -515,7 +527,10 @@ std::unique_ptr Parser::ParseStatement() { return std::make_unique(Name, std::move(Indices), std::move(Expr), Line); } - if (CurTok != tok_assign) return nullptr; + if (CurTok != tok_assign) { + fprintf(stderr, "Error: Expected '<-' after identifier '%s' at line %d\n", Name.c_str(), Line); + return nullptr; + } getNextToken(); auto Expr = ParseExpression(); if (!Expr) return nullptr; @@ -523,7 +538,10 @@ std::unique_ptr Parser::ParseStatement() { } else if (CurTok == tok_input) { getNextToken(); - if (CurTok != tok_identifier) return nullptr; + if (CurTok != tok_identifier) { + fprintf(stderr, "Error: Expected variable name after INPUT at line %d\n", Lex.getLine()); + return nullptr; + } std::string Name = Lex.IdentifierStr; getNextToken(); return std::make_unique(Name); @@ -559,5 +577,6 @@ std::unique_ptr Parser::ParseStatement() { return ParseReturnStmt(); } + fprintf(stderr, "Error: Unexpected token at line %d when expecting a statement\n", Lex.getLine()); return nullptr; } -- cgit v1.3.1-4-g156e