Add associated consts to parsing

Author: JulianKnodt

chalk-parse/src/ast.rs

@@ -142,6 +142,7 @@ pub struct TraitDefn {
     pub variable_kinds: Vec<VariableKind>,
     pub where_clauses: Vec<QuantifiedWhereClause>,
     pub assoc_ty_defns: Vec<AssocTyDefn>,
+    pub assoc_const_defns: Vec<AssocConstDefn>,
     pub flags: TraitFlags,
     pub well_known: Option<WellKnownTrait>,
 }
@@ -182,6 +183,12 @@ pub struct AssocTyDefn {
     pub where_clauses: Vec<QuantifiedWhereClause>,
 }
 
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct AssocConstDefn {
+    pub name: Identifier,
+    pub ty: Ty,
+}
+
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct OpaqueTyDefn {
     pub ty: Ty,

chalk-parse/src/parser.lalrpop

@@ -257,12 +257,13 @@ ClosureArgs: Vec<Ty> = {
 
 TraitDefn: TraitDefn = {
     <auto:AutoKeyword?> <marker:MarkerKeyword?> <upstream:UpstreamKeyword?> <fundamental:FundamentalKeyword?> <non_enumerable:NonEnumerableKeyword?> <coinductive:CoinductiveKeyword?> <object_safe:ObjectSafeKeyword?> <well_known:WellKnownTrait?> "trait" <n:Id><p:Angle<VariableKind>>
-        <w:QuantifiedWhereClauses> "{" <a:AssocTyDefn*> "}" => TraitDefn
+        <w:QuantifiedWhereClauses> "{" <a:AssocTyDefn*> <ac:AssocConstDefn*> "}" => TraitDefn
     {
         name: n,
         variable_kinds: p,
         where_clauses: w,
         assoc_ty_defns: a,
+        assoc_const_defns: ac,
         well_known,
         flags: TraitFlags {
             auto: auto.is_some(),
@@ -289,6 +290,15 @@ AssocTyDefn: AssocTyDefn = {
     }
 };
 
+AssocConstDefn: AssocConstDefn = {
+  "const" <name:Id> ":" <ty:Ty> ";" => {
+    AssocConstDefn {
+      name: name,
+      ty: ty,
+    }
+  }
+};
+
 OpaqueTyDefn: OpaqueTyDefn = {
     "opaque" "type" <name:Id> <p:Angle<VariableKind>> <b:(":" <Plus<QuantifiedInlineBound>>)?>
         <w:QuantifiedWhereClauses> "=" <ty:Ty> ";" => {