Merge branch 'master' into jline-remove

Author: kzys

README.md

@@ -77,7 +77,7 @@ We invite you to help us build the future of Scala.<br>
 This is the best moment to participate, as everyone can make an impact.<br>
 
 ####SI-2712?
-If scalac will put it into 2.12, we’ll mimic their behaviour. But we have bigger plans for
+Since scalac merged a fix into 2.12, we’ll mimic their behaviour. But we have bigger plans for
 HK-types.
 
 

src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -27,7 +27,6 @@ class ScalaSettings extends Settings.SettingGroup {
   val g = ChoiceSetting("-g", "level", "Set level of generated debugging info.", List("none", "source", "line", "vars", "notailcalls"), "vars")
   val help = BooleanSetting("-help", "Print a synopsis of standard options")
   val nowarn = BooleanSetting("-nowarn", "Generate no warnings.")
-  val print = BooleanSetting("-print", "Print program with Scala-specific features removed.")
   val color = ChoiceSetting("-color", "mode", "Colored output", List("always", "never"/*, "auto"*/), "always"/* "auto"*/)
   val target = ChoiceSetting("-target", "target", "Target platform for object files. All JVM 1.5 targets are deprecated.",
     List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "jvm-1.8", "msil"),

src/dotty/tools/dotc/core/Constants.scala

@@ -167,12 +167,19 @@ object Constants {
     /** Convert constant value to conform to given type.
      */
     def convertTo(pt: Type)(implicit ctx: Context): Constant = {
-      def lowerBound(pt: Type): Type = pt.dealias.stripTypeVar match {
-        case tref: TypeRef if !tref.symbol.isClass => lowerBound(tref.info.bounds.lo)
-        case param: PolyParam => lowerBound(ctx.typerState.constraint.nonParamBounds(param).lo)
+      def classBound(pt: Type): Type = pt.dealias.stripTypeVar match {
+        case tref: TypeRef if !tref.symbol.isClass => classBound(tref.info.bounds.lo)
+        case param: PolyParam =>
+          ctx.typerState.constraint.entry(param) match {
+            case TypeBounds(lo, hi) =>
+              if (hi.classSymbol.isPrimitiveValueClass) hi //constrain further with high bound
+              else lo
+            case NoType => param.binder.paramBounds(param.paramNum).lo
+            case inst => classBound(inst)
+          }
         case pt => pt
       }
-      val target = lowerBound(pt).typeSymbol
+      val target = classBound(pt).typeSymbol
       if (target == tpe.typeSymbol)
         this
       else if ((target == defn.ByteClass) && isByteRange)

src/dotty/tools/dotc/printing/SyntaxHighlighting.scala

@@ -77,10 +77,15 @@ object SyntaxHighlighting {
         (n: @switch) match {
           case '/'  =>
             if (remaining.nonEmpty) {
-              takeChar() match {
-                case '/' => eolComment()
-                case '*' => blockComment()
-                case x => newBuf += '/'; remaining = x #:: remaining
+              remaining.head match {
+                case '/' =>
+                  takeChar()
+                  eolComment()
+                case '*' =>
+                  takeChar()
+                  blockComment()
+                case x =>
+                  newBuf += '/'
               }
             } else newBuf += '/'
           case '='  =>

src/dotty/tools/dotc/typer/Typer.scala

@@ -566,7 +566,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
   def typedIf(tree: untpd.If, pt: Type)(implicit ctx: Context) = track("typedIf") {
     val cond1 = typed(tree.cond, defn.BooleanType)
     val thenp1 = typed(tree.thenp, pt)
-    val elsep1 = typed(tree.elsep orElse untpd.unitLiteral withPos tree.pos, pt)
+    val elsep1 = typed(tree.elsep orElse (untpd.unitLiteral withPos tree.pos), pt)
     val thenp2 :: elsep2 :: Nil = harmonize(thenp1 :: elsep1 :: Nil)
     assignType(cpy.If(tree)(cond1, thenp2, elsep2), thenp2, elsep2)
   }

tests/pos/i1366.scala

@@ -0,0 +1,6 @@
+object Test {
+
+  val a: Char = 98
+  val c: (Char, Char) = ('a', 98)
+
+}