From 927e3fc0384c941f9ad313a28768660c3cdb1777 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Sun, 18 Oct 2026 08:04:15 +0000 Subject: feat(driver): add #LIB directive hiding library lines in runtime errors Co-Authored-By: Claude Opus 5.5 --- include/cps/FunctionGen.h | 2 ++ include/cps/Lexer.h | 3 +++ include/cps/RuntimeCheck.h | 6 ++++++ include/cps/SourceUnit.h | 1 + 4 files changed, 12 insertions(+) (limited to 'include/cps') diff --git a/include/cps/FunctionGen.h b/include/cps/FunctionGen.h index 5eb0f82..57a27ff 100644 --- a/include/cps/FunctionGen.h +++ b/include/cps/FunctionGen.h @@ -79,6 +79,7 @@ private: std::map UnitPaths; size_t CurrentUnit = 0; std::function Visible; + std::function BeforeCall; ArrayParamBinder BindArrayParam; std::function RegisterCopy; @@ -103,6 +104,7 @@ public: } void setCurrentUnit(size_t Unit, const std::string &Path) { CurrentUnit = Unit; UnitPaths[Unit] = Path; } + void setCallHook(std::function Hook) { BeforeCall = std::move(Hook); } void setVisibility(std::function Predicate) { Visible = std::move(Predicate); } std::vector getOverloads(const std::string &Name) const; bool hasFunction(const std::string &Name) const { return !getOverloads(Name).empty(); } diff --git a/include/cps/Lexer.h b/include/cps/Lexer.h index 1c4723e..588a5fa 100644 --- a/include/cps/Lexer.h +++ b/include/cps/Lexer.h @@ -120,6 +120,8 @@ class Lexer { int CurrentLine = 1; int TokenLine = 1; bool HadError = false; + bool Library = false; + bool LineStart = true; struct TokenData { int Kind, Line; std::string Identifier, String; @@ -145,6 +147,7 @@ public: int peekToken(unsigned Offset = 0); int peekLine(unsigned Offset = 0); int getLine() const { return TokenLine; } + bool isLibrary() const { return Library; } bool hadError() const { return HadError; } }; diff --git a/include/cps/RuntimeCheck.h b/include/cps/RuntimeCheck.h index 30a1910..d2ee1ea 100644 --- a/include/cps/RuntimeCheck.h +++ b/include/cps/RuntimeCheck.h @@ -18,6 +18,8 @@ class RuntimeCheck { llvm::FunctionCallee StderrFunc; // Windows: __acrt_iob_func(2) llvm::GlobalVariable *StderrVar; // elsewhere: the C library's stderr ExceptionHandler &Exceptions; + bool LibraryMode = false; + llvm::GlobalVariable *UserLine; llvm::Value *DivZeroMsg; llvm::Value *OutOfBoundsMsg; llvm::Value *EnumRangeMsg; @@ -31,6 +33,10 @@ public: RuntimeCheck(llvm::Module &M, llvm::LLVMContext &C, llvm::IRBuilder<> &B, ExceptionHandler &EH); + void setLibraryMode(bool Enabled) { LibraryMode = Enabled; } + llvm::Value *lineValue(int Line); + void setUserLine(int Line); + // Format a runtime diagnostic (printf-style) and write it to stderr. void emitStderr(llvm::Value *Msg, llvm::ArrayRef FmtArgs = {}); diff --git a/include/cps/SourceUnit.h b/include/cps/SourceUnit.h index db9ad30..34266ac 100644 --- a/include/cps/SourceUnit.h +++ b/include/cps/SourceUnit.h @@ -9,5 +9,6 @@ struct SourceUnit { std::string Path; const std::vector> &Statements; std::vector Visible; + bool IsLibrary = false; }; } -- cgit v1.3.1-4-g156e