diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-11-26 21:20:21 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-11-26 22:08:18 +0100 |
commit | f30ae6149ddd4386debbf3a5650b1fc005ed00e9 (patch) | |
tree | 47439b4fc83c6e27a38e1c1645bfbd6d860d08a4 /test/files/run/dynamic-applyDynamicNamed.check | |
parent | eee92c3aa6c1355a5aec97dd9adb2bd2fa61dc09 (diff) | |
parent | 3629b645cc2b1403c51925dd9c696a57008c0ce2 (diff) | |
download | scala-f30ae6149ddd4386debbf3a5650b1fc005ed00e9.tar.gz scala-f30ae6149ddd4386debbf3a5650b1fc005ed00e9.tar.bz2 scala-f30ae6149ddd4386debbf3a5650b1fc005ed00e9.zip |
Merge remote-tracking branch 'origin/pr/3196' into merge/2.10.x-positions-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Typers.scala
test/files/neg/applydynamic_sip.check
- Changes two calls from `.endOrPoint` to `.point`. The latter
is safe in master for both `Range`- and `OffsetPosition`s
- Updates checkfiles with unrelated position changes (constructors)
Diffstat (limited to 'test/files/run/dynamic-applyDynamicNamed.check')
-rw-r--r-- | test/files/run/dynamic-applyDynamicNamed.check | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/files/run/dynamic-applyDynamicNamed.check b/test/files/run/dynamic-applyDynamicNamed.check new file mode 100644 index 0000000000..c4e050ba17 --- /dev/null +++ b/test/files/run/dynamic-applyDynamicNamed.check @@ -0,0 +1,14 @@ +[[syntax trees at end of typer]] // newSource1.scala +[0:97]package [0:0]<empty> { + [0:97]object X extends [9:97][97]scala.AnyRef { + [97]def <init>(): [9]X.type = [97]{ + [97][97][97]X.super.<init>(); + [9]() + }; + [17:30]private[this] val d: [21]D = [25:30][25:30][25:30]new [29:30]D(); + [21]<stable> <accessor> def d: [21]D = [21][21]X.this.d; + [37:70][37:38][37:38][37]X.this.d.applyDynamicNamed(<39:43>"meth")([44:55][44][44]scala.Tuple2.apply[[44]String, [44]Int]([44:50]"value1", [53:55]10), [57:69][57][57]scala.Tuple2.apply[[57]String, [57]Int]([57:63]"value2", [66:69]100)); + [77:91]<77:78><77:78>[77]X.this.d.applyDynamicNamed(<77:78>"apply")([79:90][79][79]scala.Tuple2.apply[[79]String, [79]Int]([79:85]"value1", [88:90]10)) + } +} + |