Improve error rendering in exception

alllex · Oct 7, 2023 · 97ef2a8 · 97ef2a8
1 parent 7ccbde5
commit 97ef2a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/commonMain/kotlin/me/alllex/parsus/parser/ParseResult.kt b/src/commonMain/kotlin/me/alllex/parsus/parser/ParseResult.kt
@@ -65,6 +65,8 @@ data class UnmatchedToken(
     override val contextProvider: ParseErrorContextProvider? = null
 ) : ParseError() {
 
+    override fun toString(): String = describe()
+
     override fun describe(): String = format(
         message = "Unmatched token at offset=$offset, when expected: $expected",
         messageAtOffset = "Expected token: $expected"
@@ -77,6 +79,7 @@ data class MismatchedToken(
     override val contextProvider: ParseErrorContextProvider? = null,
 ) : ParseError() {
     override val offset: Int get() = found.offset
+    override fun toString(): String = describe()
     override fun describe(): String = format(
         message = "Mismatched token at offset=$offset, when expected: $expected, got: ${found.token}",
         messageAtOffset = "Expected token: $expected at offset=$offset, got: ${found.token}"
@@ -86,25 +89,31 @@ data class MismatchedToken(
 data class NoMatchingToken(
     override val offset: Int,
 ) : ParseError() {
+
+    override fun toString(): String = describe()
     override fun describe(): String = format(
         message = "No matching token at offset=$offset",
         messageAtOffset = "No matching token"
     )
 }
+
 data class NoViableAlternative(
     override val offset: Int,
 ) : ParseError() {
+    override fun toString(): String = describe()
     override fun describe(): String = format(
         message = "None of the alternatives succeeded at offset=$offset",
         messageAtOffset = "None of the alternatives succeeded"
     )
 }
+
 data class NotEnoughRepetition(override val offset: Int, val expectedAtLeast: Int, val actualCount: Int) : ParseError() {
+    override fun toString(): String = describe()
     override fun describe(): String = "Expected at least $expectedAtLeast, found $actualCount"
 }
 
 class ParseException(val error: ParseError) : Exception() {
-    override fun toString(): String = "ParseException($error)"
+    override fun toString(): String = "ParseException: ${error.describe()}"
 }
 
 inline fun <T, R> ParseResult<T>.map(f: (T) -> R): ParseResult<R> {

diff --git a/src/commonMain/kotlin/me/alllex/parsus/parser/ParsingContext.kt b/src/commonMain/kotlin/me/alllex/parsus/parser/ParsingContext.kt
@@ -182,6 +182,8 @@ internal class LastTokenMatchContext(
     var lastMatch: TokenMatch? = null,
 ) : ParseErrorContextProvider {
 
+    override fun toString() = "LastTokenMatchContext(currentOffset=$currentOffset, lastMatch=$lastMatch)"
+
     override fun getParseErrorContext(offset: Int): ParseErrorContext? {
         if (offset != currentOffset) {
             return null