eval -> toString

`elements` -> iterator

Author: halotukozak

src/main/scala/Markdown.scala

@@ -8,10 +8,4 @@ type MdContent = String | MdElement | Table
 opaque type MdUnit = Unit
 
 private class Markdown extends MdElement:
-  override def eval: String = evaluated.mkString("\n\n")
-
-extension (s: MdContent)
-  private def eval: String = s match
-    case s: String => s
-    case e: MdElement => e.eval
-    case t: Table => t.eval
+  override def toString: String = evaluated.mkString("\n\n")

src/main/scala/api.scala

@@ -9,7 +9,7 @@ def markdown(init: MdElement ?=> MdUnit): String =
   given m: MdElement = new Markdown
 
   init(using m)
-  m.eval
+  m.toString
 
 inline def text[Style <: TextStyle](inner: String)(using m: MdElement): MdUnit = m.add(textMacro[Style](inner))
 

src/main/scala/tables/Table.scala

@@ -7,12 +7,12 @@ import utils.{HasInner, MdElement}
 
 
 private[smark] final class Table extends HasInner[Row | Header]:
-  extension (ab: Iterable[String])
-    private def mkRow = ab.mkString("| ", " | ", " |")
+  extension (it: Iterator[String])
+    private def mkRow = it.mkString("| ", " | ", " |")
 
-  private[smark] def eval: String = elements.map {
-    case r: Row => r.elements.map(_.eval).mkRow
-    case h: Header => h.elements.map(_.name).mkRow + "\n" + h.elements.map(symbol).mkRow
+  override def toString: String = iterator.map {
+    case r: Row => r.iterator.map(_.toString).mkRow
+    case h: Header => h.iterator.map(_.name).mkRow + "\n" + h.iterator.map(symbol).mkRow
   }.mkString("\n")
 
 
@@ -50,5 +50,5 @@ given Conversion[String, Center] = Column.Center(_)
 given Conversion[String, None] = Column.None(_)
 
 private[smark] final class Cell extends MdElement:
-  override def eval: String = evaluated.mkString("\n")
+  override def toString: String = evaluated.mkString("\n")
 end Cell

src/main/scala/typography/Comment.scala

@@ -4,5 +4,4 @@ package typography
 import utils.MdElement
 
 final class Comment extends MdElement:
-  override def eval: String =
-    s"<!-- ${if evaluated.length == 1 then evaluated.mkString("\n") else evaluated.mkString("\n", "\n", "\n")} -->"
+  override def toString: String = s"<!-- ${if evaluated.length == 1 then evaluated.mkString("\n") else evaluated.mkString("\n", "\n", "\n")} -->"

src/main/scala/typography/Headings.scala

@@ -7,5 +7,4 @@ import utils.MdElement
 private[smark] type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6
 
 final class Heading[N <: HeadingLevel : ValueOf] extends MdElement:
-  override def eval: String =
-    evaluated.map(e => s"${"#" * valueOf[N]}$e").mkString("\n")
+  override def toString: String = evaluated.map(e => s"${"#" * valueOf[N]}$e").mkString("\n")

src/main/scala/typography/Paragraph.scala

@@ -4,4 +4,4 @@ package typography
 import utils.MdElement
 
 final class Paragraph extends MdElement:
-  override def eval: String = "\n" + evaluated.mkString("\n\n")
+  override def toString: String = "\n" + evaluated.mkString("\n\n")

src/main/scala/typography/Quote.scala

@@ -6,7 +6,7 @@ import typography.macros.textMacro
 import utils.MdElement
 
 private[smark] final class Quote[AlertType <: Alert : ValueOf] extends MdElement:
-  override def eval: String =
+  override def toString: String =
     (s"[!${valueOf[AlertType]}]" +: evaluated)
       .map(textMacro[Quoted])
       .mkString("\n")

src/main/scala/utils/HasInner.scala

@@ -1,10 +1,8 @@
 package halotukozak.smark
 package utils
 
-private[smark] abstract class HasInner[T](private var inner: Seq[T] = Nil):
-
-  final def elements: Seq[T] = inner
-
+private[smark] abstract class HasInner[T](private var inner: Seq[T] = Nil) extends Iterable[T]:
+  final def iterator: Iterator[T] = inner.iterator
   final def add(e: T): MdUnit = {
     inner = inner :+ e
   }.asInstanceOf

src/main/scala/utils/MdElement.scala

@@ -2,7 +2,4 @@ package halotukozak.smark
 package utils
 
 private[smark] trait MdElement extends HasInner[MdContent]:
-  def eval: String
-
-  final protected def evaluated: Seq[String] = elements.map(_.eval)
-  
+  final protected def evaluated: Seq[String] = iterator.map(_.toString).toSeq