diff options
author | Paul Phillips <paulp@improving.org> | 2013-09-18 07:48:57 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-09-18 12:13:06 -0700 |
commit | f7a315adf63fdac2a7f95f87b88e03d4139af863 (patch) | |
tree | 6486f3d8f7bb4a462497b170ab84c65784669b29 /test/files/run | |
parent | 1c8bbd7ec5b8859f75abfbc4e70482dede2b7007 (diff) | |
download | scala-f7a315adf63fdac2a7f95f87b88e03d4139af863.tar.gz scala-f7a315adf63fdac2a7f95f87b88e03d4139af863.tar.bz2 scala-f7a315adf63fdac2a7f95f87b88e03d4139af863.zip |
SI-7854, SI-6768 better parsing/positioning in parser
The parser hole I found while working on the generated positions
serves as the umbrella for a host of improvements. Upgraded
positions assigned during some specific challenging situations mostly
involving the creation of synthetic trees, e.g. for comprehensions
and closures. While doing so improved some error messages.
Eliminated some of the most glaring duplication in the parser.
It's written like there is some payoff associated with being
spectacularly imperative. Not so far.
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/existential-rangepos.check | 4 | ||||
-rw-r--r-- | test/files/run/t5603.check | 12 | ||||
-rw-r--r-- | test/files/run/t6768.check | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/files/run/existential-rangepos.check b/test/files/run/existential-rangepos.check index 6c4e86dedc..f426c6471f 100644 --- a/test/files/run/existential-rangepos.check +++ b/test/files/run/existential-rangepos.check @@ -5,9 +5,9 @@ [76][76][76]A.super.<init>(); [20]() }; - [28/24:51]private[this] val foo: [28]Set[_ <: T] = [47:51]null; + [28:51]private[this] val foo: [28]Set[_ <: T] = [47:51]null; [28]<stable> <accessor> def foo: [28]Set[_ <: T] = [28][28]A.this.foo; - [58/54:74]<stable> <accessor> def bar: [58]Set[_ <: T] + [58:74]<stable> <accessor> def bar: [58]Set[_ <: T] } } diff --git a/test/files/run/t5603.check b/test/files/run/t5603.check index 255e9356b9..46fcdd4470 100644 --- a/test/files/run/t5603.check +++ b/test/files/run/t5603.check @@ -4,18 +4,18 @@ [15]def $init$() = [15]{ [15]() }; - [27/23:39]val name: [33:39]String; - [50/46:76]val msg = [71/56:76][71/56:72][56:71]"How are you, ".$plus([72:76]name) + [27:39]val name: [33:39]String; + [50:76]val msg = [71/56:76][71/56:72][56:71]"How are you, ".$plus([72:76]name) }; [93/87:209]class C extends [94:209][151:159]Greeting { - [123/119:139]val nameElse = _; + [123:139]val nameElse = _; [95:101]<paramaccessor> private[this] val i: [98:101]Int = _; - <119:139>def <init>([95]i: [98]Int) = <119:139>{ - <119:139>val nameElse = <134:139>"Bob"; + <123:139>def <init>([95]i: [98]Int) = <123:139>{ + <123:139>val nameElse = <134:139>"Bob"; [X][X][X]super.<init>(); [94]() }; - [172/168:184]val name = [179:184]"avc"; + [172:184]val name = [179:184]"avc"; [198/191:203][191:198]println([199:202]msg) }; [222/215:241]object Test extends [227:241][235:238]App { diff --git a/test/files/run/t6768.check b/test/files/run/t6768.check index bf4f6ea2a1..64df4568ec 100644 --- a/test/files/run/t6768.check +++ b/test/files/run/t6768.check @@ -6,7 +6,7 @@ [9]() }; [17/13:31]def f1: [17]Some[String] = [26/22:31][22:26][22:26]scala.Some.apply[[22]String]([27:30]"a"); - [38/34:56]def f2: [38]Some[String] = [43:56][43/47:51][43/47:51]new [47:51]<type: [47:51]scala.Some>([52:55]"b") + [38/34:56]def f2: [38]Some[String] = [47/43:56][47:51][47:51]new [47:51]<type: [47:51]scala.Some>([52:55]"b") } } |