*** empty log message ***

4 files changed, 6 insertions, 10 deletions

diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java
index eb5d31426c..99610f4843 100644
--- a/sources/scalac/ast/parser/Parser.java
+++ b/sources/scalac/ast/parser/Parser.java
@@ -1637,26 +1637,22 @@ public class Parser implements Tokens {
     /** ObjectDef       ::= Id [`:' SimpleType] ClassTemplate
      */
     Tree objectDef(int mods) {
-        return make.ObjectDef(
+        return make.ModuleDef(
 	    s.pos, mods, ident(), simpleTypedOpt(), classTemplate());
     }
 
-    /** ClassTemplate ::= `extends' Template
-     *                 |  TemplateBody
-     *                 |
+    /** ClassTemplate ::= [`extends' Constr] {`with' Constr} [TemplateBody]
      */
     Template classTemplate() {
         int pos = s.pos;
 	if (s.token == EXTENDS) {
 	    s.nextToken();
 	    return template();
-/*
 	} else if (s.token == WITH) {
 	    s.nextToken();
 	    TreeList parents = new TreeList();
 	    parents.append(scalaObjectConstr(pos));
 	    return template(parents);
-*/
 	} else if (s.token == LBRACE) {
 	    return (Template)make.Template(
 		pos, new Tree[]{scalaObjectConstr(pos)}, templateBody());
diff --git a/sources/scalac/ast/parser/Scanner.java b/sources/scalac/ast/parser/Scanner.java
index e2a95d3dbf..7d180b3ef3 100644
--- a/sources/scalac/ast/parser/Scanner.java
+++ b/sources/scalac/ast/parser/Scanner.java
@@ -491,7 +491,6 @@ public class Scanner extends TokenData {
 	name = Name.fromAscii(buf, start, end - start);
 	if (name.index <= maxKey) {
 	    token = key[name.index];
-	    if (token == OBJECT1) token = OBJECT; //todo: elim
 	}
 	else
 	    token = IDENTIFIER;
diff --git a/sources/scalac/typechecker/Infer.java b/sources/scalac/typechecker/Infer.java
index 0289eca05a..f413322284 100644
--- a/sources/scalac/typechecker/Infer.java
+++ b/sources/scalac/typechecker/Infer.java
@@ -981,7 +981,8 @@ public class Infer implements Modifiers, Kinds {
 			alts[best], alttypes[best], alts[i], alttypes[i]) +
 			" argument types " +
 			ArrayApply.toString(argtypes, "(", ",", ")") +
-			" and expected result type " + pt);
+			((pt == Type.AnyType) ? ""
+			 : " and expected result type " + pt));
 		}
 	    }
 	    tree.setSymbol(alts[best]).setType(alttypes[best]);
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java
index 11486c645b..5731454a8b 100644
--- a/sources/scalac/typechecker/RefCheck.java
+++ b/sources/scalac/typechecker/RefCheck.java
@@ -258,7 +258,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 		    if (caseSeen.isCaseClass())
 			unit.error(
 			    clazz.pos, "illegal combination of case " +
-			    caseSeen + "and case " + baseClazz + " in one object");
+			    caseSeen + "and case " + baseclazz + " in one object");
 		    else
 			caseSeen = baseclazz;
 
@@ -804,7 +804,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	    if (sym.isLocal() && !sym.isModule() && index <= maxindex[level]) {
 		if (Global.instance.debug)
 		    System.out.println(refsym[level] + ":" + refsym[level].type());
-		String kind == ((sym.flags & MUTABLE) != 0) ? "variable" : "value";
+		String kind = ((sym.flags & MUTABLE) != 0) ? "variable" : "value";
 		unit.error(
 		    refpos[level],
 		    "forward reference extends over definition of " + kind + " " +