Continuations
This commit is contained in:
parent
88c90220fe
commit
026218ddbd
13 changed files with 255 additions and 15 deletions
|
@ -145,6 +145,10 @@ open class Preprocessor {
|
|||
}
|
||||
}
|
||||
|
||||
// Delimited Continuations
|
||||
Functor.of("reset/3") -> Reset(args[0] as Goal, args[1], args[2])
|
||||
Functor.of("shift/1") -> Shift(args[0])
|
||||
|
||||
// IO
|
||||
Functor.of("write/1") -> Write(args[0])
|
||||
Functor.of("nl/0") -> Nl
|
||||
|
@ -155,7 +159,7 @@ open class Preprocessor {
|
|||
Functor.of("member/2") -> Member(args[0], args[1] as PList)
|
||||
|
||||
// Meta
|
||||
Functor.of("call/1") -> Call(args[0] as Goal)
|
||||
Functor.of("call/1") -> Call(args[0])
|
||||
Functor.of("ignore/1") -> Ignore(args[0] as Goal)
|
||||
|
||||
// Other
|
||||
|
|
|
@ -3,9 +3,10 @@ package parser.grammars
|
|||
import com.github.h0tk3y.betterParse.combinators.*
|
||||
import com.github.h0tk3y.betterParse.grammar.parser
|
||||
import com.github.h0tk3y.betterParse.parser.Parser
|
||||
import com.github.h0tk3y.betterParse.utils.Tuple2
|
||||
import prolog.ast.arithmetic.Float
|
||||
import prolog.ast.arithmetic.Integer
|
||||
import prolog.ast.lists.List
|
||||
import prolog.ast.lists.List as PList
|
||||
import prolog.ast.terms.*
|
||||
import prolog.builtins.Dynamic
|
||||
import prolog.ast.lists.List.Empty
|
||||
|
@ -96,14 +97,19 @@ open class TermsGrammar : Tokens() {
|
|||
if (t2 == null) t1 else CompoundTerm(Atom(t2!!.t1), listOf(t1, t2!!.t2))
|
||||
}
|
||||
|
||||
protected val not: Parser<Term> by (notOp * parser(::term900)) use {
|
||||
CompoundTerm(Atom(t1.text), listOf(t2))
|
||||
}
|
||||
protected val term900: Parser<Term> by (not or term700)
|
||||
|
||||
protected val op1000: Parser<String> by (comma) use { text }
|
||||
protected val term1000: Parser<Term> by (term700 * zeroOrMore(op1000 * term700)) use {
|
||||
t2.fold(t1) { acc, (op, term) -> CompoundTerm(Atom(op), listOf(acc, term)) }
|
||||
protected val term1000: Parser<Term> by (term900 * zeroOrMore(op1000 * term900)) use {
|
||||
constructRightAssociative(t1, t2)
|
||||
}
|
||||
|
||||
protected val op1100: Parser<String> by (semicolon) use { text }
|
||||
protected val term1100: Parser<Term> by (term1000 * zeroOrMore(op1100 * term1000)) use {
|
||||
t2.fold(t1) { acc, (op, term) -> CompoundTerm(Atom(op), listOf(acc, term)) }
|
||||
constructRightAssociative(t1, t2)
|
||||
}
|
||||
|
||||
protected val dynamic: Parser<Term> by (dynamicOp * functor) use {
|
||||
|
@ -117,12 +123,12 @@ open class TermsGrammar : Tokens() {
|
|||
}
|
||||
|
||||
// Lists
|
||||
protected val list: Parser<List> by (-leftBracket * separated(
|
||||
protected val list: Parser<PList> by (-leftBracket * separated(
|
||||
parser(::termNoConjunction),
|
||||
comma,
|
||||
acceptZero = true
|
||||
) * -rightBracket) use {
|
||||
var list: List = Empty
|
||||
var list: PList = Empty
|
||||
// Construct the list in reverse order
|
||||
for (term in this.terms.reversed()) {
|
||||
list = Cons(term, list)
|
||||
|
@ -139,4 +145,12 @@ open class TermsGrammar : Tokens() {
|
|||
protected val body: Parser<Body> by term use { this as Body }
|
||||
|
||||
override val rootParser: Parser<Any> by term
|
||||
|
||||
fun constructRightAssociative(left: Term, pairs: List<Tuple2<String, Term>>): Term {
|
||||
if (pairs.isEmpty()) return left
|
||||
|
||||
val (name, next) = pairs.first()
|
||||
val remainingPairs = pairs.drop(1)
|
||||
return CompoundTerm(Atom(name), listOf(left, constructRightAssociative(next, remainingPairs)))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,6 +21,8 @@ abstract class Tokens : Grammar<Any>() {
|
|||
protected val semicolon: Token by literalToken(";")
|
||||
// 1000
|
||||
protected val comma: Token by literalToken(",")
|
||||
// 900
|
||||
protected val notOp: Token by literalToken("\\+")
|
||||
// 700
|
||||
protected val univOp: Token by literalToken("=..")
|
||||
protected val notEquivalent: Token by literalToken("\\==")
|
||||
|
|
|
@ -9,6 +9,7 @@ import prolog.ast.terms.Atom
|
|||
import prolog.ast.terms.Body
|
||||
import prolog.ast.terms.Goal
|
||||
import prolog.flags.AppliedCut
|
||||
import prolog.flags.AppliedShift
|
||||
import prolog.logic.applySubstitution
|
||||
import prolog.logic.numbervars
|
||||
|
||||
|
@ -46,7 +47,7 @@ class Cut() : Atom("!") {
|
|||
/**
|
||||
* Conjunction (and). True if both Goal1 and Goal2 are true.
|
||||
*/
|
||||
class Conjunction(val left: LogicOperand, private val right: LogicOperand) :
|
||||
open class Conjunction(val left: LogicOperand, private val right: LogicOperand) :
|
||||
LogicOperator(Atom(","), left, right) {
|
||||
override fun satisfy(subs: Substitutions): Answers = sequence {
|
||||
// Satisfy the left part first, which either succeeds or fails
|
||||
|
@ -93,6 +94,36 @@ class Conjunction(val left: LogicOperand, private val right: LogicOperand) :
|
|||
yield(Result.failure(it))
|
||||
}
|
||||
) ?: yield(Result.failure(AppliedCut()))
|
||||
} else if (exception is AppliedShift) {
|
||||
if (exception.cont == null) {
|
||||
// Goal should be our right operand
|
||||
yield(Result.failure(AppliedShift(exception.subs, exception.ball, right as Goal)))
|
||||
} else {
|
||||
val leftSubs = exception.subs
|
||||
right.satisfy(subs + leftSubs).forEach { right ->
|
||||
right.fold(
|
||||
// If the right part succeeds, yield the result with the left substitutions
|
||||
onSuccess = { rightSubs ->
|
||||
yield(Result.success(leftSubs + rightSubs))
|
||||
},
|
||||
// If the right part fails, check if it's a cut
|
||||
onFailure = { exception ->
|
||||
if (exception is AppliedCut) {
|
||||
if (exception.subs != null) {
|
||||
// If it's a cut, yield the result with the left substitutions
|
||||
yield(Result.failure(AppliedCut(leftSubs + exception.subs)))
|
||||
} else {
|
||||
yield(Result.failure(AppliedCut()))
|
||||
}
|
||||
return@sequence
|
||||
}
|
||||
|
||||
// If it's not a cut, yield the failure
|
||||
yield(Result.failure(exception))
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 2. Any other failure should be returned as is
|
||||
yield(Result.failure(exception))
|
||||
|
|
66
src/prolog/builtins/delimitedContinuationsOperators.kt
Normal file
66
src/prolog/builtins/delimitedContinuationsOperators.kt
Normal file
|
@ -0,0 +1,66 @@
|
|||
package prolog.builtins
|
||||
|
||||
import prolog.Answers
|
||||
import prolog.Substitutions
|
||||
import prolog.ast.arithmetic.Integer
|
||||
import prolog.ast.terms.Atom
|
||||
import prolog.ast.terms.CompoundTerm
|
||||
import prolog.ast.terms.Goal
|
||||
import prolog.ast.terms.Structure
|
||||
import prolog.ast.terms.Term
|
||||
import prolog.flags.AppliedShift
|
||||
import prolog.logic.unifyLazy
|
||||
|
||||
class Reset(private val goal: Goal, private val term1: Term, private val cont: Term) :
|
||||
Structure(Atom("reset"), listOf(goal, term1, cont)) {
|
||||
override fun satisfy(subs: Substitutions): Answers = sequence {
|
||||
goal.satisfy(subs).forEach { goalResult ->
|
||||
goalResult.fold(
|
||||
// If Goal succeeds, then reset/3 also succeeds and binds Cont and Term1 to 0.
|
||||
onSuccess = { goalSubs ->
|
||||
// Unify Cont with 0
|
||||
unifyLazy(cont, Integer(0), goalSubs).forEach { contResult ->
|
||||
contResult.map { contSubs ->
|
||||
yield(Result.success(goalSubs + contSubs))
|
||||
// // Unify Term1 with 0
|
||||
// unifyLazy(term1, Integer(0), goalSubs + contSubs).forEach { termResult ->
|
||||
// termResult.map { termSubs ->
|
||||
// yield(Result.success(goalSubs + termSubs + contSubs))
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
// TODO
|
||||
// val conjunction = Conjunction(Unify(term1, Integer(0)), Unify(cont, Integer(0)))
|
||||
// yieldAll(conjunction.satisfy(goalSubs))
|
||||
},
|
||||
onFailure = { failure ->
|
||||
// If at some point Goal calls shift(Term2), then its further execution is suspended.
|
||||
// Reset/3 succeeds immediately, binding Term1 to Term2 and Cont to the remainder of Goal.
|
||||
// If Goal fails, then reset also fails.
|
||||
// yield(Result.failure(failure))
|
||||
|
||||
// Unify Term1 with the ball
|
||||
if (failure is AppliedShift) {
|
||||
require(failure.cont != null) { "Shift must have a continuation" }
|
||||
val newSubs: Substitutions = mapOf(
|
||||
term1 to failure.ball,
|
||||
cont to failure.cont
|
||||
)
|
||||
yield(Result.success(failure.subs + newSubs))
|
||||
} else {
|
||||
yield(Result.failure(failure))
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Variables that have been bound during the procedure called by reset/3 stay bound after a shift/1:
|
||||
*/
|
||||
class Shift(private val ball: Term) : Structure(Atom("shift"), listOf(ball)) {
|
||||
override fun satisfy(subs: Substitutions): Answers = sequenceOf(Result.failure(AppliedShift(subs, ball)))
|
||||
}
|
|
@ -50,6 +50,7 @@ object Nl : Atom("nl"), Satisfiable {
|
|||
class WriteLn(private val term: Term) : Conjunction(Write(term), Nl) {
|
||||
constructor(message: String) : this(Atom(message))
|
||||
override fun applySubstitution(subs: Substitutions): WriteLn = WriteLn(applySubstitution(term, subs))
|
||||
override fun toString(): String = "writeln($term)"
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -7,7 +7,9 @@ import prolog.ast.lists.List.Cons
|
|||
import prolog.ast.lists.List.Empty
|
||||
import prolog.ast.terms.Atom
|
||||
import prolog.ast.terms.Operator
|
||||
import prolog.ast.terms.Structure
|
||||
import prolog.ast.terms.Term
|
||||
import prolog.logic.applySubstitution
|
||||
|
||||
class Member(private val element: Term, private val list: List) : Operator(Atom("member"), element, list) {
|
||||
private var solution: Operator = when (list) {
|
||||
|
@ -20,5 +22,10 @@ class Member(private val element: Term, private val list: List) : Operator(Atom(
|
|||
|
||||
override fun satisfy(subs: Substitutions): Answers = solution.satisfy(subs)
|
||||
|
||||
override fun applySubstitution(subs: Substitutions): Member = Member(
|
||||
applySubstitution(element, subs),
|
||||
applySubstitution(list, subs) as List
|
||||
)
|
||||
|
||||
override fun toString(): String = "$element ∈ $list"
|
||||
}
|
||||
|
|
|
@ -5,10 +5,15 @@ import prolog.Substitutions
|
|||
import prolog.ast.terms.Atom
|
||||
import prolog.ast.terms.Goal
|
||||
import prolog.ast.terms.Operator
|
||||
import prolog.ast.terms.Term
|
||||
import prolog.flags.AppliedCut
|
||||
import prolog.logic.applySubstitution
|
||||
|
||||
class Call(private val goal: Goal) : Operator(Atom("call"), null, goal) {
|
||||
override fun satisfy(subs: Substitutions): Answers = goal.satisfy(subs)
|
||||
class Call(private val goal: Term) : Operator(Atom("call"), null, goal) {
|
||||
override fun satisfy(subs: Substitutions): Answers {
|
||||
val appliedGoal = applySubstitution(goal, subs) as Goal
|
||||
return appliedGoal.satisfy(subs)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
14
src/prolog/flags/AppliedShift.kt
Normal file
14
src/prolog/flags/AppliedShift.kt
Normal file
|
@ -0,0 +1,14 @@
|
|||
package prolog.flags
|
||||
|
||||
import prolog.Substitutions
|
||||
import prolog.ast.terms.Goal
|
||||
import prolog.ast.terms.Term
|
||||
|
||||
/**
|
||||
* An exception that indicates that a shift has been applied in the Prolog engine.
|
||||
*/
|
||||
data class AppliedShift(
|
||||
val subs: Substitutions,
|
||||
val ball: Term,
|
||||
val cont: Term? = null,
|
||||
) : Throwable()
|
Reference in a new issue