summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-11-04 14:55:45 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-11-04 14:55:45 +1000
commitb556b2fdcc7198bffe0ee90c5adc8c9eb3c29e36 (patch)
tree97aac3270399e4e12c71994099f84b9a048bdf30 /src/reflect
parentd61d007d4852032fcfd339ab2c904a4de6836c4d (diff)
parentc6c58071a785af3a55e7e51339461e86c58ae876 (diff)
downloadscala-b556b2fdcc7198bffe0ee90c5adc8c9eb3c29e36.tar.gz
scala-b556b2fdcc7198bffe0ee90c5adc8c9eb3c29e36.tar.bz2
scala-b556b2fdcc7198bffe0ee90c5adc8c9eb3c29e36.zip
Merge pull request #4036 from retronym/topic/opt-tail-calls
SI-8893 Restore linear perf in TailCalls with nested matches
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/Definitions.scala4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
index 666a3a5e64..e2ee6a9076 100644
--- a/src/reflect/scala/reflect/internal/Definitions.scala
+++ b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -1439,6 +1439,10 @@ trait Definitions extends api.StandardDefinitions {
lazy val isUnbox = unboxMethod.values.toSet[Symbol]
lazy val isBox = boxMethod.values.toSet[Symbol]
+ lazy val Boolean_and = definitions.Boolean_and
+ lazy val Boolean_or = definitions.Boolean_or
+ lazy val Boolean_not = definitions.Boolean_not
+
lazy val Option_apply = getMemberMethod(OptionModule, nme.apply)
lazy val List_apply = DefinitionsClass.this.List_apply