Add package declaration in declarative part

VHDL-LS · May 30, 2024 · dba05d4 · dba05d4
1 parent 805ab71
commit dba05d4
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 1 deletion.
diff --git a/vhdl_lang/src/analysis/declarative.rs b/vhdl_lang/src/analysis/declarative.rs
@@ -41,6 +41,7 @@ impl Declaration {
                     | SubprogramBody(_)
                     | Use(_)
                     | Package(_)
+                    | PackageDeclaration(_)
                     | Configuration(_)
                     | View(_)
             ),
@@ -61,6 +62,7 @@ impl Declaration {
                     | SubprogramBody(_)
                     | Use(_)
                     | Package(_)
+                    | PackageDeclaration(_)
                     | View(_)
             ),
             // LRM: package_body_declarative_item
@@ -86,6 +88,7 @@ impl Declaration {
                     | SubprogramBody(_)
                     | Use(_)
                     | Package(_)
+                    | PackageDeclaration(_)
             ),
             // LRM: package_declarative_item
             AnyEntKind::Design(Design::Package(..)) => matches!(
@@ -100,6 +103,7 @@ impl Declaration {
                     | SubprogramInstantiation(_)
                     | Use(_)
                     | Package(_)
+                    | PackageDeclaration(_)
                     | View(_)
             ),
             _ => {
@@ -606,6 +610,9 @@ impl<'a, 't> AnalyzeContext<'a, 't> {
                     scope.add(ent, diagnostics);
                 }
             }
+            Declaration::PackageDeclaration(..) => {
+                // TODO
+            }
             Declaration::Configuration(..) => {}
             Declaration::View(view) => {
                 if let Some(view) = as_fatal(self.analyze_view_declaration(

diff --git a/vhdl_lang/src/analysis/names.rs b/vhdl_lang/src/analysis/names.rs
@@ -1845,6 +1845,7 @@ impl Declaration {
             Declaration::SubprogramBody(_) => "subprogram body",
             Declaration::Use(_) => "use",
             Declaration::Package(_) => "package instantiation",
+            Declaration::PackageDeclaration(_) => "package",
             Declaration::Configuration(_) => "configuration",
             Declaration::View(_) => "view",
         }

diff --git a/vhdl_lang/src/ast.rs b/vhdl_lang/src/ast.rs
@@ -852,6 +852,7 @@ pub enum Declaration {
     SubprogramBody(SubprogramBody),
     Use(UseClause),
     Package(PackageInstantiation),
+    PackageDeclaration(PackageDeclaration),
     Configuration(ConfigurationSpecification),
     View(ModeViewDeclaration),
 }

diff --git a/vhdl_lang/src/ast/search.rs b/vhdl_lang/src/ast/search.rs
@@ -1080,6 +1080,10 @@ impl Search for Declaration {
                 return_if_found!(package_instance.search(ctx, searcher));
             }
 
+            Declaration::PackageDeclaration(ref package_instance) => {
+                return_if_found!(package_instance.search(ctx, searcher)); // @TODO
+            }
+
             Declaration::Configuration(_) => {
                 // @TODO
             }

diff --git a/vhdl_lang/src/named_entity.rs b/vhdl_lang/src/named_entity.rs
@@ -631,6 +631,7 @@ impl HasEntityId for Declaration {
             Declaration::SubprogramBody(body) => body.ent_id(),
             Declaration::SubprogramInstantiation(decl) => decl.ent_id(),
             Declaration::Package(pkg) => pkg.ent_id(),
+            Declaration::PackageDeclaration(_) => None, // @TODO
             Declaration::Use(_) => None,
             Declaration::Configuration(_) => None,
             Declaration::View(decl) => decl.ent_id(),

diff --git a/vhdl_lang/src/syntax/declarative_part.rs b/vhdl_lang/src/syntax/declarative_part.rs
@@ -10,6 +10,7 @@ use super::common::ParseResult;
 use super::component_declaration::parse_component_declaration;
 use super::configuration::parse_configuration_specification;
 use super::context::parse_use_clause;
+use super::design_unit::parse_package_declaration;
 use super::names::parse_selected_name;
 use super::object_declaration::{parse_file_declaration, parse_object_declaration};
 use super::subprogram::parse_subprogram;
@@ -104,7 +105,13 @@ pub fn parse_declarative_part(
                     Type | Subtype => parse_type_declaration(ctx).map(Declaration::Type)?,
                     Component => parse_component_declaration(ctx).map(Declaration::Component)?,
                     Impure | Pure | Function | Procedure => parse_subprogram(ctx)?,
-                    Package => parse_package_instantiation(ctx).map(Declaration::Package)?,
+                    Package => {
+                        if ctx.stream.next_kinds_are(&[Package, Identifier, Is, New]) {
+                            parse_package_instantiation(ctx).map(Declaration::Package)?
+                        } else {
+                            parse_package_declaration(ctx).map(Declaration::PackageDeclaration)?
+                        }
+                    }
                     For => {
                         parse_configuration_specification(ctx).map(Declaration::Configuration)?
                     }

diff --git a/vhdl_lang/src/syntax/design_unit.rs b/vhdl_lang/src/syntax/design_unit.rs
@@ -933,4 +933,27 @@ end entity y;
         assert_eq!(tok.kind, Context);
         assert_eq!(tok.pos, code.s1("context").pos());
     }
+
+    #[test]
+    fn parse_package_declaration_in_declarative_part() {
+        let code = Code::new(
+            "\
+architecture arch of ent is
+  package my_pkg is
+      -- ...
+   end package;
+begin
+end arch;
+        ",
+        );
+        let file = code.design_file();
+        let (tokens, _) = &file.design_units[0];
+        assert_eq!(tokens[0].kind, Architecture);
+        assert_eq!(tokens[1].kind, Identifier);
+        assert_eq!(tokens[5].kind, Package);
+        assert_eq!(tokens[6].kind, Identifier);
+        assert_eq!(tokens[7].kind, Is);
+        assert_eq!(tokens[8].kind, End);
+        assert_eq!(tokens[9].kind, Package);
+    }
 }