make common sort

Author: Dwight Guth

semantics/common/syntax.k

@@ -3,7 +3,8 @@ module COMMON-SORTS
      imports SYMLOC-SORTS
      imports INT-SYNTAX
      imports FLOAT-SYNTAX
-     syntax CValue ::= BitValue | Agg | Encodable | IntPtr
+     syntax CValue ::= BitValueOrEncodable | Agg | IntPtr
+     syntax BitValueOrEncodable ::= BitValue | Encodable
      syntax EffectiveValue ::= Int | Float | CValue
      syntax Agg
      syntax CId

semantics/cpp/language/common/dynamic.k

@@ -386,9 +386,8 @@ module CPP-DYNAMIC-OTHER-SYNTAX
      imports SET
      imports BOOL
 
-     syntax CPPValue ::= BitValue
+     syntax CPPValue ::= BitValueOrEncodable
                        | PtrValue
-                       | Encodable
 
      syntax PtrValue ::= NullPtrVal // value of type std::nullptr_t
                        | MemberPtr