From 1e087c8339eaa03d7174276288572528f189a977 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <Tibo.DePeuter@UGent.be>
Date: Wed, 30 Apr 2025 10:52:58 +0200
Subject: [PATCH] Fix double printing

---
 src/Main.kt                     | 3 ---
 src/interpreter/Preprocessor.kt | 7 +++++++
 src/repl/Repl.kt                | 8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Main.kt b/src/Main.kt
index a9ea4f8..cb40600 100644
--- a/src/Main.kt
+++ b/src/Main.kt
@@ -1,11 +1,8 @@
-import com.sun.org.apache.bcel.internal.util.Args
 import com.xenomachina.argparser.ArgParser
 import com.xenomachina.argparser.mainBody
 import interpreter.FileLoader
 import io.GhentPrologArgParser
 import io.Logger
-import prolog.Program
-import prolog.ast.logic.Clause
 import repl.Repl
 
 fun main(args: Array<String>) = mainBody {
diff --git a/src/interpreter/Preprocessor.kt b/src/interpreter/Preprocessor.kt
index a20535d..7ee95d0 100644
--- a/src/interpreter/Preprocessor.kt
+++ b/src/interpreter/Preprocessor.kt
@@ -2,6 +2,7 @@ package interpreter
 
 import io.Logger
 import prolog.ast.arithmetic.Expression
+import prolog.ast.arithmetic.Integer
 import prolog.ast.logic.Clause
 import prolog.ast.logic.Fact
 import prolog.ast.logic.LogicOperand
@@ -56,6 +57,8 @@ open class Preprocessor {
             Structure(Atom("fail"), emptyList()) -> Fail
             Atom("!") -> Cut()
             Structure(Atom("!"), emptyList()) -> Cut()
+            Atom("inf") -> Integer(Int.MAX_VALUE)
+            Atom("nl") -> Nl
             is Structure -> {
                 // Preprocess the arguments first to recognize builtins
                 val args = term.arguments.map { preprocess(it) }
@@ -115,6 +118,10 @@ open class Preprocessor {
                         Between(args[0] as Expression, args[1] as Expression, args[2] as Expression)
                     }
 
+                    // Other
+                    term.functor == "write/1" -> Write(args[0])
+                    term.functor == "read/1" -> Read(args[0])
+
                     else -> term
                 }
             }
diff --git a/src/repl/Repl.kt b/src/repl/Repl.kt
index 52cce29..5704cdc 100644
--- a/src/repl/Repl.kt
+++ b/src/repl/Repl.kt
@@ -24,19 +24,21 @@ class Repl {
     }
 
     fun query(): Answers {
-        val queryString = io.prompt("?-", { "" })
+        val queryString = io.prompt("?-", { "|  " })
         val simpleQuery = parser.parse(queryString)
         val query = preprocessor.preprocess(simpleQuery)
+        Logger.debug("Satisfying query: $query")
         return query.satisfy(emptyMap())
     }
 
     fun printAnswers(answers: Answers) {
         val knownCommands = setOf(";", "a", ".", "h")
 
-        if (answers.none()) {
+        val iterator = answers.iterator()
+
+        if (!iterator.hasNext()) {
             io.say("false.")
         } else {
-            val iterator = answers.iterator()
             var previous = iterator.next()
             io.say(prettyPrint(previous))