From 3fe4e061ef90b8dde10b2e9542f17a34c0fbcb5d Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 28 Mar 2017 22:35:15 +0200 Subject: Rename NameExtractor -> NameKind --- compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala | 2 +- compiler/src/dotty/tools/dotc/transform/CapturedVars.scala | 2 +- compiler/src/dotty/tools/dotc/transform/Erasure.scala | 2 +- compiler/src/dotty/tools/dotc/transform/FirstTransform.scala | 2 +- compiler/src/dotty/tools/dotc/transform/LazyVals.scala | 2 +- compiler/src/dotty/tools/dotc/transform/LiftTry.scala | 2 +- compiler/src/dotty/tools/dotc/transform/Mixin.scala | 2 +- compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala | 2 +- compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala | 6 +++--- compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala | 2 +- compiler/src/dotty/tools/dotc/transform/SymUtils.scala | 2 +- compiler/src/dotty/tools/dotc/transform/TailRec.scala | 2 +- compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'compiler/src/dotty/tools/dotc/transform') diff --git a/compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala b/compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala index fa79d995c..a8d82045e 100644 --- a/compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala +++ b/compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala @@ -14,7 +14,7 @@ import DenotTransformers._ import Annotations._ import StdNames._ import NameOps._ -import NameExtractors._ +import NameKinds._ import ast.Trees._ /** This phase augments Scala2 traits with implementation classes and with additional members diff --git a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala index 368250cdf..b9a9544f5 100644 --- a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala +++ b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala @@ -12,7 +12,7 @@ import core.SymDenotations._ import core.StdNames.nme import core.Names._ import core.NameOps._ -import core.NameExtractors.TempResultName +import core.NameKinds.TempResultName import ast.Trees._ import SymUtils._ import collection.{ mutable, immutable } diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index e9fe42e78..4cee0d0de 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -11,7 +11,7 @@ import core.Types._ import core.Names._ import core.StdNames._ import core.NameOps._ -import core.NameExtractors.ShadowedName +import core.NameKinds.ShadowedName import core.Decorators._ import core.Constants._ import core.Definitions._ diff --git a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala index 803504944..37f978f11 100644 --- a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala @@ -20,7 +20,7 @@ import scala.collection.mutable import DenotTransformers._ import typer.Checking import NameOps._ -import NameExtractors.AvoidClashName +import NameKinds.AvoidClashName import StdNames._ diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index 357baa3df..f64006d73 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -10,7 +10,7 @@ import Contexts._ import Symbols._ import Decorators._ import NameOps._ -import NameExtractors._ +import NameKinds._ import StdNames.nme import rewrite.Rewrites.patch import util.Positions.Position diff --git a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala index 61554f5ce..278868131 100644 --- a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala +++ b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala @@ -8,7 +8,7 @@ import core.Contexts._ import core.Types._ import core.Flags._ import core.Decorators._ -import core.NameExtractors.LiftedTreeName +import core.NameKinds.LiftedTreeName import NonLocalReturns._ /** Lifts try's that might be executed on non-empty expression stacks diff --git a/compiler/src/dotty/tools/dotc/transform/Mixin.scala b/compiler/src/dotty/tools/dotc/transform/Mixin.scala index fc23d96ee..546077d27 100644 --- a/compiler/src/dotty/tools/dotc/transform/Mixin.scala +++ b/compiler/src/dotty/tools/dotc/transform/Mixin.scala @@ -13,7 +13,7 @@ import Decorators._ import DenotTransformers._ import StdNames._ import NameOps._ -import NameExtractors._ +import NameKinds._ import Phases._ import ast.untpd import ast.Trees._ diff --git a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala index 945504743..fdee076b4 100644 --- a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala +++ b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala @@ -5,7 +5,7 @@ import core._ import Contexts._, Symbols._, Types._, Flags._, Decorators._, StdNames._, Constants._, Phases._ import TreeTransforms._ import ast.Trees._ -import NameExtractors.NonLocalReturnKeyName +import NameKinds.NonLocalReturnKeyName import collection.mutable object NonLocalReturns { diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index f93eac0a2..d87412d93 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -11,7 +11,7 @@ import core.Symbols._ import core.Types._ import core.Constants._ import core.StdNames._ -import core.NameExtractors._ +import core.NameKinds._ import dotty.tools.dotc.ast.{untpd, TreeTypeMap, tpd} import dotty.tools.dotc.core import dotty.tools.dotc.core.DenotTransformers.DenotTransformer @@ -73,11 +73,11 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer { trait CodegenCore { // assert(owner ne null); assert(owner ne NoSymbol) - def freshSym(pos: Position, tp: Type = NoType, unique: UniqueNameExtractor = PatMatStdBinderName, owner: Symbol = ctx.owner) = { + def freshSym(pos: Position, tp: Type = NoType, unique: UniqueNameKind = PatMatStdBinderName, owner: Symbol = ctx.owner) = { ctx.newSymbol(owner, unique.fresh(), Flags.Synthetic | Flags.Case, tp, coord = pos) } - def newSynthCaseLabel(unique: UniqueNameExtractor, tpe: Type, owner: Symbol = ctx.owner) = + def newSynthCaseLabel(unique: UniqueNameKind, tpe: Type, owner: Symbol = ctx.owner) = ctx.newSymbol(owner, unique.fresh(), Flags.Label | Flags.Synthetic | Flags.Method, tpe).asTerm //NoSymbol.newLabel(freshName(name), NoPosition) setFlag treeInfo.SYNTH_CASE_FLAGS diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index 1df10cac2..e7936e8d9 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -13,7 +13,7 @@ import Decorators._ import DenotTransformers._ import StdNames._ import NameOps._ -import NameExtractors._ +import NameKinds._ import ast.Trees._ import util.Positions._ import Names._ diff --git a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala index 1b3018d9b..4c07ca4c8 100644 --- a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala @@ -10,7 +10,7 @@ import Decorators._ import Names._ import StdNames._ import NameOps._ -import NameExtractors._ +import NameKinds._ import Flags._ import Annotations._ diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala index 87e9c1013..10c18e165 100644 --- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala +++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala @@ -10,7 +10,7 @@ import DenotTransformers.DenotTransformer import Denotations.SingleDenotation import Symbols._ import Types._ -import NameExtractors.TailLabelName +import NameKinds.TailLabelName import TreeTransforms.{MiniPhaseTransform, TransformerInfo} /** diff --git a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala index a651c0c74..44d26e7dd 100644 --- a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala +++ b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala @@ -5,7 +5,7 @@ import core.Symbols._ import core.StdNames._ import ast.Trees._ import core.Types._ -import core.NameExtractors.ExceptionBinderName +import core.NameKinds.ExceptionBinderName import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags import dotty.tools.dotc.core.Contexts.Context -- cgit v1.2.3