tdpeuter/2025LogProg-project-GhentProlog
tdpeuter/2025LogProg-project-GhentProlog
Archived
1
Fork 0
Code Issues Releases Activity Actions

fix: Univ

Browse source
This commit is contained in:
Tibo De Peuter 2025-05-18 20:28:58 +02:00
parent d50ec0f715
commit 61178cbeac
Signed by: tdpeuter
GPG key ID: 38297DE43F75FFE2
2 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/prolog/builtins/analysisOperators.kt
View file

@ -159,27 +159,31 @@ class ClauseOp(private val head: Head, private val body: Body) :
open class Univ(private val term: Term, private val list: Term) : Operator("=..", term, list) {
override fun satisfy(subs: Substitutions): Answers {
return when {
nonvariable(term, subs) && nonvariable(list, subs) -> {
val t = applySubstitution(term, subs)
if (variable(term, subs)) {
require(nonvariable(list, subs)) { "Arguments are not sufficiently instantiated" }
val l = applySubstitution(list, subs) as List
unifyLazy(t, listToTerm(l), subs)
}
require(nonvariable(l.head, subs)) { "Arguments are not sufficiently instantiated" }
variable(term, subs) && nonvariable(list, subs) -> {
val l = applySubstitution(list, subs) as List
val t = listToTerm(l)
unifyLazy(term, t, subs)
return unifyLazy(term, t, subs)
}
if (nonvariable(list, subs)) {
val l = applySubstitution(list, subs) as List
if (nonvariable(l.head, subs)) {
val t = applySubstitution(term, subs)
return unifyLazy(t, listToTerm(l), subs)
}
val t = applySubstitution(term, subs)
val expectedL = termToList(t)
return unifyLazy(expectedL, l, subs)
}
nonvariable(term, subs) && variable(list, subs) -> {
val t = applySubstitution(term, subs)
val l = termToList(t)
unifyLazy(l, list, subs)
}
else -> throw Exception("Arguments are not sufficiently instantiated")
}
return unifyLazy(l, list, subs)
}
protected open fun listToTerm(list: List): Term {

17
tests/prolog/builtins/AnalysisOperatorsTests.kt
View file

@ -568,6 +568,23 @@ class AnalysisOperatorsTests {
assertEquals(0, result.size, "Expected 0 results")
}
@Test
fun `univ extra debugging`() {
val univ = Univ(
Structure("baz", Variable("Foo")),
Cons(Variable("Baz"), Cons(Structure("foo", Integer(1)), Empty))
)
val result = univ.satisfy(emptyMap()).toList()
assertEquals(1, result.size, "Expected 1 result")
assertTrue(result[0].isSuccess, "Expected success")
val subs = result[0].getOrNull()!!
assertEquals(2, subs.size, "Expected 2 substitutions")
assertEquals(Atom("baz"), subs[Variable("Baz")], "Expected Baz to be baz")
assertEquals(Structure("foo", Integer(1)), subs[Variable("Foo")], "Expected Foo to be foo(1)")
}
@Test
fun `univ with two vars should throw`() {
val univ = Univ(Variable("X"), Variable("Y"))