Skip to content

Commit 92f06b1

Browse files
paulppaulp
committed
Merge pull request scala#3036 from paulp/pr/aesthetics
Improvement in code aesthetics.
2 parents 392d1dd + f9f8543 commit 92f06b1

File tree

2 files changed

+65
-76
lines changed

2 files changed

+65
-76
lines changed

‎src/compiler/scala/reflect/reify/codegen/GenTrees.scala‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,12 @@ trait GenTrees {
4141
// the first prototype of reification reified all types and symbols for all trees => this quickly became unyieldy
4242
// the second prototype reified external types, but avoided reifying local ones => this created an ugly irregularity
4343
// current approach is uniform and compact
44-
var rtree = tree match {
45-
case FreeDef(_, _, _, _, _) =>
46-
reifyNestedFreeDef(tree)
47-
case FreeRef(_, _) =>
48-
reifyNestedFreeRef(tree)
49-
case BoundTerm(tree) =>
50-
reifyBoundTerm(tree)
51-
case BoundType(tree) =>
52-
reifyBoundType(tree)
53-
case _ =>
54-
reifyTreeSyntactically(tree)
44+
var rtree: Tree = tree match {
45+
case FreeDef(_, _, _, _, _) => reifyNestedFreeDef(tree)
46+
case FreeRef(_, _) => reifyNestedFreeRef(tree)
47+
case BoundTerm(tree) => reifyBoundTerm(tree)
48+
case BoundType(tree) => reifyBoundType(tree)
49+
case _ => reifyTreeSyntactically(tree)
5550
}
5651

5752
// usually we don't reify symbols/types, because they can be re-inferred during subsequent reflective compilation
@@ -68,19 +63,13 @@ trait GenTrees {
6863
rtree
6964
}
7065

71-
def reifyTreeSyntactically(tree: Tree) = tree match {
72-
case global.EmptyTree =>
73-
reifyMirrorObject(EmptyTree)
74-
case global.noSelfType =>
75-
mirrorSelect(nme.noSelfType)
76-
case global.pendingSuperCall =>
77-
mirrorSelect(nme.pendingSuperCall)
78-
case Literal(const @ Constant(_)) =>
79-
mirrorCall(nme.Literal, reifyProduct(const))
80-
case Import(expr, selectors) =>
81-
mirrorCall(nme.Import, reify(expr), mkList(selectors map reifyProduct))
82-
case _ =>
83-
reifyProduct(tree)
66+
def reifyTreeSyntactically(tree: Tree): Tree = tree match {
67+
case global.EmptyTree => reifyMirrorObject(EmptyTree)
68+
case global.noSelfType => mirrorSelect(nme.noSelfType)
69+
case global.pendingSuperCall => mirrorSelect(nme.pendingSuperCall)
70+
case Literal(const @ Constant(_)) => mirrorCall(nme.Literal, reifyProduct(const))
71+
case Import(expr, selectors) => mirrorCall(nme.Import, reify(expr), mkList(selectors map reifyProduct))
72+
case _ => reifyProduct(tree)
8473
}
8574

8675
def reifyFlags(flags: FlagSet) =

‎src/reflect/scala/reflect/internal/Trees.scala‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,59 +1758,59 @@ trait Trees extends api.Trees { self: SymbolTable =>
17581758

17591759
// -------------- Classtags --------------------------------------------------------
17601760

1761-
implicit val TreeTag = ClassTag[Tree](classOf[Tree])
1762-
implicit val TermTreeTag = ClassTag[TermTree](classOf[TermTree])
1763-
implicit val TypTreeTag = ClassTag[TypTree](classOf[TypTree])
1764-
implicit val SymTreeTag = ClassTag[SymTree](classOf[SymTree])
1765-
implicit val NameTreeTag = ClassTag[NameTree](classOf[NameTree])
1766-
implicit val RefTreeTag = ClassTag[RefTree](classOf[RefTree])
1767-
implicit val DefTreeTag = ClassTag[DefTree](classOf[DefTree])
1768-
implicit val MemberDefTag = ClassTag[MemberDef](classOf[MemberDef])
1769-
implicit val PackageDefTag = ClassTag[PackageDef](classOf[PackageDef])
1770-
implicit val ImplDefTag = ClassTag[ImplDef](classOf[ImplDef])
1771-
implicit val ClassDefTag = ClassTag[ClassDef](classOf[ClassDef])
1772-
implicit val ModuleDefTag = ClassTag[ModuleDef](classOf[ModuleDef])
1773-
implicit val ValOrDefDefTag = ClassTag[ValOrDefDef](classOf[ValOrDefDef])
1774-
implicit val ValDefTag = ClassTag[ValDef](classOf[ValDef])
1775-
implicit val DefDefTag = ClassTag[DefDef](classOf[DefDef])
1776-
implicit val TypeDefTag = ClassTag[TypeDef](classOf[TypeDef])
1777-
implicit val LabelDefTag = ClassTag[LabelDef](classOf[LabelDef])
1778-
implicit val ImportSelectorTag = ClassTag[ImportSelector](classOf[ImportSelector])
1779-
implicit val ImportTag = ClassTag[Import](classOf[Import])
1780-
implicit val TemplateTag = ClassTag[Template](classOf[Template])
1781-
implicit val BlockTag = ClassTag[Block](classOf[Block])
1782-
implicit val CaseDefTag = ClassTag[CaseDef](classOf[CaseDef])
1783-
implicit val AlternativeTag = ClassTag[Alternative](classOf[Alternative])
1784-
implicit val StarTag = ClassTag[Star](classOf[Star])
1785-
implicit val BindTag = ClassTag[Bind](classOf[Bind])
1786-
implicit val UnApplyTag = ClassTag[UnApply](classOf[UnApply])
1787-
implicit val FunctionTag = ClassTag[Function](classOf[Function])
1788-
implicit val AssignTag = ClassTag[Assign](classOf[Assign])
1789-
implicit val AssignOrNamedArgTag = ClassTag[AssignOrNamedArg](classOf[AssignOrNamedArg])
1790-
implicit val IfTag = ClassTag[If](classOf[If])
1791-
implicit val MatchTag = ClassTag[Match](classOf[Match])
1792-
implicit val ReturnTag = ClassTag[Return](classOf[Return])
1793-
implicit val TryTag = ClassTag[Try](classOf[Try])
1794-
implicit val ThrowTag = ClassTag[Throw](classOf[Throw])
1795-
implicit val NewTag = ClassTag[New](classOf[New])
1796-
implicit val TypedTag = ClassTag[Typed](classOf[Typed])
1797-
implicit val GenericApplyTag = ClassTag[GenericApply](classOf[GenericApply])
1798-
implicit val TypeApplyTag = ClassTag[TypeApply](classOf[TypeApply])
1799-
implicit val ApplyTag = ClassTag[Apply](classOf[Apply])
1800-
implicit val SuperTag = ClassTag[Super](classOf[Super])
1801-
implicit val ThisTag = ClassTag[This](classOf[This])
1802-
implicit val SelectTag = ClassTag[Select](classOf[Select])
1803-
implicit val IdentTag = ClassTag[Ident](classOf[Ident])
1804-
implicit val ReferenceToBoxedTag = ClassTag[ReferenceToBoxed](classOf[ReferenceToBoxed])
1805-
implicit val LiteralTag = ClassTag[Literal](classOf[Literal])
1806-
implicit val AnnotatedTag = ClassTag[Annotated](classOf[Annotated])
1807-
implicit val SingletonTypeTreeTag = ClassTag[SingletonTypeTree](classOf[SingletonTypeTree])
1808-
implicit val SelectFromTypeTreeTag = ClassTag[SelectFromTypeTree](classOf[SelectFromTypeTree])
1809-
implicit val CompoundTypeTreeTag = ClassTag[CompoundTypeTree](classOf[CompoundTypeTree])
1810-
implicit val AppliedTypeTreeTag = ClassTag[AppliedTypeTree](classOf[AppliedTypeTree])
1811-
implicit val TypeBoundsTreeTag = ClassTag[TypeBoundsTree](classOf[TypeBoundsTree])
1761+
implicit val AlternativeTag = ClassTag[Alternative](classOf[Alternative])
1762+
implicit val AnnotatedTag = ClassTag[Annotated](classOf[Annotated])
1763+
implicit val AppliedTypeTreeTag = ClassTag[AppliedTypeTree](classOf[AppliedTypeTree])
1764+
implicit val ApplyTag = ClassTag[Apply](classOf[Apply])
1765+
implicit val AssignOrNamedArgTag = ClassTag[AssignOrNamedArg](classOf[AssignOrNamedArg])
1766+
implicit val AssignTag = ClassTag[Assign](classOf[Assign])
1767+
implicit val BindTag = ClassTag[Bind](classOf[Bind])
1768+
implicit val BlockTag = ClassTag[Block](classOf[Block])
1769+
implicit val CaseDefTag = ClassTag[CaseDef](classOf[CaseDef])
1770+
implicit val ClassDefTag = ClassTag[ClassDef](classOf[ClassDef])
1771+
implicit val CompoundTypeTreeTag = ClassTag[CompoundTypeTree](classOf[CompoundTypeTree])
1772+
implicit val DefDefTag = ClassTag[DefDef](classOf[DefDef])
1773+
implicit val DefTreeTag = ClassTag[DefTree](classOf[DefTree])
18121774
implicit val ExistentialTypeTreeTag = ClassTag[ExistentialTypeTree](classOf[ExistentialTypeTree])
1813-
implicit val TypeTreeTag = ClassTag[TypeTree](classOf[TypeTree])
1775+
implicit val FunctionTag = ClassTag[Function](classOf[Function])
1776+
implicit val GenericApplyTag = ClassTag[GenericApply](classOf[GenericApply])
1777+
implicit val IdentTag = ClassTag[Ident](classOf[Ident])
1778+
implicit val IfTag = ClassTag[If](classOf[If])
1779+
implicit val ImplDefTag = ClassTag[ImplDef](classOf[ImplDef])
1780+
implicit val ImportSelectorTag = ClassTag[ImportSelector](classOf[ImportSelector])
1781+
implicit val ImportTag = ClassTag[Import](classOf[Import])
1782+
implicit val LabelDefTag = ClassTag[LabelDef](classOf[LabelDef])
1783+
implicit val LiteralTag = ClassTag[Literal](classOf[Literal])
1784+
implicit val MatchTag = ClassTag[Match](classOf[Match])
1785+
implicit val MemberDefTag = ClassTag[MemberDef](classOf[MemberDef])
1786+
implicit val ModuleDefTag = ClassTag[ModuleDef](classOf[ModuleDef])
1787+
implicit val NameTreeTag = ClassTag[NameTree](classOf[NameTree])
1788+
implicit val NewTag = ClassTag[New](classOf[New])
1789+
implicit val PackageDefTag = ClassTag[PackageDef](classOf[PackageDef])
1790+
implicit val RefTreeTag = ClassTag[RefTree](classOf[RefTree])
1791+
implicit val ReferenceToBoxedTag = ClassTag[ReferenceToBoxed](classOf[ReferenceToBoxed])
1792+
implicit val ReturnTag = ClassTag[Return](classOf[Return])
1793+
implicit val SelectFromTypeTreeTag = ClassTag[SelectFromTypeTree](classOf[SelectFromTypeTree])
1794+
implicit val SelectTag = ClassTag[Select](classOf[Select])
1795+
implicit val SingletonTypeTreeTag = ClassTag[SingletonTypeTree](classOf[SingletonTypeTree])
1796+
implicit val StarTag = ClassTag[Star](classOf[Star])
1797+
implicit val SuperTag = ClassTag[Super](classOf[Super])
1798+
implicit val SymTreeTag = ClassTag[SymTree](classOf[SymTree])
1799+
implicit val TemplateTag = ClassTag[Template](classOf[Template])
1800+
implicit val TermTreeTag = ClassTag[TermTree](classOf[TermTree])
1801+
implicit val ThisTag = ClassTag[This](classOf[This])
1802+
implicit val ThrowTag = ClassTag[Throw](classOf[Throw])
1803+
implicit val TreeTag = ClassTag[Tree](classOf[Tree])
1804+
implicit val TryTag = ClassTag[Try](classOf[Try])
1805+
implicit val TypTreeTag = ClassTag[TypTree](classOf[TypTree])
1806+
implicit val TypeApplyTag = ClassTag[TypeApply](classOf[TypeApply])
1807+
implicit val TypeBoundsTreeTag = ClassTag[TypeBoundsTree](classOf[TypeBoundsTree])
1808+
implicit val TypeDefTag = ClassTag[TypeDef](classOf[TypeDef])
1809+
implicit val TypeTreeTag = ClassTag[TypeTree](classOf[TypeTree])
1810+
implicit val TypedTag = ClassTag[Typed](classOf[Typed])
1811+
implicit val UnApplyTag = ClassTag[UnApply](classOf[UnApply])
1812+
implicit val ValDefTag = ClassTag[ValDef](classOf[ValDef])
1813+
implicit val ValOrDefDefTag = ClassTag[ValOrDefDef](classOf[ValOrDefDef])
18141814

18151815
val treeNodeCount = Statistics.newView("#created tree nodes")(nodeCount)
18161816
}

0 commit comments

Comments
 (0)