Skip to content

Replaced Dummynodes and fixed ProgramEdits getting turned into strings #964

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

Open
adidell01 wants to merge 1 commit into
base: nklose/biabduction-prototype
Choose a base branch
from
Open

Replaced Dummynodes and fixed ProgramEdits getting turned into strings #964

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
4 changes: 2 additions & 2 deletions src/main/scala/biabduction/BiAbduction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ object BiAbductionSolver {
case Some(t: Stmt) if t == abductionUtils.dummyEndStmt =>
val newBody = addToInnerBody(body, finalStmt)
val infPos = LineColumnPosition(m.pos.asInstanceOf[SourcePosition].end.get.line, m.pos.asInstanceOf[SourcePosition].end.get.column)
val infRes = finalStmt.map(stmt => " " + ProgramEdit(infPos, infPos, stmt.toString() + "\n"))
val infRes = finalStmt.map(stmt => ProgramEdit(infPos, infPos, " " + stmt.toString() + "\n"))
(newBody, infRes)

case Some(t: Stmt) if abductionUtils.isEndOfLoopStmt(t) =>
Expand All @@ -356,7 +356,7 @@ object BiAbductionSolver {
val newBody = body.transform { case stmt if stmt == loop => newLoop }

val infPos = LineColumnPosition(loop.pos.asInstanceOf[SourcePosition].end.get.line, loop.pos.asInstanceOf[SourcePosition].end.get.column)
val infRes = finalStmt.map(stmt => " " + ProgramEdit(infPos, infPos, stmt.toString() + "\n"))
val infRes = finalStmt.map(stmt => ProgramEdit(infPos, infPos, " " + stmt.toString() + "\n"))
(newBody, infRes)

case Some(t: Stmt) =>
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/supporters/MethodSupporter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ trait DefaultMethodVerificationUnitProvider extends VerifierComponent {
val allEdits = mAbd.map(_._2).getOrElse(Seq()) ++ generateLoopInvFixes(loopInvReses) ++ mInv.map(m2 => generatePostFixes(m2, framingReses)).getOrElse(Seq())

mFrame match {
case None => Failure(Internal(reason = InternalReason(DummyNode, "Resolving Biabduction results failed")))
case None => Failure(Internal(reason = InternalReason(method, "Resolving Biabduction results failed")))
case Some(m) =>
println("Original method: \n" + method.toString + "\nAbduced method: \n" + m.toString + "\nEdits: \n" + allEdits.mkString("\n"))
val sNoAbd = sInit.copy(doAbduction = false)
verify(sNoAbd, m) match {
case Seq(_: NonFatalResult) =>
val error = Internal(DummyReason)
val error = Internal(offendingNode = method, reason = InternalReason(method, "Inference successful"))
error.failureContexts = Seq(SiliconAbductionFailureContext(None, Some(allEdits)))
// We report an error with the fixes because fixes currently can only be contained in errors.
Failure(error)
Expand Down
Loading