make ad-hoc OutputChannel for warnings

tuProlog · Aug 28, 2020 · b6d6847 · b6d6847
1 parent 12ad9de
commit b6d6847
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 20 deletions.
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/ExecutionContext.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/ExecutionContext.kt
@@ -35,7 +35,7 @@ interface ExecutionContext : ExecutionContextAware {
         stdIn: InputChannel<String> = this.standardInput ?: InputChannel.stdIn(),
         stdOut: OutputChannel<String> = this.standardOutput ?: OutputChannel.stdOut(),
         stdErr: OutputChannel<String> = this.standardError ?: OutputChannel.stdErr(),
-        warnings: OutputChannel<PrologWarning> = this.warnings ?: OutputChannel.stdErr()
+        warnings: OutputChannel<PrologWarning> = this.warnings ?: OutputChannel.warn()
     ): Solver
 
     @JsName("apply")

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/ExecutionContextAware.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/ExecutionContextAware.kt
@@ -30,7 +30,7 @@ interface ExecutionContextAware {
             return mapOf(
                 STDOUT to OutputChannel.stdOut<String>(),
                 STDERR to OutputChannel.stdErr<String>(),
-                WARNINGS to OutputChannel.stdErr<PrologWarning>()
+                WARNINGS to OutputChannel.warn()
             )
         }
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverFactory.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverFactory.kt
@@ -43,7 +43,7 @@ interface SolverFactory {
 
     @JsName("defaultWarningsChannel")
     val defaultWarningsChannel: OutputChannel<PrologWarning>
-        get() = OutputChannel.stdErr()
+        get() = OutputChannel.warn()
 
     @JsName("solver")
     fun solverOf(

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/channel/Channels.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/channel/Channels.kt
@@ -1,7 +1,11 @@
 package it.unibo.tuprolog.solve.channel
 
+import it.unibo.tuprolog.solve.exception.PrologWarning
+
 internal expect fun stdin(): InputChannel<String>
 
 internal expect fun <T> stdout(): OutputChannel<T>
 
-internal expect fun <T> stderr(): OutputChannel<T>
+internal expect fun <T> stderr(): OutputChannel<T>
+
+internal expect fun warning(): OutputChannel<PrologWarning>
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/channel/OutputChannel.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/channel/OutputChannel.kt
@@ -1,6 +1,7 @@
 package it.unibo.tuprolog.solve.channel
 
 import it.unibo.tuprolog.solve.channel.impl.OutputChannelFromFunction
+import it.unibo.tuprolog.solve.exception.PrologWarning
 import kotlin.js.JsName
 import kotlin.jvm.JvmStatic
 
@@ -14,6 +15,10 @@ interface OutputChannel<T> : Channel<T> {
         @JsName("stdErr")
         fun <T> stdErr(): OutputChannel<T> = stderr()
 
+        @JvmStatic
+        @JsName("warning")
+        fun warn(): OutputChannel<PrologWarning> = warning()
+
         @JvmStatic
         @JsName("of")
         fun <T> of(consumer: (T) -> Unit): OutputChannel<T> = OutputChannelFromFunction(consumer)

diff --git a/solve/src/jsMain/kotlin/it/unibo/tuprolog/solve/channel/Channels.kt b/solve/src/jsMain/kotlin/it/unibo/tuprolog/solve/channel/Channels.kt
@@ -1,19 +1,15 @@
 package it.unibo.tuprolog.solve.channel
 
-internal actual fun stdin(): InputChannel<String> {
-    return InputChannel.of {
-        throw IllegalStateException("No default implementation of stdin on JS")
-    }
-}
+import it.unibo.tuprolog.solve.exception.PrologWarning
 
-internal actual fun <T> stderr(): OutputChannel<T> {
-    return OutputChannel.of {
-        console.error(it)
-    }
-}
+internal actual fun stdin(): InputChannel<String> =
+    InputChannel.of { throw IllegalStateException("No default implementation of stdin on JS") }
 
-internal actual fun <T> stdout(): OutputChannel<T> {
-    return OutputChannel.of {
-        print(it)
-    }
-}
+internal actual fun <T> stderr(): OutputChannel<T> =
+    OutputChannel.of { console.error(it) }
+
+internal actual fun <T> stdout(): OutputChannel<T> =
+    OutputChannel.of { print(it) }
+
+internal actual fun warning(): OutputChannel<PrologWarning> =
+    OutputChannel.of { console.warn(it.message) }
diff --git a/solve/src/jvmMain/kotlin/it/unibo/tuprolog/solve/channel/Channels.kt b/solve/src/jvmMain/kotlin/it/unibo/tuprolog/solve/channel/Channels.kt
@@ -1,5 +1,7 @@
 package it.unibo.tuprolog.solve.channel
 
+import it.unibo.tuprolog.solve.exception.PrologWarning
+
 internal actual fun stdin(): InputChannel<String> {
     return InputStreamChannel(System.`in`)
 }
@@ -9,5 +11,9 @@ internal actual fun <T> stderr(): OutputChannel<T> {
 }
 
 internal actual fun <T> stdout(): OutputChannel<T> {
-    return OutputChannel.of { System.out.print(it) }
+    return OutputChannel.of { print(it) }
+}
+
+internal actual fun warning(): OutputChannel<PrologWarning> {
+    return OutputChannel.of { System.err.println(it.message) }
 }