Fixes for parse clashes with projections.

Author: chathhorn

semantics/cpp/language/common/dynamic.k

@@ -202,7 +202,7 @@ module CPP-SCOPE-SYNTAX
 
      syntax NamespaceScope ::= namespaceScope(Namespace)
 
-     syntax ClassScope ::= classScope(Class, isInBody: Bool)
+     syntax ClassScope ::= classScope(Class, inBody: Bool)
 
      syntax BlockScope ::= blockScope(QualId, SymBase, Int) [klabel(blockScopeCpp)]
 

semantics/cpp/language/translation/decl/declarator.k

@@ -342,7 +342,7 @@ module CPP-TRANSLATION-DECL-DECLARATOR
                    => defineLocalStaticObject(X, bnew(!I:Int, T, Set, static(Tu)), T, Init, Type, Set)
                    ~> Declare.potentiallyInvokeDestructor(T)
                ...</k>
-                   
+
           <curr-tr-scope> S::Scope </curr-tr-scope>
           <curr-template-context> noTemplate </curr-template-context>
           <curr-tr-tu> Tu::String </curr-tr-tu>
@@ -622,7 +622,7 @@ module CPP-TRANSLATION-DECL-DECLARATOR
           <curr-tr-program-loc> Loc::CabsLoc </curr-tr-program-loc>
           <external-decls-loc> DeclsLoc::Map => addOdrDecl(DeclsLoc, CName, Loc) </external-decls-loc>
 
-     syntax KItem ::= newExternalType(cname: CId, type: CPPType)
+     syntax NewExternalType ::= newExternalType(cname: CId, type: CPPType)
 
      rule <k> newExternalType(CName::CId, T::CPPType) => .K ...</k>
           <external-types> ET::Map => addOdrDecl(ET, CName, convertTypeToC(T)) </external-types>

semantics/cpp/language/translation/decl/enum.k

@@ -128,7 +128,7 @@ module CPP-TRANSLATION-DECL-ENUM
           <enum-type> cppEnumType #as E2::CPPType </enum-type>
           requires E1 =/=K E2
 
-     syntax KItem ::= declareEnumerators(CPPType, min: Int, max: Int, next: Int, prevType: CPPSimpleType, enums: List, fixed: Bool, first: Bool)
+     syntax DeclareEnumerators ::= declareEnumerators(CPPType, min: Int, max: Int, next: Int, prevType: CPPSimpleType, enums: List, fixed: Bool, first: Bool)
 
      rule (.K => C) ~> declareEnumerators(... enums: ListItem(DeclLoc(C::CabsLoc, D::Decl) => D) _)
 
@@ -272,7 +272,7 @@ module CPP-TRANSLATION-DECL-ENUM
      rule firstSuitableType(_, _, (ListItem(_) => .List) _) [owise]
 
 
-     syntax KItem ::= calculateEnumValues(CPPType, min: Int, max: Int)
+     syntax CalculateEnumValues ::= calculateEnumValues(CPPType, min: Int, max: Int)
 
      syntax Int ::= calculateMaxEnumValue(emin: Int, emax: Int) [function]
 
@@ -295,12 +295,12 @@ module CPP-TRANSLATION-DECL-ENUM
 
      rule calculateEnumValues(T::CPPType, Min::Int, Max::Int) => computeEnumUt(T, calculateMinEnumValue(Min, Max), calculateMaxEnumValue(Min, Max))
 
-     syntax KItem ::= computeEnumUt(CPPType, min: Int, max: Int)
+     syntax ComputeEnumUt ::= computeEnumUt(CPPType, min: Int, max: Int)
 
      // TODO(h0nzZik): packed enums
      rule computeEnumUt(T::CPPType, Min::Int, Max::Int) => setEnumMinMaxUt(T, Min, Max, type(firstSuitableType(Min, Max, integralTypesGreaterThanInt)))
 
