classdec syntax added in stmt-syntax

Author: laurayuwen

src/common/core-sorts.k

@@ -224,16 +224,16 @@ syntax LocMetadata ::= "LocalLocMetadata"   [latex(\terminal{Local})]
 
 //todo: why does this pure syntax definition affect krun?
 //PackageName, AmbName and PackageorTypeName syntax doesn't cause problems
-                    syntax PackageName ::= List{Id,"."} [seqstrict, klabel('PackageName)]
+//                    syntax PackageName ::= List{Id,"."} [seqstrict, klabel('PackageName)]
 //                     syntax ExprName::= Id  [strict, klabel('ExprName)]
 //                                         |AmbName "." Id [strict, klabel('ExprName)]
 //breaks if any other syntax is added
 //                     syntax TypeName ::= Id [strict, klabel('TypeName)]
 //                                         |PackageOrTypeName "." Id [strict, klabel('TypeName)]
-                     syntax AmbName ::= Id [strict, klabel('AmbName)]
-                                         |AmbName "." Id [strict, klabel('AmbName)]
+//                     syntax AmbName ::= Id [strict, klabel('AmbName)]
+//                                         |AmbName "." Id [strict, klabel('AmbName)]
 //                     syntax MethodName ::= Id [strict,klabel('MethodName)]
 //                                            |AmbName "." Id [strict,klabel('MethodName)]
-                     syntax PackageOrTypeName ::= Id [strict,klabel('PackageOrTypeName)]
-                                                   |PackageOrTypeName "." Id [strict,klabel('PackageOrTypeName)]
+//                     syntax PackageOrTypeName ::= Id [strict,klabel('PackageOrTypeName)]
+//                                                   |PackageOrTypeName "." Id [strict,klabel('PackageOrTypeName)]
 endmodule

src/common/stmt-syntax.k

@@ -63,5 +63,8 @@ syntax SynchronizedStmt ::= "synchronized" "(" Exp ")" Block [strict(1),klabel('
 //todo: replace Exp with StmtExp when all StmtExp are defined
 syntax ExprStmt ::= Exp ";"  [strict, klabel('ExprStm)]
 
+syntax ClassBody ::= "{" KListWrap "}" [klabel('ClassBody)]
+syntax ClassDecHead ::= KListWrap "class" Id K K K [klabel('ClassDecHead)]
+syntax ClassDec ::= ClassDecHead ClassBody [klabel('ClassDec)]
 endmodule
 

src/exec/new-instance.k

@@ -147,7 +147,7 @@ The last two terms bring computation to the state required to continue execution
 */
 rule [qualified-new-instance]:
     <k>
-      Qual:KResult . new Class:ClassType( Args:TypedVals )
+      (Qual:KResult . new Class:ClassType( Args:TypedVals ))
       => staticInit(Class)
         ~> create(Class)
         ~> setEncloser(typedLookup(L), Class, Qual)