Add number literal type (#47)

Author: TATSUNO Yasuhiro

samples/numberlit.ts

@@ -0,0 +1,13 @@
+declare module numberlit {
+
+    export type HttpStatuscode = 200 | 404 | 503 ;
+
+    // 1 to Int, 1.0 (which is valid-int) to Double
+    export function floating(prob: 0.1 | 0.5 | 1.0): 0.0 | 1
+
+    export interface Machine {
+        state?: 0 | 1;
+
+        setState(flag: 0 | 1 | boolean): 0 | 1;
+    }
+}

samples/numberlit.ts.scala

@@ -0,0 +1,25 @@
+
+import scala.scalajs.js
+import js.annotation._
+import js.|
+
+package numberlit {
+
+package numberlit {
+
+@js.native
+trait Machine extends js.Object {
+  var state: Int = js.native
+  def setState(flag: Int | Boolean): Int = js.native
+}
+
+@js.native
+@JSGlobal("numberlit")
+object Numberlit extends js.Object {
+  type HttpStatuscode = Int
+  def floating(prob: Double): Double | Int = js.native
+}
+
+}
+
+}

src/main/scala/org/scalajs/tools/tsimporter/Importer.scala

@@ -270,6 +270,12 @@ class Importer(val output: java.io.PrintWriter) {
       case ConstantType(StringLiteral(_)) =>
         TypeRef.String
 
+      case ConstantType(IntLiteral(i)) =>
+        TypeRef.Int
+
+      case ConstantType(DoubleLiteral(d)) =>
+        TypeRef.Double
+
       case ObjectType(List(IndexMember(_, TypeRefTree(CoreType("string"), _), valueType))) =>
         val valueTpe = typeToScala(valueType)
         TypeRef(QualifiedName.Dictionary, List(valueTpe))

src/main/scala/org/scalajs/tools/tsimporter/Trees.scala

@@ -109,7 +109,11 @@ object Trees {
 
   case class BooleanLiteral(value: Boolean) extends Literal
 
-  case class NumberLiteral(value: Double) extends Literal
+  sealed trait NumberLiteral extends Literal
+
+  case class IntLiteral(value: Int) extends NumberLiteral
+
+  case class DoubleLiteral(value: Double) extends NumberLiteral
 
   case class StringLiteral(value: String) extends Literal with PropertyName {
     override def name = value

src/main/scala/org/scalajs/tools/tsimporter/parser/TSDefLexical.scala

@@ -41,7 +41,6 @@ class TSDefLexical extends Lexical with StdTokens with ImplicitConversions {
             // not standard, but I guess it could happen nevertheless
             digits => digits.foldLeft(0L)(_ * 8 + _).toString
           }
-        | success("0")
       )
     | stringOf1(digit) ~ opt(stringOf1('.', digit)) ^^ {
         case part1 ~ part2 => part1 + (part2.getOrElse(""))

src/main/scala/org/scalajs/tools/tsimporter/parser/TSDefParser.scala

@@ -173,6 +173,7 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
   lazy val paramType: Parser[TypeTree] = (
       typeDesc
     | stringLiteral ^^ ConstantType
+    | numberLiteral ^^ ConstantType
   )
 
   lazy val optResultType =
@@ -216,6 +217,7 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
     | objectType
     | functionType
     | stringType
+    | numberType
     | typeQuery
     | tupleType
     | thisType
@@ -247,6 +249,9 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
   lazy val stringType: Parser[TypeTree] =
     stringLiteral ^^ ConstantType
 
+  lazy val numberType: Parser[TypeTree] =
+    numberLiteral ^^ ConstantType
+
   lazy val thisType: Parser[TypeTree] =
     "this" ^^^ PolymorphicThisType
 
@@ -319,6 +324,16 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
   lazy val stringLiteral: Parser[StringLiteral] =
     stringLit ^^ StringLiteral
 
+  lazy val numberLiteral: Parser[NumberLiteral] =
+    numericLit ^^ { s =>
+      val d = s.toDouble
+      if (!s.contains(".") && d.isValidInt) {
+        IntLiteral(d.toInt)
+      } else {
+        DoubleLiteral(d)
+      }
+    }
+
   private val isCoreTypeName =
     Set("any", "void", "number", "bool", "boolean", "string", "null", "undefined", "never")
 

src/main/scala/org/scalajs/tools/tsimporter/sc/Definitions.scala

@@ -296,6 +296,7 @@ object TypeRef {
   val Any = TypeRef(scala_js dot Name("Any"))
   val Dynamic = TypeRef(scala_js dot Name("Dynamic"))
   val Double = TypeRef(scala dot Name("Double"))
+  val Int = TypeRef(scala dot Name("Int"))
   val Boolean = TypeRef(scala dot Name("Boolean"))
   val String = TypeRef(java_lang dot Name("String"))
   val Object = TypeRef(scala_js dot Name("Object"))