minor fixes, fix dateParser

pawelkaczor · Jun 20, 2022 · 1e5e642 · 1e5e642
1 parent 468594a
commit 1e5e642
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/main/scala/br/com/virsox/scalexpr/BinaryExpression.scala b/src/main/scala/br/com/virsox/scalexpr/BinaryExpression.scala
@@ -2,7 +2,6 @@ package br.com.virsox.scalexpr
 
 import br.com.virsox.scalexpr.Context.{ContextLike, EmptyContext}
 
-import scala.math.Ordering
 import scala.reflect.runtime.universe._
 
 /** *

diff --git a/src/main/scala/br/com/virsox/scalexpr/DateParser.scala b/src/main/scala/br/com/virsox/scalexpr/DateParser.scala
@@ -49,22 +49,28 @@ trait DateParser {
     )
 
   // months with 31 days
-  val months31 = Seq(1, 3, 5, 7, 8, 10, 12)
+  val months31: Seq[Int] = Seq(1, 3, 5, 7, 8, 10, 12)
 
   // months with 30 days
-  val months30 = Seq(4, 6, 9, 11)
+  val months30: Seq[Int] = Seq(4, 6, 9, 11)
 
   // parses a date and validates it
   def dateParser[_: P]: P[String] =
     P(yearParser.! ~ "-" ~ monthParser.! ~ "-" ~ dayParser.!)
       .map { case (year, month, day) => (year.toInt, month.toInt, day.toInt) }
       .filter {
         case (year, month, day) =>
-          if (months31.contains(month) && day > 31) false
-          else if (months30.contains(month) && day > 30) false
-          else if ((year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)) && day > 29) false // leap year
-          else if (day > 28) false
-          true
+          if (months31.contains(month) && day > 31) {
+            false
+          } else if (months30.contains(month) && day > 30) {
+            false
+          } else if ((year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)) && day > 29) {
+            false // leap year
+          } else if (day > 28) {
+            false
+          } else {
+            true
+          }
       }
       .!
 

diff --git a/src/main/scala/br/com/virsox/scalexpr/Expression.scala b/src/main/scala/br/com/virsox/scalexpr/Expression.scala
@@ -4,7 +4,6 @@ import java.time.Instant
 
 import br.com.virsox.scalexpr.Context.{ContextLike, EmptyContext}
 
-import scala.math.Ordering
 import scala.reflect.runtime.universe
 import scala.reflect.runtime.universe._