"trait" instead of "trait class"

virtual -> open
 "final" introduced
 "wraps" dropped

grammar/src/class.grm

@@ -17,9 +17,9 @@ internal class Example<X, T : Comparable<X>>(protected val x : Foo<X, T>, y : So
 */
 
 class
-  : modifiers "class" SimpleName
+  : modifiers ("class" | "trait") SimpleName
       typeParameters?
-      ("wraps" valueParameters? | modifiers valueParameters?)?
+      modifiers ("(" primaryConstructorParameter{","} ")")?
       (":" annotations delegationSpecifier{","})?
       typeConstraints
       (classBody? | enumClassBody)

grammar/src/lexical.grm

@@ -115,17 +115,15 @@ ref
 try
 
 Soft:
-wraps -- in a class header
 where -- in class, function and type headers
 by -- in a class header (Delegation specifier)
-lazy -- in a property/parameter declaration
 get, set -- in a property definition
 import
+final
 abstract
-virtual
 enum
 open
-attribute
+annotation
 override
 private
 public

grammar/src/modifiers.grm

@@ -17,7 +17,7 @@ modifier
 
 classModifier
   : "abstract"
-  : "virtual"
+  : "final"
   : "enum"
   : "open"
   : "attribute"
@@ -25,7 +25,8 @@ classModifier
 
 memberModifier
   : "override"
-  : "virtual"
+  : "open"
+  : "final"
   : "abstract"
   ;