-     syntax KItem ::= setEnumMinMaxUt(CPPType, min: Int, max: Int, ut: CPPType)
+     syntax SetEnumMinMaxUt ::= setEnumMinMaxUt(CPPType, min: Int, max: Int, ut: CPPType)
 
      rule <k> setEnumMinMaxUt(t(_, _, unscopedEnum(_ :: Enum(X::CId) #as E::Enum, _, Fixed:Bool)) #as T::CPPType, Min::Int, Max::Int, cppIntegerType #as UT::CPPType)
           => addEnumToEnv(X, t(noQuals, .Set, unscopedEnum(E, UT, Fixed))) ... </k>

semantics/cpp/language/translation/decl/initializer.k

@@ -7,8 +7,10 @@ module CPP-TRANSLATION-DECL-INITIALIZER-SYNTAX
      imports CPP-TYPING-SORTS
 
      // The 'duration' parameter is only passed to `bindReference`
-     syntax Expr ::= figureInit(base: Expr, destT: CPPType, init: Init, type: InitType, duration: Duration)
-                   | figureConstructorInit(base: Expr, destT: CPPType, init: Init, constructorType: Bool)
+     syntax Expr ::= figureConstructorInit(base: Expr, destT: CPPType, init: Init, constructorType: Bool)
+
+     syntax Expr ::= FigureInit
+     syntax FigureInit ::= figureInit(base: Expr, destT: CPPType, init: Init, type: InitType, duration: Duration)
 
      syntax Expr ::= valueInit(base: Expr, CPPType)
                    | defaultConstructorInit(base: Expr, CPPType, constructorType: Bool)
@@ -55,9 +57,11 @@ module CPP-TRANSLATION-DECL-INITIALIZER
      syntax Expr ::= #figureInit0(base: Expr, destT: CPPType, type: InitType, init: Init, ConstructorType, Duration)
                    | #figureInit(base: Expr, destT: CPPType, type: InitType, init: Init, srcT: K, srcCat: K, ConstructorType, Duration)
                    | constructorInit(LVal, InitType, Class, List, ConstructorType)
-                   | zeroInit(base: Expr, type: CPPType)
                    | InitStyle "(" Expr "," CPPType "," ConstructorType ")"
 
+     syntax Expr ::= ZeroInit
+     syntax ZeroInit ::= zeroInit(base: Expr, type: CPPType)
+
      syntax InitStyle ::= "defaultInit" | "#valueInit" | "#zeroInit"
 
      rule valueInit(Base::Expr, T::CPPType) => #valueInit(Base, T, NoConstructorInit)
@@ -260,8 +264,8 @@ module CPP-TRANSLATION-DECL-INITIALIZER
 
      syntax KItem ::= listInit(LVal, CPPType, InitType, List, ConstructorType, Duration)
                     | aggInit(LVal, CPPType, List, ConstructorType, Duration)
-                    | arrayInit(base: LVal, type: CPPType, current: Int, initList: List, result: MaybeExpr, ctype: ConstructorType, duration: Duration)
                     | strInit(LVal, CPPType, CharKind, String, Int, MaybeExpr)
+     syntax ArrayInit ::= arrayInit(base: LVal, type: CPPType, current: Int, initList: List, result: MaybeExpr, ctype: ConstructorType, duration: Duration)
 
      // @ref n4296 8.5.4:3.1 (aggregate init)
      rule listInit(Base::LVal, T::CPPType, _, L::List, CT::ConstructorType, D::Duration)

semantics/cpp/language/translation/temporary.k

@@ -4,7 +4,8 @@ module CPP-TRANSLATION-TEMPORARY-SYNTAX
      imports CPP-SORTS
      imports CPP-TYPING-SORTS
 
-     syntax Expr ::= createTemporary(temporary: Expr, type: CPPType, init: KItem) [strict(3)]
+     syntax Expr ::= CreateTemporary
+     syntax CreateTemporary ::= createTemporary(temporary: Expr, type: CPPType, init: KItem) [strict(3)]
 endmodule
 
 module CPP-TRANSLATION-TEMPORARY