diff options
| author | liu fengyun <liu@fengy.me> | 2016-10-24 13:40:01 +0200 |
|---|---|---|
| committer | liu fengyun <liu@fengy.me> | 2016-10-24 13:40:01 +0200 |
| commit | 24a725db99786eaf5f37903429bfefcf8db12aaf (patch) | |
| tree | 16f6a43833d1b0a57c2631c56436dfaba39e0e2b /src | |
| parent | c22262f7cc2ad04be8040c882c76ce71efb1e54d (diff) | |
| download | dotty-24a725db99786eaf5f37903429bfefcf8db12aaf.tar.gz dotty-24a725db99786eaf5f37903429bfefcf8db12aaf.tar.bz2 dotty-24a725db99786eaf5f37903429bfefcf8db12aaf.zip | |
fix error in rebase merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/dotc/parsing/Parsers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/src/dotty/tools/dotc/parsing/Parsers.scala index 412173f84..013541c71 100644 --- a/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/src/dotty/tools/dotc/parsing/Parsers.scala @@ -1492,7 +1492,7 @@ object Parsers { val tok = in.token val mod = atPos(in.skipToken()) { modOfToken(tok) } - if (mods is mod.flags) syntaxError(RepeatedModifier(flag.toString)) + if (mods is mod.flags) syntaxError(RepeatedModifier(mod.flags.toString)) addMod(mods, mod) } |