Merge

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/Dafny/Dafny.atg b/Source/Dafny/Dafny.atg
index edbac407..68a24e6c 100644
--- a/Source/Dafny/Dafny.atg
+++ b/Source/Dafny/Dafny.atg
@@ -355,7 +355,7 @@ ClassDecl<ModuleDefinition/*!*/ module, out ClassDecl/*!*/ c>
 = (. Contract.Requires(module != null);

      Contract.Ensures(Contract.ValueAtReturn(out c) != null);

      IToken/*!*/ id;

-     List<IToken>/*!*/ traitId=null;

+     Type/*!*/ trait = null;

 	 Attributes attrs = null;

      List<TypeParameter/*!*/> typeArgs = new List<TypeParameter/*!*/>();

      List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();

@@ -366,12 +366,12 @@ ClassDecl<ModuleDefinition/*!*/ module, out ClassDecl/*!*/ c>
   { Attribute<ref attrs> }

   NoUSIdent<out id>

   [ GenericParameters<typeArgs> ]

-  ["extends" QualifiedName<out traitId>]

-  "{"                                            (. bodyStart = t; .)

+  ["extends" Type<out trait>]         

+  "{"                                            (. bodyStart = t;  .)

   { ClassMemberDecl<members, true>

   }

   "}"

-  (. c = new ClassDecl(id, id.val, module, typeArgs, members, attrs, traitId);

+  (. c = new ClassDecl(id, id.val, module, typeArgs, members, attrs, trait);

      c.BodyStartTok = bodyStart;

      c.BodyEndTok = t;

   .)