Store InterfaceListType in InterfaceObjectDeclaration of AST

Author: Johannes Zeppenfeld

vhdl_lang/src/ast.rs

@@ -515,6 +515,13 @@ pub enum ObjectClass {
     SharedVariable,
 }
 
+#[derive(PartialEq, Debug, Clone, Copy)]
+pub enum InterfaceListType {
+    Port,
+    Generic,
+    Parameter,
+}
+
 #[derive(PartialEq, Debug, Clone)]
 pub struct ObjectDeclaration {
     pub class: ObjectClass,
@@ -583,6 +590,7 @@ pub struct InterfaceFileDeclaration {
 /// LRM 6.5.2 Interface object declarations
 #[derive(PartialEq, Debug, Clone)]
 pub struct InterfaceObjectDeclaration {
+    pub list_type: InterfaceListType,
     pub class: ObjectClass,
     pub ident: Ident,
     pub mode: Mode,

vhdl_lang/src/syntax/interface_declaration.rs

@@ -144,6 +144,7 @@ fn parse_interface_object_declaration(
         .into_iter()
         .map(|ident| {
             InterfaceDeclaration::Object(InterfaceObjectDeclaration {
+                list_type,
                 mode,
                 class: object_class,
                 ident,
@@ -258,13 +259,6 @@ fn parse_semicolon_separator(stream: &mut TokenStream) -> ParseResult<()> {
     Ok(())
 }
 
-#[derive(PartialEq, Clone, Copy)]
-enum InterfaceListType {
-    Port,
-    Generic,
-    Parameter,
-}
-
 fn is_sync_kind(list_type: InterfaceListType, kind: Kind) -> bool {
     matches!(
         (list_type, kind),
@@ -405,13 +399,15 @@ mod tests {
             code.with_stream_no_diagnostics(parse_generic_interface_list),
             vec![
                 InterfaceDeclaration::Object(InterfaceObjectDeclaration {
+                    list_type: InterfaceListType::Generic,
                     mode: Mode::In,
                     class: ObjectClass::Constant,
                     ident: code.s1("foo").ident(),
                     subtype_indication: code.s1("natural").subtype_indication(),
                     expression: None
                 }),
                 InterfaceDeclaration::Object(InterfaceObjectDeclaration {
+                    list_type: InterfaceListType::Generic,
                     mode: Mode::In,
                     class: ObjectClass::Constant,
                     ident: code.s1("bar").ident(),
@@ -428,6 +424,7 @@ mod tests {
         assert_eq!(
             code.with_stream(parse_generic),
             InterfaceDeclaration::Object(InterfaceObjectDeclaration {
+                list_type: InterfaceListType::Generic,
                 mode: Mode::In,
                 class: ObjectClass::Constant,
                 ident: code.s1("foo").ident(),
@@ -479,6 +476,7 @@ mod tests {
         assert_eq!(
             code.with_stream(parse_port),
             InterfaceDeclaration::Object(InterfaceObjectDeclaration {
+                list_type: InterfaceListType::Port,
                 mode: Mode::In,
                 class: ObjectClass::Signal,
                 ident: code.s1("foo").ident(),
@@ -546,8 +544,8 @@ mod tests {
         assert_eq!(
             code.with_stream(parse_generic),
             InterfaceDeclaration::Object(InterfaceObjectDeclaration {
+                list_type: InterfaceListType::Generic,
                 mode: Mode::In,
-
                 class: ObjectClass::Constant,
                 ident: code.s1("foo").ident(),
                 subtype_indication: code.s1("std_logic").subtype_indication(),
@@ -562,8 +560,8 @@ mod tests {
         assert_eq!(
             code.with_stream(parse_port),
             InterfaceDeclaration::Object(InterfaceObjectDeclaration {
+                list_type: InterfaceListType::Port,
                 mode: Mode::In,
-
                 class: ObjectClass::Signal,
                 ident: code.s1("foo").ident(),
                 subtype_indication: code.s1("std_logic").subtype_indication(),