fix error in rebase merge

liufengyun · liufengyun · commit 24a725db9978 · 2016-10-24T13:40:01.000+02:00
diff --git 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)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1492,7 +1492,7 @@ object Parsers {`
`1492`	`1492`	`val tok = in.token`
`1493`	`1493`	`val mod = atPos(in.skipToken()) { modOfToken(tok) }`
`1494`	`1494`
`1495`		`- if (mods is mod.flags) syntaxError(RepeatedModifier(flag.toString))`
	`1495`	`+ if (mods is mod.flags) syntaxError(RepeatedModifier(mod.flags.toString))`
`1496`	`1496`	`addMod(mods, mod)`
`1497`	`1497`	`}`
`1498`	`1498`