fix value signature not having return type indexed

Author: arvyy

src/main/scala/scmindex/core/SCMIndexEntry.scala

@@ -117,11 +117,11 @@ object SCMIndexEntry {
     e.signature match {
       case SigCaseLambda(cases) => cases.flatMap(returnTypesInLambda)
       case l: SigLambda => returnTypesInLambda(l)
+      case SigValue(predicate) => List(predicate)
       case SigSyntaxRules(keywords, patterns) => patterns.flatMap {
         case PatternAndType(_, Some(ret)) => returnType(ret)
         case _ => List()
       }
-      case _ => List()
     }
   }
 
@@ -449,6 +449,7 @@ object SCMIndexEntry {
 
   def serializeParameterType(t: ParamType): Sexpr = {
     t match {
+      case Unknown => SexprSymbol("unknown") // should never happen
       case Ellipsis => SexprSymbol("...")
       case LiteralFalse => SexprBool(false)
       case Predicate(identifier) => SexprSymbol(identifier)

src/main/scala/scmindex/core/Sexpr.scala

@@ -3,59 +3,14 @@ package scmindex.core
 import scala.annotation.tailrec
 
 sealed trait Sexpr {
-  def write(): String = toString()
-}
-
-case class SexprBool(value: Boolean) extends Sexpr {
-  override def toString: String = {
-    if (value) "#t" else "#f"
-  }
-  override def write() = toString()
-}
-case class SexprSymbol(name: String) extends Sexpr {
-  override def toString: String = name
-  override def write() = {
-    if (name.contains("|")) {
-      "|" +
-      name
-        .replace("\\", "\\\\")
-        .replace("|", "\\|")
-      + "|"
-    } else name
-  }
-}
-case class SexprString(value: String) extends Sexpr {
-  override def toString: String = value
-  override def write() = 
-    "\"" +
-    value
-      .replace("\\", "\\\\") 
-      .replace("\n", "\\\\n")
-      .replace("\r", "\\\\r")
-      .replace("\t", "\\\\t")
-      + "\""
-}
-case class SexprNumber(i: Int) extends Sexpr {
-  override def toString: String = "" + i
-  override def write() = toString()
-}
-case class SexprPair(car: Sexpr, cdr: Sexpr) extends Sexpr {
-  def stringify(toStr: Sexpr => String) = {
-    val (lst, tail) = Sexpr.pairToList(this)
-    val lstStr = lst.map(toStr(_)).mkString(" ")
-    val tailStr = tail match {
-      case SexprNull => ""
-      case _ => " . " + toStr(tail)
-    }
-    "(" + lstStr + tailStr + ")"
-  }
-  override def toString: String = stringify(sexpr => sexpr.toString)
-  override def write() = stringify(sexpr => sexpr.write())
-}
-
-case object SexprNull extends Sexpr {
-  override def toString: String = "()"
+  override def toString(): String = SexprWriter.display(this)
 }
+case class SexprBool(value: Boolean) extends Sexpr
+case class SexprSymbol(name: String) extends Sexpr
+case class SexprString(value: String) extends Sexpr
+case class SexprNumber(i: Int) extends Sexpr
+case class SexprPair(car: Sexpr, cdr: Sexpr) extends Sexpr
+case object SexprNull extends Sexpr { }
 
 object Sexpr {
   def parseListToPairs(value: List[Sexpr]): Sexpr = {

src/main/scala/scmindex/core/SexprWriter.scala

@@ -0,0 +1,55 @@
+package scmindex.core
+
+object SexprWriter {
+
+  def stringifyPair(pair: SexprPair, toStr: Sexpr => String) = {
+    val (lst, tail) = Sexpr.pairToList(pair)
+    val lstStr = lst.map(toStr(_)).mkString(" ")
+    val tailStr = tail match {
+      case SexprNull => ""
+      case _ => " . " + toStr(tail)
+    }
+    "(" + lstStr + tailStr + ")"
+  }
+
+  def writeString(value: String): String = {
+    "\"" +
+    value
+      .replace("\\", "\\\\") 
+      .replace("\n", "\\\\n")
+      .replace("\r", "\\\\r")
+      .replace("\t", "\\\\t")
+      + "\""
+  }
+
+  def writeSymbol(name: String): String = {
+    if (name.contains("|")) {
+      "|" +
+      name
+        .replace("\\", "\\\\")
+        .replace("|", "\\|")
+      + "|"
+    } else name
+  }
+
+  def display(sexpr: Sexpr): String = {
+    sexpr match {
+      case SexprBool(value) => if value then "#t" else "#f"
+      case SexprNull => "()"
+      case SexprNumber(i) => "" + i
+      case pair: SexprPair => stringifyPair(pair, display)
+      case SexprSymbol(name) => name
+      case SexprString(value) => value
+    }
+  }
+
+  def write(sexpr: Sexpr): String = {
+    sexpr match {
+      case SexprString(value) => writeString(value)
+      case SexprSymbol(name) => writeSymbol(name)
+      case pair: SexprPair => stringifyPair(pair, write)
+      case _ => display(sexpr)
+    }
+  }
+
+}

src/main/scala/scmindex/persistance/SqliteStorage.scala

@@ -2,6 +2,8 @@ package scmindex.persistance
 
 import javax.sql.DataSource
 import scmindex.core.*
+import scmindex.core.SexprWriter.*
+import scmindex.core.SCMIndexEntry.*
 import cats.effect.IO
 import org.flywaydb.core.Flyway
 import doobie.*
@@ -56,14 +58,14 @@ object SqliteStorage {
       def saveSingle(e: SCMIndexEntry): ConnectionIO[Int] = {
         def saveInternalSingle(e: SCMIndexEntrySingle, groupId: Option[Int]): ConnectionIO[Int] = {
           for {
-            id <- sql"insert into index_entry(group_id, lib, name, signature, description) values(${groupId}, ${e.lib}, ${e.name}, ${SCMIndexEntry.serializeSignature(e.signature).write()}, ${e.description})"
+            id <- sql"insert into index_entry(group_id, lib, name, signature, description) values(${groupId}, ${e.lib}, ${e.name}, ${write(serializeSignature(e.signature))}, ${e.description})"
               .update
               .withUniqueGeneratedKeys[Int]("id")
             _ <- e.tags.map(tag => {
                 sql"insert into index_entry_tag(index_entry_id, name) values(${id}, ${tag})".update.run
               }).sequence
             _ <- e.subsignatures.map(subsig => {
-                sql"insert into index_entry_subsignature(index_entry_id, name, signature) values(${id}, ${subsig.paramName}, ${SCMIndexEntry.serializeSubSignature(subsig.signature).write()})"
+                sql"insert into index_entry_subsignature(index_entry_id, name, signature) values(${id}, ${subsig.paramName}, ${write(serializeSubSignature(subsig.signature))})"
                   .update
                   .run
               }).sequence