Skip to content

[fix] Type checking for functions with pre/post condition annotations #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2025
Merged

[fix] Type checking for functions with pre/post condition annotations #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions Src/PCompiler/CompilerCore/TypeChecker/Analyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ public static Scope AnalyzeCompilationUnit(ICompilerConfiguration config,
FunctionValidator.CheckAllPathsReturn(handler, machineFunction);
}

// Step 3b: for PVerifier, fill in body of Invariants, Axioms, Init conditions and Pure functions
// Step 3b: for PVerifier, fill in body of Invariants, Axioms, Init conditions and Pure functions and functions with pre/post conditions
foreach (var inv in globalScope.Invariants)
{
var ctx = (PParser.InvariantDeclContext) inv.SourceLocation;
var ctx = (PParser.InvariantDeclContext)inv.SourceLocation;
var temporaryFunction = new Function(inv.Name, inv.SourceLocation)
{
Scope = globalScope
Expand Down Expand Up @@ -78,6 +78,22 @@ public static Scope AnalyzeCompilationUnit(ICompilerConfiguration config,
}
}

foreach (var func in allFunctions.Where(func => func.Role.HasFlag(FunctionRole.Foreign)))
{
// populate pre/post conditions
var ctx = (PParser.ForeignFunDeclContext)func.SourceLocation;
foreach (var req in ctx._requires)
{
var preExpr = PopulateExpr(func, req, PrimitiveType.Bool, handler);
func.AddRequire(preExpr);
}
foreach (var post in ctx._ensures)
{
var postExpr = PopulateExpr(func, post, PrimitiveType.Bool, handler);
func.AddEnsure(postExpr);
}
}

// Step 2b: Validate no static handlers
foreach (var machine in globalScope.Machines)
{
Expand Down
12 changes: 1 addition & 11 deletions Src/PCompiler/CompilerCore/TypeChecker/DeclarationVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,17 +735,7 @@ public override object VisitForeignFunDecl(PParser.ForeignFunDeclContext context

var exprVisitor = new ExprVisitor(temporaryFunction, Handler);

// (REQUIRES requires+=expr SEMI)*
foreach (var req in context._requires)
{
fun.AddRequire(exprVisitor.Visit(req));
}

// (ENSURES ensures+=expr SEMI)*
foreach (var ensure in context._ensures)
{
fun.AddEnsure(exprVisitor.Visit(ensure));
}
// pre/post conditions are handled in a later phase

return fun;
}
Expand Down
Loading