aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc
diff options
context:
space:
mode:
authorDmitry Petrashko <dmitry.petrashko@gmail.com>2015-04-09 16:11:59 +0200
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-04-09 16:11:59 +0200
commit9602523e0b6b89b73f77ac45f9a5b58060fcd6cf (patch)
tree1931f9408365849418261673826be15666b150ff /src/dotty/tools/dotc
parent34e77a9fe24106728a21d6d88a7ee8e42cca4dae (diff)
downloaddotty-9602523e0b6b89b73f77ac45f9a5b58060fcd6cf.tar.gz
dotty-9602523e0b6b89b73f77ac45f9a5b58060fcd6cf.tar.bz2
dotty-9602523e0b6b89b73f77ac45f9a5b58060fcd6cf.zip
Replace tabs with 4 spaces in Dotty source.
Diffstat (limited to 'src/dotty/tools/dotc')
-rw-r--r--src/dotty/tools/dotc/core/SymbolLoaders.scala2
-rw-r--r--src/dotty/tools/dotc/core/pickling/PickleFormat.scala38
-rw-r--r--src/dotty/tools/dotc/typer/ProtoTypes.scala2
-rw-r--r--src/dotty/tools/dotc/typer/Typer.scala4
-rw-r--r--src/dotty/tools/dotc/typer/Variances.scala4
5 files changed, 25 insertions, 25 deletions
diff --git a/src/dotty/tools/dotc/core/SymbolLoaders.scala b/src/dotty/tools/dotc/core/SymbolLoaders.scala
index a863ad1b9..8656a751b 100644
--- a/src/dotty/tools/dotc/core/SymbolLoaders.scala
+++ b/src/dotty/tools/dotc/core/SymbolLoaders.scala
@@ -152,7 +152,7 @@ class SymbolLoaders {
def doComplete(root: SymDenotation)(implicit ctx: Context): Unit = {
assert(root is PackageClass, root)
- def maybeModuleClass(classRep: ClassPath#ClassRep) = classRep.name.last == '$'
+ def maybeModuleClass(classRep: ClassPath#ClassRep) = classRep.name.last == '$'
val pre = root.owner.thisType
root.info = ClassInfo(pre, root.symbol.asClass, Nil, currentDecls, pre select sourceModule)
if (!sourceModule.isCompleted)
diff --git a/src/dotty/tools/dotc/core/pickling/PickleFormat.scala b/src/dotty/tools/dotc/core/pickling/PickleFormat.scala
index 872265e2d..d12a879ba 100644
--- a/src/dotty/tools/dotc/core/pickling/PickleFormat.scala
+++ b/src/dotty/tools/dotc/core/pickling/PickleFormat.scala
@@ -29,7 +29,7 @@ Macro-format:
Section = NameRef Length Bytes
Length = Nat // length of rest of entry in bytes
- Name = UTF8 Length UTF8-CodePoint*
+ Name = UTF8 Length UTF8-CodePoint*
QUALIFIED Length qualified_NameRef selector_NameRef
SIGNED Length original_NameRef resultSig_NameRef paramSig_NameRef*
EXPANDED Length original_NameRef
@@ -95,7 +95,7 @@ Standard-Section: "ASTs" TopLevelStat*
TYPEAPPLY Length fn_Term arg_Type*
CaseDef = CASEDEF Length pat_Term rhs_Tree guard_Tree?
ImplicitArg = IMPLICITARG arg_Term
- ASTRef = Nat // byte position in AST payload
+ ASTRef = Nat // byte position in AST payload
Path = Constant
TERMREFdirect sym_ASTRef
@@ -146,10 +146,10 @@ Standard-Section: "ASTs" TopLevelStat*
NameType = paramName_NameRef typeOrBounds_ASTRef
Modifier = PRIVATE
- INTERNAL // package private
+ INTERNAL // package private
PROTECTED
- PRIVATEqualified qualifier_Type // will be dropped
- PROTECTEDqualified qualifier_Type // will be dropped
+ PRIVATEqualified qualifier_Type // will be dropped
+ PROTECTEDqualified qualifier_Type // will be dropped
ABSTRACT
FINAL
SEALED
@@ -158,20 +158,20 @@ Standard-Section: "ASTs" TopLevelStat*
LAZY
OVERRIDE
INLINE // macro
- ABSOVERRIDE // abstract override
- STATIC // mapped to static Java member
- OBJECT // an object or its class
+ ABSOVERRIDE // abstract override
+ STATIC // mapped to static Java member
+ OBJECT // an object or its class
TRAIT // a trait
- LOCAL // private[this] or protected[this]
- SYNTHETIC // generated by Scala compiler
- ARTIFACT // to be tagged Java Synthetic
- MUTABLE // a var
- LABEL // method generated as a label
- FIELDaccessor // getter or setter
- CASEaccessor // getter for case class param
- COVARIANT // type param marked “+”
- CONTRAVARIANT // type param marked “-”
- SCALA2X // Imported from Scala2.x
+ LOCAL // private[this] or protected[this]
+ SYNTHETIC // generated by Scala compiler
+ ARTIFACT // to be tagged Java Synthetic
+ MUTABLE // a var
+ LABEL // method generated as a label
+ FIELDaccessor // getter or setter
+ CASEaccessor // getter for case class param
+ COVARIANT // type param marked “+”
+ CONTRAVARIANT // type param marked “-”
+ SCALA2X // Imported from Scala2.x
DEFAULTparameterized // Method with default params
INSUPERCALL // defined in the argument of a constructor supercall
Annotation
@@ -199,7 +199,7 @@ Standard Section: "Positions" sourceLength_Nat Assoc*
// Difference of end offset of addressed node vs parent node.
// Offsets and addresses are difference encoded.
// Nodes which have the same positions as their parents are omitted.
- Delta = Int // Difference between consecutive offsets / tree addresses,
+ Delta = Int // Difference between consecutive offsets / tree addresses,
**************************************************************************************/
diff --git a/src/dotty/tools/dotc/typer/ProtoTypes.scala b/src/dotty/tools/dotc/typer/ProtoTypes.scala
index e2d4f6978..ac58615aa 100644
--- a/src/dotty/tools/dotc/typer/ProtoTypes.scala
+++ b/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -249,7 +249,7 @@ object ProtoTypes {
override def resultType(implicit ctx: Context) = resType
def isMatchedBy(tp: Type)(implicit ctx: Context): Boolean =
- ctx.typer.isApplicable(tp, argType :: Nil, resultType)
+ ctx.typer.isApplicable(tp, argType :: Nil, resultType)
def derivedViewProto(argType: Type, resultType: Type)(implicit ctx: Context) =
if ((argType eq this.argType) && (resultType eq this.resultType)) this
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index 4bb9b90d4..b066f1fc1 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -347,8 +347,8 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
val clsDef = TypeDef(x, templ).withFlags(Final)
typed(cpy.Block(tree)(clsDef :: Nil, New(Ident(x), Nil)), pt)
case _ =>
- val tpt1 = typedType(tree.tpt)
- checkClassTypeWithStablePrefix(tpt1.tpe, tpt1.pos, traitReq = false)
+ val tpt1 = typedType(tree.tpt)
+ checkClassTypeWithStablePrefix(tpt1.tpe, tpt1.pos, traitReq = false)
assignType(cpy.New(tree)(tpt1), tpt1)
// todo in a later phase: checkInstantiatable(cls, tpt1.pos)
}
diff --git a/src/dotty/tools/dotc/typer/Variances.scala b/src/dotty/tools/dotc/typer/Variances.scala
index 0fec1e5a7..0cc9e74cc 100644
--- a/src/dotty/tools/dotc/typer/Variances.scala
+++ b/src/dotty/tools/dotc/typer/Variances.scala
@@ -50,8 +50,8 @@ object Variances {
for ((tp, tparam1) <- tps zip tparams1) {
val v1 = varianceInType(tp)(tparam)
v = v & (if (tparam1.is(Covariant)) v1
- else if (tparam1.is(Contravariant)) flip(v1)
- else cut(v1))
+ else if (tparam1.is(Contravariant)) flip(v1)
+ else cut(v1))
}
v
}