diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-08-16 10:22:25 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-08-16 14:24:14 +0200 |
| commit | ffa9b1afc9168e699cfa568a94f84e40b5cc62b7 (patch) | |
| tree | 389408cc60c0eacee6059b0e4178ccdd61ce1e12 /src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala | |
| parent | 3ccaa1026e7e74d99fe39c9608e28c48b422e2c9 (diff) | |
| parent | e05122cdb38c5c6bd4900247f371fa23b46f9c22 (diff) | |
| download | scala-ffa9b1afc9168e699cfa568a94f84e40b5cc62b7.tar.gz scala-ffa9b1afc9168e699cfa568a94f84e40b5cc62b7.tar.bz2 scala-ffa9b1afc9168e699cfa568a94f84e40b5cc62b7.zip | |
Merge remote-tracking branch 'upstream/2.10.x' into merge-210
Required a few changes of `HIDDEN` -> `ARTIFACT` and `isHidden` -> `isArtifact`
Conflicts:
src/reflect/scala/reflect/internal/Flags.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala index 9ed9cfe267..73f5ec7b3c 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala @@ -191,7 +191,7 @@ abstract class TreeBuilder { } else { val x = freshTermName() Block( - List(ValDef(Modifiers(SYNTHETIC | HIDDEN), x, TypeTree(), stripParens(left))), + List(ValDef(Modifiers(SYNTHETIC | ARTIFACT), x, TypeTree(), stripParens(left))), Apply(atPos(opPos union right.pos) { Select(stripParens(right), op.encode) }, List(Ident(x)))) } } else { @@ -488,7 +488,7 @@ abstract class TreeBuilder { def makeCatchFromExpr(catchExpr: Tree): CaseDef = { val binder = freshTermName("x") val pat = Bind(binder, Typed(Ident(nme.WILDCARD), Ident(tpnme.Throwable))) - val catchDef = ValDef(Modifiers(HIDDEN), freshTermName("catchExpr"), TypeTree(), catchExpr) + val catchDef = ValDef(Modifiers(ARTIFACT), freshTermName("catchExpr"), TypeTree(), catchExpr) val catchFn = Ident(catchDef.name) val body = atPos(catchExpr.pos.makeTransparent)(Block( List(catchDef), @@ -562,7 +562,7 @@ abstract class TreeBuilder { val tmp = freshTermName() val firstDef = atPos(matchExpr.pos) { - ValDef(Modifiers(PrivateLocal | SYNTHETIC | HIDDEN | (mods.flags & LAZY)), + ValDef(Modifiers(PrivateLocal | SYNTHETIC | ARTIFACT | (mods.flags & LAZY)), tmp, TypeTree(), matchExpr) } var cnt = 0 |