diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
| commit | e596d1a65d81a81a54847d90d2d90be3ffbb3d92 (patch) | |
| tree | d6c86e80b08b47271e65bccfe734e80bc531be8f /src/reflect/scala/reflect/internal/TreeGen.scala | |
| parent | 4210262867a541d4cbf0aaf2b06bedeef9520c2b (diff) | |
| parent | 6a185e3c97b79716576725f1ecf0ba629e83951d (diff) | |
| download | scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.gz scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.bz2 scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150501
Diffstat (limited to 'src/reflect/scala/reflect/internal/TreeGen.scala')
| -rw-r--r-- | src/reflect/scala/reflect/internal/TreeGen.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/TreeGen.scala b/src/reflect/scala/reflect/internal/TreeGen.scala index 4025df7ac5..894038dd0a 100644 --- a/src/reflect/scala/reflect/internal/TreeGen.scala +++ b/src/reflect/scala/reflect/internal/TreeGen.scala @@ -365,7 +365,7 @@ abstract class TreeGen { DefDef(NoMods, nme.MIXIN_CONSTRUCTOR, Nil, ListOfNil, TypeTree(), Block(lvdefs, Literal(Constant(())))))) } else { - // convert (implicit ... ) to ()(implicit ... ) if its the only parameter section + // convert (implicit ... ) to ()(implicit ... ) if it's the only parameter section if (vparamss1.isEmpty || !vparamss1.head.isEmpty && vparamss1.head.head.mods.isImplicit) vparamss1 = List() :: vparamss1 val superCall = pendingSuperCall // we can't know in advance which of the parents will end up as a superclass |