Skip to content

Avoid creating NumericRange instances when not needed #3289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 9, 2017
Merged

Avoid creating NumericRange instances when not needed #3289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d83354
Avoid creating NumericalRange instances when not needed
nicolasstucki Oct 8, 2017
fb017bf
Fix typo
nicolasstucki Oct 9, 2017
74c3613
Rename
nicolasstucki Oct 9, 2017
ed56cb3
Make range clearer
nicolasstucki Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions compiler/src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,21 @@ class Definitions {
val decls = newScope
val arity = name.functionArity
val paramNamePrefix = tpnme.scala_ ++ str.NAME_JOIN ++ name ++ str.EXPAND_SEPARATOR
val argParams =
for (i <- List.range(1, arity + 1)) yield
enterTypeParam(cls, paramNamePrefix ++ "T" ++ i.toString, Contravariant, decls)
val argParamRefs = List.tabulate(arity) { i =>
enterTypeParam(cls, paramNamePrefix ++ "T" ++ (i + 1).toString, Contravariant, decls).typeRef
}
val resParam = enterTypeParam(cls, paramNamePrefix ++ "R", Covariant, decls)
val (methodType, parentTraits) =
if (name.firstPart.startsWith(str.ImplicitFunction)) {
val superTrait =
FunctionType(arity).appliedTo(argParams.map(_.typeRef) ::: resParam.typeRef :: Nil)
FunctionType(arity).appliedTo(argParamRefs ::: resParam.typeRef :: Nil)
(ImplicitMethodType, superTrait :: Nil)
}
else (MethodType, Nil)
val applyMeth =
decls.enter(
newMethod(cls, nme.apply,
methodType(argParams.map(_.typeRef), resParam.typeRef), Deferred))
methodType(argParamRefs, resParam.typeRef), Deferred))
denot.info =
ClassInfo(ScalaPackageClass.thisType, cls, ObjectType :: parentTraits, decls)
}
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Typer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
val MethodTpe(_, formals, restpe) = meth.info
(formals, restpe)
case _ =>
(List.range(0, defaultArity) map alwaysWildcardType, WildcardType)
(List.tabulate(defaultArity)(alwaysWildcardType), WildcardType)
}

def typedFunction(tree: untpd.Function, pt: Type)(implicit ctx: Context) = track("typedFunction") {
Expand Down
11 changes: 6 additions & 5 deletions compiler/src/dotty/tools/dotc/util/SourcePosition.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ extends interfaces.SourcePosition {
source.content.slice(source.startOfLine(start), source.nextLine(end))

/** The lines of the position */
def lines: List[Int] =
List.range(source.offsetToLine(start), source.offsetToLine(end + 1)) match {
case Nil => line :: Nil
case xs => xs
}
def lines: List[Int] = {
val startOffset = source.offsetToLine(start)
val endOffset = source.offsetToLine(end + 1)
if (startOffset >= endOffset) line :: Nil
else (startOffset until endOffset).toList
}

def lineOffsets: List[Int] =
lines.map(source.lineToOffset(_))
Expand Down