#37 Basic implementation of JNumber conversions

* Also removed JNumber double constructor for Scala.js

Author: mdedetrich

benchmark/jvm/src/test/scala/scalajson/ast/JNumberConversionBenchmark.scala

@@ -3,7 +3,10 @@ package scalajson.ast
 import benchmark.Generators
 import org.scalameter.Bench
 
-object EqualsHashcodeBenchmark extends Bench.ForkedTime {
+/**
+  * Created by matthewdedetrich on 17/10/16.
+  */
+object PrivateBenchmark extends Bench.ForkedTime {
 
   performance of "privateMethods" in {
     measure method "hashcode" in {

benchmark/jvm/src/test/scala/scalajson/ast/EqualsHashcodeBenchmark.scala renamed to benchmark/jvm/src/test/scala/scalajson/ast/PrivateBenchmark.scala

@@ -50,20 +50,15 @@ final case class JString(value: String) extends JValue {
 }
 
 object JNumber {
-  def apply(value: Int): JNumber =
-    new JNumber(value.toString)(NumberFlags.intConstructed)
+  def apply(value: Int): JNumber = new JNumber(value.toString)
 
-  def apply(value: Integer): JNumber =
-    new JNumber(value.toString)(NumberFlags.intConstructed)
+  def apply(value: Integer): JNumber = new JNumber(value.toString)
 
-  def apply(value: Long): JNumber =
-    new JNumber(value.toString)(NumberFlags.longConstructed)
+  def apply(value: Long): JNumber = new JNumber(value.toString)
 
-  def apply(value: BigInt): JNumber =
-    new JNumber(value.toString())(NumberFlags.bigIntConstructed)
+  def apply(value: BigInt): JNumber = new JNumber(value.toString())
 
-  def apply(value: BigDecimal): JNumber =
-    new JNumber(value.toString())(NumberFlags.bigDecimalConstructed)
+  def apply(value: BigDecimal): JNumber = new JNumber(value.toString())
 
   /**
     * @param value
@@ -72,7 +67,7 @@ object JNumber {
   def apply(value: Double): JValue = value match {
     case n if n.isNaN => JNull
     case n if n.isInfinity => JNull
-    case _ => new JNumber(value.toString)(NumberFlags.doubleConstructed)
+    case _ => new JNumber(value.toString)
   }
 
   /**
@@ -82,12 +77,12 @@ object JNumber {
   def apply(value: Float): JValue = value match {
     case n if java.lang.Float.isNaN(n) => JNull
     case n if n.isInfinity => JNull
-    case _ => new JNumber(value.toString)(NumberFlags.floatConstructed)
+    case _ => new JNumber(value.toString)
   }
 
   def fromString(value: String): Option[JNumber] =
     value match {
-      case jNumberRegex(_ *) => Some(new JNumber(value)(0))
+      case jNumberRegex(_ *) => Some(new JNumber(value))
       case _ => None
     }
 
@@ -102,9 +97,7 @@ object JNumber {
   */
 // Due to a restriction in Scala 2.10, we cant override/replace the default apply method
 // generated by the compiler even when the constructor itself is marked private
-final class JNumber private[ast] (val value: String)(
-    private[ast] val constructedFlag: Int)
-    extends JValue {
+final class JNumber private[ast] (val value: String) extends JValue {
   override def toUnsafe: unsafe.JValue = unsafe.JNumber(value)
 
   override def toJsAny: js.Any = value.toDouble match {
@@ -142,85 +135,19 @@ final class JNumber private[ast] (val value: String)(
 
   def copy(value: String): JNumber =
     value match {
-      case jNumberRegex(_ *) => new JNumber(value)(0)
+      case jNumberRegex(_ *) => new JNumber(value)
       case _ => throw new NumberFormatException(value)
     }
 
-  def toInt: Option[Long] = {
-    if ((constructedFlag & NumberFlags.int) == NumberFlags.int)
-      Some(value.toInt)
-    else {
-      try {
-        val asInt = value.toInt
-        if (BigInt(value) == BigInt(asInt))
-          Some(asInt)
-        else
-          None
-      } catch {
-        case _: NumberFormatException => None
-      }
-    }
-  }
+  def toInt: Option[Int] = scalajson.ast.toInt(value)
 
-  def toLong: Option[Long] = {
-    if ((constructedFlag & NumberFlags.long) == NumberFlags.long)
-      Some(value.toLong)
-    else {
-      try {
-        val asLong = value.toLong
-        if (BigInt(value) == BigInt(asLong))
-          Some(asLong)
-        else
-          None
-      } catch {
-        case _: NumberFormatException => None
-      }
-    }
-  }
+  def toBigInt: Option[BigInt] = scalajson.ast.toBigInt(value)
 
-  def toBigInt: Option[BigInt] = {
-    if ((constructedFlag & NumberFlags.bigInt) == NumberFlags.bigInt)
-      Some(BigInt(value))
-    else {
-      try {
-        Some(BigInt(value))
-      } catch {
-        case _: NumberFormatException => None
-      }
-    }
-  }
-
-  def toBigDecimal: Option[BigDecimal] = {
-    try {
-      Some(BigDecimal(value))
-    } catch {
-      case _: NumberFormatException => None
-    }
-  }
+  def toLong: Option[Long] = scalajson.ast.toLong(value)
 
-  def toFloat: Option[Float] = {
-    if ((constructedFlag & NumberFlags.float) == NumberFlags.float)
-      Some(value.toFloat)
-    else {
-      val asFloat = value.toFloat
-      if (BigDecimal(value) == BigDecimal(asFloat.toDouble))
-        Some(asFloat)
-      else
-        None
-    }
-  }
+  def toDouble: Option[Double] = scalajson.ast.toDouble(value)
 
-  def toDouble: Option[Double] = {
-    if ((constructedFlag & NumberFlags.double) == NumberFlags.double)
-      Some(value.toDouble)
-    else {
-      val asDouble = value.toDouble
-      if (BigDecimal(value) == BigDecimal(asDouble))
-        Some(asDouble)
-      else
-        None
-    }
-  }
+  def toBigDecimal: Option[BigDecimal] = scalajson.ast.toBigDecimal(value)
 }
 
 /** Represents a JSON Boolean value, which can either be a