diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-12-20 13:19:19 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-12-20 13:19:19 +1000 |
| commit | 079e8dc61704a768792c6b210a5b0cd25522ee55 (patch) | |
| tree | 37154f37a745c9c7535cbe0a7f6cef486beb5870 /src/reflect | |
| parent | 56fb9172756d95ef903c36efcf54f1ae95c64b4b (diff) | |
| parent | 23548c4301e48cb69f05cd01ceba418dc9c36d6c (diff) | |
| download | scala-079e8dc61704a768792c6b210a5b0cd25522ee55.tar.gz scala-079e8dc61704a768792c6b210a5b0cd25522ee55.tar.bz2 scala-079e8dc61704a768792c6b210a5b0cd25522ee55.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20161220
Conflicts:
bincompat-backward.whitelist.conf
build.xml
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/library/scala/collection/immutable/NumericRange.scala
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/StdNames.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index 2e820a68e0..15aa1a40fa 100644 --- a/src/reflect/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala @@ -1110,6 +1110,7 @@ trait StdNames { final val ELSEkw: TermName = kw("else") final val ENUMkw: TermName = kw("enum") final val EXTENDSkw: TermName = kw("extends") + final val FALSEkw: TermName = kw("false") final val FINALkw: TermName = kw("final") final val FINALLYkw: TermName = kw("finally") final val FLOATkw: TermName = kw("float") @@ -1139,6 +1140,7 @@ trait StdNames { final val THROWkw: TermName = kw("throw") final val THROWSkw: TermName = kw("throws") final val TRANSIENTkw: TermName = kw("transient") + final val TRUEkw: TermName = kw("true") final val TRYkw: TermName = kw("try") final val VOIDkw: TermName = kw("void") final val VOLATILEkw: TermName = kw("volatile") |