fix: Wrong implementation for init/tail/(runtime) head

Iltotore · Sep 20, 2024 · 91f4a64 · 91f4a64
1 parent a7e1d30
commit 91f4a64
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/main/src/io/github/iltotore/iron/constraint/collection.scala b/main/src/io/github/iltotore/iron/constraint/collection.scala
@@ -234,10 +234,13 @@ object collection:
 
       expr.toExprList match
         case Some(list) =>
-          list
-            .init
-            .map(applyConstraint(_, constraintExpr))
-            .foldLeft(Expr(true))((e, t) => '{ $e && $t })
+          list match
+            case Nil => Expr(true)
+            case _ =>
+              list
+                .init
+                .map(applyConstraint(_, constraintExpr))
+                .foldLeft(Expr(true))((e, t) => '{ $e && $t })
 
         case None => '{ $expr.init.forall(c => ${ applyConstraint('c, constraintExpr) }) }
 
@@ -284,10 +287,13 @@ object collection:
 
       expr.toExprList match
         case Some(list) =>
-          list
-            .tail
-            .map(applyConstraint(_, constraintExpr))
-            .foldLeft(Expr(true))((e, t) => '{ $e && $t })
+          list match
+            case Nil => Expr(true)
+            case _ =>
+              list
+                .tail
+                .map(applyConstraint(_, constraintExpr))
+                .foldLeft(Expr(true))((e, t) => '{ $e && $t })
 
         case None => '{ $expr.tail.forall(c => ${ applyConstraint('c, constraintExpr) }) }
 
@@ -381,7 +387,7 @@ object collection:
             case Some(head) => applyConstraint(head, constraintExpr)
             case None       => Expr(false)
 
-        case None => '{ $expr.exists(c => ${ applyConstraint('c, constraintExpr) }) }
+        case None => '{ $expr.headOption.exists(c => ${ applyConstraint('c, constraintExpr) }) }
 
     private def checkString[C, Impl <: Constraint[Char, C]](expr: Expr[String], constraintExpr: Expr[Impl])(using Quotes): Expr[Boolean] =
       val rflUtil = reflectUtil