diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-01 16:52:54 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-01 16:52:54 +0200 |
commit | 3aea9219c40912f1fe501be67e1a630fd595a35d (patch) | |
tree | d6a5634dcaef14f982002fa088df1b5f7ef6b34d /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | |
parent | 51971954ace37ad6af8bf354d92f6baf51d16324 (diff) | |
parent | 32f520f3ed78ecde390dc7b1b48d3130e412a9dc (diff) | |
download | scala-3aea9219c40912f1fe501be67e1a630fd595a35d.tar.gz scala-3aea9219c40912f1fe501be67e1a630fd595a35d.tar.bz2 scala-3aea9219c40912f1fe501be67e1a630fd595a35d.zip |
Merge commit '32f520f' into merge/2.11-to-2.12-apr-1
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 627a181793..1036dc853b 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -13,7 +13,7 @@ import scala.collection.{ mutable, immutable } import mutable.{ ListBuffer, StringBuilder } import scala.reflect.internal.{ Precedence, ModifierFlags => Flags } import scala.reflect.internal.Chars.{ isScalaLetter } -import scala.reflect.internal.util.{ SourceFile, Position, FreshNameCreator } +import scala.reflect.internal.util.{ SourceFile, Position, FreshNameCreator, ListOfNil } import Tokens._ /** Historical note: JavaParsers started life as a direct copy of Parsers @@ -2800,7 +2800,7 @@ self => */ def packageObjectDef(start: Offset): PackageDef = { val defn = objectDef(in.offset, NoMods) - val pidPos = o2p(defn.pos.startOrPoint) + val pidPos = o2p(defn.pos.start) val pkgPos = r2p(start, pidPos.point) gen.mkPackageObject(defn, pidPos, pkgPos) } |