From ca5652cc5a74f00277ce942a001fa6e931ee3728 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 28 Mar 2017 22:25:09 +0200 Subject: Make freshName semantic --- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'compiler/src/dotty/tools/dotc/parsing/Parsers.scala') diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 3e3673e5e..d0451dd60 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -12,6 +12,7 @@ import core._ import Flags._ import Contexts._ import Names._ +import NameExtractors.WildcardParamName import ast.{Positioned, Trees, untpd} import ast.Trees._ import Decorators._ @@ -1168,7 +1169,7 @@ object Parsers { def bindingName(): TermName = if (in.token == USCORE) { in.nextToken() - ctx.freshName(nme.USCORE_PARAM_PREFIX).toTermName + WildcardParamName.fresh() } else ident() @@ -1224,7 +1225,7 @@ object Parsers { path(thisOK = true) case USCORE => val start = in.skipToken() - val pname = ctx.freshName(nme.USCORE_PARAM_PREFIX).toTermName + val pname = WildcardParamName.fresh() val param = ValDef(pname, TypeTree(), EmptyTree).withFlags(SyntheticTermParam) .withPos(Position(start)) placeholderParams = param :: placeholderParams @@ -1705,7 +1706,7 @@ object Parsers { if (isConcreteOwner || in.token != USCORE) ident().toTypeName else { in.nextToken() - ctx.freshName(nme.USCORE_PARAM_PREFIX).toTypeName + WildcardParamName.fresh().toTypeName } val hkparams = typeParamClauseOpt(ParamOwner.TypeParam) val bounds = -- cgit v1.2.3