From 0b46e364da0689040db70bcb2d7c66267580c827 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 1 Aug 2020 15:27:00 -0400 Subject: [PATCH] Enable -Yrangepos by default Ref https://github.com/scala/scala-dev/issues/472 --- .../tools/nsc/settings/ScalaSettings.scala | 2 +- .../scala/reflect/runtime/Settings.scala | 2 +- test/files/run/StubErrorTypeDef.check | 20 ++-- test/files/run/macro-rangepos-args.check | 2 +- test/files/run/sd187.check | 88 +++++++------- test/files/run/string-switch-pos.check | 52 ++++----- test/files/run/t6288.check | 110 +++++++++--------- test/files/run/t7271.check | 8 +- test/files/run/t7331a.check | 4 +- test/files/run/t7331c.check | 2 +- ...without_scala_reflect_typetag_lookup.check | 2 +- ...ala_reflect_typetag_manifest_interop.check | 2 +- 12 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 5061e46e5d3d..9cf9555dea88 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -251,7 +251,7 @@ trait ScalaSettings extends StandardScalaSettings with Warnings { _: MutableSett val Ydumpclasses = StringSetting ("-Ydump-classes", "dir", "Dump the generated bytecode to .class files (useful for reflective compilation that utilizes in-memory classloaders).", "") val stopAfter = PhasesSetting ("-Ystop-after", "Stop after") withAbbreviation ("-stop") // backward compat val stopBefore = PhasesSetting ("-Ystop-before", "Stop before") - val Yrangepos = BooleanSetting ("-Yrangepos", "Use range positions for syntax trees.") + val Yrangepos = BooleanSetting ("-Yrangepos", "Use range positions for syntax trees.", true) val Yvalidatepos = PhasesSetting ("-Yvalidate-pos", s"Validate positions after the given phases (implies ${Yrangepos.name})") withPostSetHook (_ => Yrangepos.value = true) val Yreifycopypaste = BooleanSetting ("-Yreify-copypaste", "Dump the reified trees in copypasteable representation.") val Ymacroexpand = ChoiceSetting ("-Ymacro-expand", "policy", "Control expansion of macros, useful for scaladoc and presentation compiler.", List(MacroExpand.Normal, MacroExpand.None, MacroExpand.Discard), MacroExpand.Normal) diff --git a/src/reflect/scala/reflect/runtime/Settings.scala b/src/reflect/scala/reflect/runtime/Settings.scala index df5af8820f73..4b8b771f52c5 100644 --- a/src/reflect/scala/reflect/runtime/Settings.scala +++ b/src/reflect/scala/reflect/runtime/Settings.scala @@ -46,7 +46,7 @@ private[reflect] class Settings extends MutableSettings { val XnoPatmatAnalysis = new BooleanSetting(false) val Xprintpos = new BooleanSetting(false) val Yposdebug = new BooleanSetting(false) - val Yrangepos = new BooleanSetting(false) + val Yrangepos = new BooleanSetting(true) val Yshowsymowners = new BooleanSetting(false) val Yshowsymkinds = new BooleanSetting(false) val breakCycles = new BooleanSetting(false) diff --git a/test/files/run/StubErrorTypeDef.check b/test/files/run/StubErrorTypeDef.check index 7290ee805b1e..a8185c21c7b2 100644 --- a/test/files/run/StubErrorTypeDef.check +++ b/test/files/run/StubErrorTypeDef.check @@ -1,18 +1,18 @@ -error: newSource1.scala:4: incompatible type in overriding -type D <: stuberrors.A (defined in class B); - found : stuberrors.E - required: <: stuberrors.A +error: newSource1.scala:4: Symbol 'type stuberrors.A' is missing from the classpath. +This symbol is required by 'class stuberrors.E'. +Make sure that type A is in your classpath and check for conflicting dependencies with `-Ylog-classpath`. +A full rebuild may help if 'E.class' was compiled against an incompatible version of stuberrors. new B { type D = E } - ^ + ^ error: newSource1.scala:4: Symbol 'type stuberrors.A' is missing from the classpath. This symbol is required by 'type stuberrors.B.D'. Make sure that type A is in your classpath and check for conflicting dependencies with `-Ylog-classpath`. A full rebuild may help if 'B.class' was compiled against an incompatible version of stuberrors. new B { type D = E } ^ -error: newSource1.scala:4: Symbol 'type stuberrors.A' is missing from the classpath. -This symbol is required by 'class stuberrors.E'. -Make sure that type A is in your classpath and check for conflicting dependencies with `-Ylog-classpath`. -A full rebuild may help if 'E.class' was compiled against an incompatible version of stuberrors. +error: newSource1.scala:4: incompatible type in overriding +type D <: stuberrors.A (defined in class B); + found : stuberrors.E + required: <: stuberrors.A new B { type D = E } - ^ + ^ diff --git a/test/files/run/macro-rangepos-args.check b/test/files/run/macro-rangepos-args.check index 8ad5168ad0d2..d779505c66c1 100644 --- a/test/files/run/macro-rangepos-args.check +++ b/test/files/run/macro-rangepos-args.check @@ -1 +1 @@ -Line: 3. Width: 1. +Line: 3. Width: 5. diff --git a/test/files/run/sd187.check b/test/files/run/sd187.check index 2257aa0f0ccd..3dc27be11380 100644 --- a/test/files/run/sd187.check +++ b/test/files/run/sd187.check @@ -1,23 +1,23 @@ [[syntax trees at end of patmat]] // newSource1.scala -[7]package [7] { - [7]class C extends [9][2302]scala.AnyRef { +[1:2302]package [1:1] { + [1:2302]class C extends [9:2302][2302]scala.AnyRef { [2302]def (): [9]C = [2302]{ [2302][2302][2302]C.super.(); [9]() }; - [107]def commonSubPattern([124]x: [127]): [107]AnyVal = [205]{ - [205] var rc6: [205]Boolean = [205]false; - [205] var x3: [205]String = [205][205][205]null.asInstanceOf[[205]String]; - [205]{ - [205]case val x1: [205]Any = [205]x; - [205]case8(){ - [313]if ([313][313]x1.isInstanceOf[[313]Option[_]]) - [325][325]matchEnd7([325]()) + [103:904]def commonSubPattern([124:130]x: [127:130]): [107]AnyVal = [205:206]{ + [205:206] var rc6: [205]Boolean = [205]false; + [205:206] var x3: [205]String = [205][205][205]null.asInstanceOf[[205]String]; + [205:206]{ + [205:206]case val x1: [205]Any = [205:206]x; + [205:206]case8(){ + [312:324]if ([313][313]x1.isInstanceOf[[313]Option[_]]) + [325:327][325]matchEnd7([325:327]()) else [313][313]case9() }; - [205]case9(){ - [412]if ([412][412]x1.isInstanceOf[[412]String]) + [205:206]case9(){ + [412:421]if ([412][412]x1.isInstanceOf[[412]String]) [412]{ [412][412]rc6 = [412]true; [412][412]x3 = [412]([412][412]x1.asInstanceOf[[412]String]: [412]String); @@ -29,32 +29,32 @@ else [412][412]case10() }; - [205]case10(){ - [612]if ([612][612]rc6.&&([627][627]x3.==([630]"6"))) + [205:206]case10(){ + [612:621]if ([612][612]rc6.&&([627][627]x3.==([630]"6"))) [712][712]matchEnd7([712][712]x3.hashCode()) else [612][612]case11() }; - [205]case11(){ - [205][205]matchEnd7([205]throw [205][205][205]new [205]MatchError([205]x1)) + [205:206]case11(){ + [205:206][205:206]matchEnd7([205:206]throw [205:206][205:206][205:206]new [205:206]MatchError([205:206]x1)) }; - [205]matchEnd7(x: [NoPosition]AnyVal){ - [205]x + [205:206]matchEnd7(x: [NoPosition]AnyVal){ + [205:206]x } } }; - [1007]def extractor([1017]x: [1020]): [1007]Any = [1027]{ - [1027]case val x1: [1027]Any = [1027]x; - [1027]case6(){ - [1120]if ([1120][1120]x1.isInstanceOf[[1120]Product2[T1,T2]]) - [1120]{ - [1120] val x2: [1120]Product2[T1,T2] = [1120]([1120][1120]x1.asInstanceOf[[1120]Product2[T1,T2]]: [1120]Product2[T1,T2]); - [1112]{ - [1112] val o8: [1112]Option[Product2[T1,T2]] = [1112][1112][1112]scala.Product2.unapply[[1112]T1, [1112]T2]([1112]x2); - [1112]if ([1112]o8.isEmpty.unary_!) - [1112]{ - [1121]val a: [1121]Any = [1121]o8.get._1; - [1210][1210]matchEnd5([1210]a) + [1003:1306]def extractor([1017:1023]x: [1020:1023]): [1007]Any = [1027:1028]{ + [1027:1028]case val x1: [1027]Any = [1027:1028]x; + [1027:1028]case6(){ + [1112:1126]if ([1120][1120]x1.isInstanceOf[[1120]Product2[T1,T2]]) + [1112:1126]{ + [1112:1126] val x2: [1120]Product2[T1,T2] = [1120]([1120][1120]x1.asInstanceOf[[1120]Product2[T1,T2]]: [1120]Product2[T1,T2]); + [1112:1120]{ + [1112:1120] val o8: [1112]Option[Product2[T1,T2]] = [1112:1120][1112:1120][1112:1120]scala.Product2.unapply[[1112]T1, [1112]T2]([1112]x2); + [1121:1211]if ([1112]o8.isEmpty.unary_!) + [1121:1211]{ + [1121:1122]val a: [1121]Any = [1121]o8.get._1; + [1210:1211][1210]matchEnd5([1210:1211]a) } else [1112][1112]case7() @@ -63,24 +63,24 @@ else [1120][1120]case7() }; - [1027]case7(){ - [1027][1027]matchEnd5([1027]throw [1027][1027][1027]new [1027]MatchError([1027]x1)) + [1027:1028]case7(){ + [1027:1028][1027:1028]matchEnd5([1027:1028]throw [1027:1028][1027:1028][1027:1028]new [1027:1028]MatchError([1027:1028]x1)) }; - [1027]matchEnd5(x: [NoPosition]Any){ - [1027]x + [1027:1028]matchEnd5(x: [NoPosition]Any){ + [1027:1028]x } }; - [1407]def swatch: [1407]String = [1505]try { - [1607][1607][1607]C.this.toString() + [1403:2204]def swatch: [1407]String = [1505:2106]try { + [1607:1615][1607:1615][1607]C.this.toString() } catch { - [1505]case [1505](ex6 @ [1505]_) => [1505]{ - [1812] val x4: [1812]Throwable = [1812]ex6; - [1505]case9(){ - [1812]if ([1812][1812]x4.ne([1812]null)) - [1812]{ - [1812] val x5: [1812]Throwable = [1812]x4; - [1812]if ([1915][1915][1912]"".isEmpty()) - [2014][2014]matchEnd8([2014][2014]x5.toString()) + [1505:2106]case [1505](ex6 @ [1505]_) => [1812:1824]{ + [1812:1824] val x4: [1812]Throwable = [1812]ex6; + [1812:1824]case9(){ + [1812:1824]if ([1812][1812]x4.ne([1812]null)) + [1812:2022]{ + [1812:1824] val x5: [1812]Throwable = [1812]x4; + [1912:2022]if ([1912:1922][1912:1922][1912:1914]"".isEmpty()) + [2012:2022][2014]matchEnd8([2014][2014]x5.toString()) else [1812][1812]case10() } diff --git a/test/files/run/string-switch-pos.check b/test/files/run/string-switch-pos.check index 672c83c57642..6b292d0a3808 100644 --- a/test/files/run/string-switch-pos.check +++ b/test/files/run/string-switch-pos.check @@ -1,63 +1,63 @@ [[syntax trees at end of patmat]] // newSource1.scala -[6]package [6] { - [6]class Switch extends [13][187]scala.AnyRef { +[0:187]package [0:0] { + [0:187]class Switch extends [13:187][187]scala.AnyRef { [187]def (): [13]Switch = [187]{ [187][187][187]Switch.super.(); [13]() }; - [21]def switch([28]s: [31], [39]cond: [45]): [21]Int = [56]{ - [56]case val x1: [56]String = [56]s; - [56][56]x1 match { - [56]case [75]"AaAa" => [93]1 - [56]case [104]"asdf" => [122]2 - [133]case [133]"BbBb" => [133]if ([143]cond) - [151]3 + [17:185]def switch([28:37]s: [31:37], [39:52]cond: [45:52]): [21]Int = [56:57]{ + [56:57]case val x1: [56]String = [56:57]s; + [56:57][56:57]x1 match { + [56:57]case [75:81]"AaAa" => [93:94]1 + [56:57]case [104:110]"asdf" => [122:123]2 + [133:139]case [133:139]"BbBb" => [143:181]if ([143:147]cond) + [151:152]3 else - [180]4 - [56]case [56]_ => [56]throw [56][56][56]new [56]MatchError([56]x1) + [180:181]4 + [56:57]case [56:57]_ => [56:57]throw [56:57][56:57][56:57]new [56:57]MatchError([56:57]x1) } } } } [[syntax trees at end of cleanup]] // newSource1.scala -[6]package [6] { - [6]class Switch extends [13][13]Object { - [21]def switch([28]s: [31], [39]cond: [45]): [21]Int = [56]{ - [56]case val x1: [56]String = [56]s; - [56]{ - [56][56]if ([56][56]x1.eq([56]null)) +[0:187]package [0:0] { + [0:187]class Switch extends [13:187][13:187]Object { + [17:185]def switch([28:37]s: [31:37], [39:52]cond: [45:52]): [21]Int = [56:57]{ + [56:57]case val x1: [56]String = [56:57]s; + [56:57]{ + [56:139][56:57]if ([56][56]x1.eq([56]null)) [56]0 else [56][56]x1.hashCode() match { - [56]case [56]2031744 => [75]if ([75][75][75]"AaAa".equals([75]x1)) + [75:81]case [56]2031744 => [75:81]if ([75][75][75]"AaAa".equals([75]x1)) [75][75]case1() else [56][56]matchEnd2() - [56]case [56]2062528 => [133]if ([133][133][133]"BbBb".equals([133]x1)) + [133:139]case [56]2062528 => [133:139]if ([133][133][133]"BbBb".equals([133]x1)) [133][133]case3() else [56][56]matchEnd2() - [56]case [56]3003444 => [104]if ([104][104][104]"asdf".equals([104]x1)) + [104:110]case [56]3003444 => [104:110]if ([104][104][104]"asdf".equals([104]x1)) [104][104]case2() else [56][56]matchEnd2() [56]case [56]_ => [56][56]matchEnd2() }; [56]case1(){ - [56][56]matchEnd1([93]1) + [56][56]matchEnd1([93:94]1) }; [56]case2(){ - [56][56]matchEnd1([122]2) + [56][56]matchEnd1([122:123]2) }; [56]case3(){ - [56][56]matchEnd1([133]if ([143]cond) - [151]3 + [56][56]matchEnd1([143:181]if ([143:147]cond) + [151:152]3 else - [180]4) + [180:181]4) }; [56]matchEnd2(){ - [56][56]matchEnd1([56]throw [56][56][56]new [56]MatchError([56]x1)) + [56][56]matchEnd1([56:57]throw [56:57][56:57][56:57]new [56:57]MatchError([56:57]x1)) }; [56]matchEnd1(x$1: [NoPosition]Int){ [56]x$1 diff --git a/test/files/run/t6288.check b/test/files/run/t6288.check index 34afe44781f1..021a1d9c89c0 100644 --- a/test/files/run/t6288.check +++ b/test/files/run/t6288.check @@ -1,109 +1,109 @@ [[syntax trees at end of patmat]] // newSource1.scala -[7]package [7] { - [7]object Case3 extends [13][106]scala.AnyRef { +[0:417]package [0:0] { + [0:105]object Case3 extends [13:105][106]scala.AnyRef { [106]def (): [13]Case3.type = [106]{ [106][106][106]Case3.super.(); [13]() }; - [21]def unapply([29]z: [32]): [21]Option[Int] = [56][52][52]new [52]Some[Int]([57]-1); - [64]{ - [64]case val x1: [64]String = [64]""; - [64]case5(){ - [89]if ([89][89]x1.ne([89]null)) - [84]{ - [84] val o7: [84]Option[Int] = [84][84]Case3.unapply([84]x1); - [84]if ([84]o7.isEmpty.unary_!) - [97][97]matchEnd4([97]()) + [17:60]def unapply([29:35]z: [32:35]): [21]Option[Int] = [52:60][52:56][52:56]new [52:56]Some[Int]([57:59]-1); + [64:66]{ + [64:66]case val x1: [64]String = [64:66]""; + [64:66]case5(){ + [84:93]if ([89][89]x1.ne([89]null)) + [84:89]{ + [84:89] val o7: [84]Option[Int] = [84:89][84:89]Case3.unapply([84]x1); + [97:99]if ([84]o7.isEmpty.unary_!) + [97:99][97]matchEnd4([97:99]()) else [84][84]case6() } else [89][89]case6() }; - [64]case6(){ - [64][64]matchEnd4([64]throw [64][64][64]new [64]MatchError([64]x1)) + [64:66]case6(){ + [64:66][64:66]matchEnd4([64:66]throw [64:66][64:66][64:66]new [64:66]MatchError([64:66]x1)) }; - [64]matchEnd4(x: [NoPosition]Unit){ - [64]x + [64:66]matchEnd4(x: [NoPosition]Unit){ + [64:66]x } } }; - [113]object Case4 extends [119][217]scala.AnyRef { + [106:216]object Case4 extends [119:216][217]scala.AnyRef { [217]def (): [119]Case4.type = [217]{ [217][217][217]Case4.super.(); [119]() }; - [127]def unapplySeq([138]z: [141]): [127]Option[List[Int]] = [167]scala.None; - [175]{ - [175]case val x1: [175]String = [175]""; - [175]case5(){ - [200]if ([200][200]x1.ne([200]null)) - [195]{ - [195] val o7: [195]Option[List[Int]] = [195][195]Case4.unapplySeq([195]x1); - [195]if ([195][195]o7.isEmpty.unary_!.&&([195][195][195][195]o7.get.!=([195]null).&&([195][195][195][195]o7.get.lengthCompare([195]1).==([195]0)))) - [208][208]matchEnd4([208]()) + [123:171]def unapplySeq([138:144]z: [141:144]): [127]Option[List[Int]] = [167:171]scala.None; + [175:177]{ + [175:177]case val x1: [175]String = [175:177]""; + [175:177]case5(){ + [195:204]if ([200][200]x1.ne([200]null)) + [195:200]{ + [195:200] val o7: [195]Option[List[Int]] = [195:200][195:200]Case4.unapplySeq([195]x1); + [208:210]if ([195][195]o7.isEmpty.unary_!.&&([195][195][195][195]o7.get.!=([195]null).&&([195][195][195][195]o7.get.lengthCompare([195]1).==([195]0)))) + [208:210][208]matchEnd4([208:210]()) else [195][195]case6() } else [200][200]case6() }; - [175]case6(){ - [175][175]matchEnd4([175]throw [175][175][175]new [175]MatchError([175]x1)) + [175:177]case6(){ + [175:177][175:177]matchEnd4([175:177]throw [175:177][175:177][175:177]new [175:177]MatchError([175:177]x1)) }; - [175]matchEnd4(x: [NoPosition]Unit){ - [175]x + [175:177]matchEnd4(x: [NoPosition]Unit){ + [175:177]x } } }; - [224]object Case5 extends [230][313]scala.AnyRef { + [217:312]object Case5 extends [230:312][313]scala.AnyRef { [313]def (): [230]Case5.type = [313]{ [313][313][313]Case5.super.(); [230]() }; - [238]def unapply([246]z: [249]): [238]Boolean = [265]true; - [273]{ - [273]case val x1: [273]String = [273]""; - [273]case5(){ - [298]if ([298][298]x1.ne([298]null)) - [293]{ - [293] val o7: [293]Option[List[Int]] = [293][293]Case4.unapplySeq([293]x1); - [293]if ([293][293]o7.isEmpty.unary_!.&&([293][293][293][293]o7.get.!=([293]null).&&([293][293][293][293]o7.get.lengthCompare([293]0).==([293]0)))) - [304][304]matchEnd4([304]()) + [234:269]def unapply([246:252]z: [249:252]): [238]Boolean = [265:269]true; + [273:275]{ + [273:275]case val x1: [273]String = [273:275]""; + [273:275]case5(){ + [293:300]if ([298][298]x1.ne([298]null)) + [293:298]{ + [293:298] val o7: [293]Option[List[Int]] = [293:298][293:298]Case4.unapplySeq([293]x1); + [304:306]if ([293][293]o7.isEmpty.unary_!.&&([293][293][293][293]o7.get.!=([293]null).&&([293][293][293][293]o7.get.lengthCompare([293]0).==([293]0)))) + [304:306][304]matchEnd4([304:306]()) else [293][293]case6() } else [298][298]case6() }; - [273]case6(){ - [273][273]matchEnd4([273]throw [273][273][273]new [273]MatchError([273]x1)) + [273:275]case6(){ + [273:275][273:275]matchEnd4([273:275]throw [273:275][273:275][273:275]new [273:275]MatchError([273:275]x1)) }; - [273]matchEnd4(x: [NoPosition]Unit){ - [273]x + [273:275]matchEnd4(x: [NoPosition]Unit){ + [273:275]x } } }; - [320]object Case6 extends [326][417]scala.AnyRef { + [313:417]object Case6 extends [326:417][417]scala.AnyRef { [417]def (): [326]Case6.type = [417]{ [417][417][417]Case6.super.(); [326]() }; - [334]def unapply([342]z: [345]): [334]Option[Int] = [369][365][365]new [365]Some[Int]([370]-1); - [377]{ - [377]case val x1: [377]Int = [377]0; - [377]case5()[396]{ - [396] val o7: [396]Option[Int] = [396][396]Case6.unapply([396]x1); - [396]if ([396]o7.isEmpty.unary_!) - [409][409]matchEnd4([409]()) + [330:373]def unapply([342:348]z: [345:348]): [334]Option[Int] = [365:373][365:369][365:369]new [365:369]Some[Int]([370:372]-1); + [377:378]{ + [377:378]case val x1: [377]Int = [377:378]0; + [377:378]case5()[396:401]{ + [396:401] val o7: [396]Option[Int] = [396:401][396:401]Case6.unapply([396]x1); + [409:411]if ([396]o7.isEmpty.unary_!) + [409:411][409]matchEnd4([409:411]()) else [396][396]case6() }; - [377]case6(){ - [377][377]matchEnd4([377]throw [377][377][377]new [377]MatchError([377]x1)) + [377:378]case6(){ + [377:378][377:378]matchEnd4([377:378]throw [377:378][377:378][377:378]new [377:378]MatchError([377:378]x1)) }; - [377]matchEnd4(x: [NoPosition]Unit){ - [377]x + [377:378]matchEnd4(x: [NoPosition]Unit){ + [377:378]x } } } diff --git a/test/files/run/t7271.check b/test/files/run/t7271.check index f7a23018ca47..6db301c21ddb 100644 --- a/test/files/run/t7271.check +++ b/test/files/run/t7271.check @@ -1,12 +1,12 @@ [[syntax trees at end of parser]] // newSource1.scala -[6]package [6] { - [6]class C extends [8][91]scala.AnyRef { +[0:91]package [0:0] { + [0:91]class C extends [8:91][91]scala.AnyRef { [8]def () = [8]{ [NoPosition][NoPosition][NoPosition]super.(); [8]() }; - [20]def quote = [28][28][28][28]StringContext([30]"foo", [40]"baz").s([35]this); - [55]def tripleQuote = [69][69][69][69]StringContext([71]"foo", [81]"baz").s([76]this) + [16:44]def quote = [28:44]<28:44><28:44>[28]StringContext([30:34]"foo", [40:44]"baz").s([35:39]this); + [51:85]def tripleQuote = [69:85]<69:85><69:85>[69]StringContext([71:75]"foo", [81:85]"baz").s([76:80]this) } } diff --git a/test/files/run/t7331a.check b/test/files/run/t7331a.check index a59b4003442f..9302239e17c9 100644 --- a/test/files/run/t7331a.check +++ b/test/files/run/t7331a.check @@ -1,2 +1,2 @@ -source-,line-1,offset=0 -2 \ No newline at end of file +RangePosition(, 0, 0, 1) +2 diff --git a/test/files/run/t7331c.check b/test/files/run/t7331c.check index a9dc6a7d0f5b..234e8ae88571 100644 --- a/test/files/run/t7331c.check +++ b/test/files/run/t7331c.check @@ -1,3 +1,3 @@ ClassDef(Modifiers(), TypeName("C"), List(), Template(List(Select(Ident(scala), TypeName("AnyRef"))), noSelfType, List(DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(()))))))) -source-,line-1,offset=6 +RangePosition(, 0, 6, 7) NoPosition diff --git a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check index 84e5435afe12..892784d1cf66 100644 --- a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check +++ b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check @@ -1,2 +1,2 @@ -pos: source-newSource1.scala,line-9,offset=466 could not find implicit value for evidence parameter of type reflect.runtime.package.universe.TypeTag[Int] ERROR +pos: RangePosition(newSource1.scala, 455, 466, 471) could not find implicit value for evidence parameter of type reflect.runtime.package.universe.TypeTag[Int] ERROR diff --git a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check index 8c9d07d8361c..d510c578afc6 100644 --- a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check +++ b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check @@ -1,2 +1,2 @@ -pos: source-newSource1.scala,line-9,offset=479 No Manifest available for App.this.T. ERROR +pos: RangePosition(newSource1.scala, 471, 479, 482) No Manifest available for App.this.T. ERROR