diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-12-05 11:57:34 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-12-05 11:58:23 +0100 |
| commit | 63fa05cf443f9a39b2b2ace1a8b68fc6fe3add70 (patch) | |
| tree | 4ee7e2157e559b24d86c338aa142a5ee804f2e08 | |
| parent | deb82d52d9cc65270e92a9298ef35943afee0eba (diff) | |
| download | dotty-63fa05cf443f9a39b2b2ace1a8b68fc6fe3add70.tar.gz dotty-63fa05cf443f9a39b2b2ace1a8b68fc6fe3add70.tar.bz2 dotty-63fa05cf443f9a39b2b2ace1a8b68fc6fe3add70.zip | |
Changing some assertions on isCommittable
| -rw-r--r-- | src/dotty/tools/dotc/ast/Trees.scala | 3 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/NameOps.scala | 4 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/TyperState.scala | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/ast/Trees.scala b/src/dotty/tools/dotc/ast/Trees.scala index 43c96b587..c1039a996 100644 --- a/src/dotty/tools/dotc/ast/Trees.scala +++ b/src/dotty/tools/dotc/ast/Trees.scala @@ -235,8 +235,7 @@ object Trees { * type. (Overridden by empty trees) */ def withType(tpe: Type)(implicit ctx: Context): ThisTree[Type] = { - // temporary solution to catch unreported errors early - if (tpe == ErrorType) assert(ctx.errorsReported || !ctx.typerState.isCommittable) + if (tpe == ErrorType) assert(ctx.errorsReported) withTypeUnchecked(tpe) } diff --git a/src/dotty/tools/dotc/core/NameOps.scala b/src/dotty/tools/dotc/core/NameOps.scala index 6b365babb..c9665577d 100644 --- a/src/dotty/tools/dotc/core/NameOps.scala +++ b/src/dotty/tools/dotc/core/NameOps.scala @@ -197,8 +197,10 @@ object NameOps { val p = name.indexOfSlice(TRAIT_SETTER_SEPARATOR) if (p >= 0) (name drop (p + TRAIT_SETTER_SEPARATOR.length)).asTermName.setterToGetter - else + else { + assert(name endsWith SETTER_SUFFIX, name) name.take(name.length - SETTER_SUFFIX.length).asTermName + } } /** Nominally, name$default$N, encoded for <init> */ diff --git a/src/dotty/tools/dotc/core/TyperState.scala b/src/dotty/tools/dotc/core/TyperState.scala index bac33e143..f46c58c90 100644 --- a/src/dotty/tools/dotc/core/TyperState.scala +++ b/src/dotty/tools/dotc/core/TyperState.scala @@ -64,7 +64,6 @@ extends TyperState(reporter) { override def commit()(implicit ctx: Context) = { val targetState = ctx.typerState assert(isCommittable) - assert(targetState.isCommittable) targetState.constraint = constraint val toCollect = new mutable.ListBuffer[PolyType] |