From 19880321d70077a84db72e11dfa6ecb91534234a Mon Sep 17 00:00:00 2001
From: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com>
Date: Thu, 6 Feb 2025 17:39:35 +0000
Subject: [PATCH] feat: implemented lexer-backed error builder, error messages
 are now based on predefined tokens

Co-authored-by: gc1523
---
 src/main/wacc/lexer.scala  | 10 ++++++++++
 src/main/wacc/parser.scala | 10 +++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/wacc/lexer.scala b/src/main/wacc/lexer.scala
index 6b47b63..4a810c0 100644
--- a/src/main/wacc/lexer.scala
+++ b/src/main/wacc/lexer.scala
@@ -80,5 +80,15 @@ object lexer {
   val stringLit = lexer.lexeme.string.ascii
   val implicits = lexer.lexeme.symbol.implicits
 
+  val errTokens = Seq(
+    lexer.nonlexeme.names.identifier.map(v => s"identifier $v"),
+    lexer.nonlexeme.integer.decimal32[Int].map(n => s"integer $n"),
+    lexer.nonlexeme.character.ascii.map(c => s"character literal $c"),
+    lexer.nonlexeme.string.ascii.map(s => s"string literal $s"),
+    character.whitespace.map(_ => "")
+  ) ++ desc.symbolDesc.hardKeywords.map { k =>
+    lexer.nonlexeme.symbol(k).as(s"keyword $k")
+  }
+
   def fully[A](p: Parsley[A]): Parsley[A] = lexer.fully(p)
 }
diff --git a/src/main/wacc/parser.scala b/src/main/wacc/parser.scala
index 609af07..86eced7 100644
--- a/src/main/wacc/parser.scala
+++ b/src/main/wacc/parser.scala
@@ -9,16 +9,17 @@ import parsley.errors.combinator._
 import parsley.syntax.zipped._
 import parsley.cats.combinator.{some}
 import cats.data.NonEmptyList
-
+import parsley.errors.DefaultErrorBuilder
+import parsley.errors.ErrorBuilder
+import parsley.errors.tokenextractors.LexToken
 
 object parser {
   import lexer.implicits.implicitSymbol
-  import lexer.{ident, integer, charLit, stringLit, negateCheck}
+  import lexer.{ident, integer, charLit, stringLit, negateCheck, errTokens}
   import ast._
 
   //error extensions
   extension [A](p: Parsley[A]) {
-
   //combines label and explain together into one function call
     def labelAndExplain(label: String, explanation: String): Parsley[A] = {
       p.label(label).explain(explanation)
@@ -46,6 +47,9 @@ object parser {
     case Expr
     case Pair
 
+  implicit val builder: ErrorBuilder[String] = new DefaultErrorBuilder with LexToken {
+    def tokens = errTokens
+  }
   def parse(input: String): Result[String, Program] = parser.parse(input)
   private val parser = lexer.fully(`<program>`)