- Fixed error tests to use isError

3 files changed, 11 insertions, 11 deletions

diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala
index a42d711398..c40252e189 100644
--- a/sources/scala/tools/scalac/typechecker/Analyzer.scala
+++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala
@@ -335,7 +335,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
     tp.unalias() match {
       case Type$TypeRef(_, sym, _) =>
 	if (sym.kind == CLASS) return true;
-	else if (sym.kind == ERROR) return false;
+	else if (sym.isError()) return false;
       case Type.ErrorType =>
 	return false;
       case _ =>
@@ -826,7 +826,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
 	    tree.asInstanceOf[Tree$PackageDef].packaged = packaged;
 	    popContext();
 	    val pkg: Symbol = checkStable(packaged).symbol();
-	    if (pkg != null && pkg.kind != ERROR) {
+	    if (pkg != null && !pkg.isError()) {
 	      if (pkg.isPackage()) {
 		pushContext(templ, pkg.moduleClass(), pkg.members());
 		enterSyms(body);
@@ -1415,7 +1415,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
         tree match {
           case Tree$Ident(_) | Tree$Select(_, _) =>
             val sym: Symbol = tree.symbol();
-            if (sym != null && sym.kind != ERROR && !sym.isValue()) {
+            if (sym != null && !sym.isError() && !sym.isValue()) {
               return error(tree.pos, "" + tree.symbol() + " is not a value");
             }
 	  case _ =>
@@ -1744,7 +1744,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
     //System.out.println(owner.info());//DEBUG
     val parents = templ.parents;
     transformConstrInvocationArgs(parents);
-    if (owner.kind != ERROR) {
+    if (!owner.isError()) {
       validateParentClasses(parents, owner.info().parents(), owner.typeOfThis());
     }
     pushContext(templ, owner, owner.members());
@@ -2457,7 +2457,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
 
 	    // convert type to constructor
 	    val tsym: Symbol = TreeInfo.methSymbol(fn1);
-	    if (tsym.kind != ERROR) {
+	    if (!tsym.isError()) {
 	      assert(tsym.isType(), tsym);
 	      fn1.getType().withDefaultArgs().unalias() match {
 		case Type$TypeRef(pre, c, argtypes) =>
@@ -2682,7 +2682,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
 	case Tree$Super(qualifier, mixin) =>
 	  val clazz: Symbol = qualifyingClass(tree, qualifier);
           tree.setSymbol(clazz);
-          if (clazz == Symbol.ERROR) {
+          if (clazz.isError()) {
 	    tree.setType(Type.ErrorType);
 	  } else {
 	    val parents = clazz.parents();
@@ -2703,7 +2703,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
 	case Tree$This(name) =>
 	  val clazz: Symbol = qualifyingClass(tree, name);
           tree.setSymbol(clazz);
-          if (clazz == Symbol.ERROR)
+          if (clazz.isError())
 	    tree.setType(Type.ErrorType);
 	  else
  	    tree.setType(
diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java
index 7a1b8cb3db..8fb835786b 100644
--- a/sources/scalac/symtab/Type.java
+++ b/sources/scalac/symtab/Type.java
@@ -2703,7 +2703,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
         int lubKind = syms[0].kind;
         for (int i = 1; i < syms.length; i++) {
             Symbol sym = syms[i];
-            if (sym.kind == ERROR) return Symbol.NONE;
+            if (sym.isError()) return Symbol.NONE;
             if (sym.isType() && sym.kind != lubKind) lubKind = TYPE;
         }
         if (lubKind == syms[0].kind && tps[0].isSameAsAll(tps)) {
@@ -3132,7 +3132,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
     public int hashCode() {
         switch (this) {
         case ErrorType:
-            return ERROR;
+            return ERRORtpe;
         case NoType:
             return NOtpe;
         case NoPrefix:
diff --git a/sources/scalac/transformer/matching/PatternNode.java b/sources/scalac/transformer/matching/PatternNode.java
index cfa0d1b079..d5e0f675a4 100644
--- a/sources/scalac/transformer/matching/PatternNode.java
+++ b/sources/scalac/transformer/matching/PatternNode.java
@@ -160,8 +160,8 @@ public class PatternNode {
             switch (q) {
             case VariablePat(Tree other):
                 return (tree.symbol() != null) &&
-                    (tree.symbol().kind != Kinds.NONE) &&
-                    (tree.symbol().kind != Kinds.ERROR) &&
+                    (!tree.symbol().isNone()) &&
+                    (!tree.symbol().isError()) &&
                     (tree.symbol() == other.symbol());
             }
             return false;