Skip to content

Commit e056f33

Browse files
Split Simplify.scala in 15 files
1 parent 13edfbf commit e056f33

19 files changed

+1600
-1486
lines changed

compiler/src/dotty/tools/dotc/Compiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import core.DenotTransformers.DenotTransformer
1717
import core.Denotations.SingleDenotation
1818

1919
import dotty.tools.backend.jvm.{LabelDefs, GenBCode, CollectSuperCalls}
20-
import dotty.tools.dotc.transform.linker.Simplify
20+
import dotty.tools.dotc.transform.localopt.Simplify
2121

2222
/** The central class of the dotc compiler. The job of a compiler is to create
2323
* runs, which process given `phases` in a given `rootContext`.

compiler/src/dotty/tools/dotc/core/Definitions.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,12 @@ class Definitions {
368368

369369
lazy val SeqType: TypeRef = ctx.requiredClassRef("scala.collection.Seq")
370370
def SeqClass(implicit ctx: Context) = SeqType.symbol.asClass
371-
372371
lazy val Seq_applyR = SeqClass.requiredMethodRef(nme.apply)
373372
def Seq_apply(implicit ctx: Context) = Seq_applyR.symbol
374373
lazy val Seq_headR = SeqClass.requiredMethodRef(nme.head)
375374
def Seq_head(implicit ctx: Context) = Seq_headR.symbol
375+
lazy val SeqFactoryType: TypeRef = ctx.requiredClassRef("scala.collection.generic.SeqFactory")
376+
def SeqFactoryClass(implicit ctx: Context) = SeqFactoryType.symbol.asClass
376377

377378
lazy val ArrayType: TypeRef = ctx.requiredClassRef("scala.Array")
378379
def ArrayClass(implicit ctx: Context) = ArrayType.symbol.asClass
@@ -447,6 +448,8 @@ class Definitions {
447448
def Long_* = Long_mulR.symbol
448449
lazy val Long_divR = LongClass.requiredMethodRef(nme.DIV, List(LongType))
449450
def Long_/ = Long_divR.symbol
451+
val CommutativePrimitiveOperations = new PerRun[collection.Set[Symbol]](implicit ctx =>
452+
Set(defn.Boolean_&&, defn.Boolean_||, defn.Int_+, defn.Int_*, defn.Long_+, defn.Long_*))
450453

451454
lazy val FloatType: TypeRef = valueTypeRef("scala.Float", BoxedFloatType, java.lang.Float.TYPE, FloatEnc)
452455
def FloatClass(implicit ctx: Context) = FloatType.symbol.asClass

compiler/src/dotty/tools/dotc/transform/linker/Analysis.scala

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)