Fixed some bugs in override axioms (but still missing support for classes with type parameters).

Resolve ClassDecl.TraitsTyp as types.
Moved declaration of TraitParent and NoTraitAtAll to prelude.

1 files changed, 5 insertions, 2 deletions

diff --git a/Source/Dafny/Printer.cs b/Source/Dafny/Printer.cs
index b8c99b00..5fa232f1 100644
--- a/Source/Dafny/Printer.cs
+++ b/Source/Dafny/Printer.cs
@@ -319,8 +319,11 @@ namespace Microsoft.Dafny {
       Contract.Requires(c != null);

       Indent(indent);

       PrintClassMethodHelper((c is TraitDecl) ? "trait" : "class", c.Attributes, c.Name, c.TypeArgs);

-      if (c.TraitsStr!=string.Empty) {

-          wr.Write(" extends {0}", c.TraitsStr);

+      string sep = " extends ";

+      foreach (var trait in c.TraitsTyp) {

+        wr.Write(sep);

+        PrintType(trait);

+        sep = ", ";

       }

       if (c.Members.Count == 0) {

         wr.WriteLine(" { }");