Add WithDecl and base reference search on EntityId instead of SrcPos

Author: kraigher

vhdl_lang/src/analysis.rs

@@ -26,4 +26,4 @@ mod visibility;
 mod tests;
 
 pub use self::root::DesignRoot;
-pub use named_entity::NamedEntity;
+pub use named_entity::{HasNamedEntity, NamedEntity};

vhdl_lang/src/analysis/analyze.rs

@@ -4,12 +4,14 @@
 //
 // Copyright (c) 2019, Olof Kraigher olof.kraigher@gmail.com
 
+use super::named_entity::HasNamedEntity;
 use super::region::*;
 use super::root::*;
 use crate::ast::*;
 use crate::data::*;
 use fnv::FnvHashSet;
 use std::cell::RefCell;
+use std::ops::Deref;
 use std::sync::Arc;
 
 pub enum AnalysisError {
@@ -167,10 +169,11 @@ impl<'a> AnalyzeContext<'a> {
             match unit.kind() {
                 AnyKind::Primary(..) => {
                     let data = self.get_analysis(Some(use_pos), unit)?;
-                    region.make_potentially_visible(
-                        Some(use_pos),
-                        data.result().ent.clone().unwrap(),
-                    );
+                    if let AnyDesignUnit::Primary(primary) = data.deref() {
+                        if let Some(ent) = primary.named_entity() {
+                            region.make_potentially_visible(Some(use_pos), ent.clone());
+                        }
+                    }
                 }
                 AnyKind::Secondary(..) => {}
             }
@@ -284,7 +287,11 @@ impl<'a> AnalyzeContext<'a> {
         if let Designator::Identifier(ref primary_name) = primary_name {
             if let Some(unit) = self.get_primary_unit(library_name, primary_name) {
                 let data = self.get_analysis(Some(pos), unit)?;
-                return Ok(data.result().ent.clone().unwrap());
+                if let AnyDesignUnit::Primary(primary) = data.deref() {
+                    if let Some(ent) = primary.named_entity() {
+                        return Ok(ent.clone());
+                    }
+                }
             }
         }
 

vhdl_lang/src/analysis/concurrent.rs

@@ -34,8 +34,8 @@ impl<'a> AnalyzeContext<'a> {
         statement: &mut LabeledConcurrentStatement,
         diagnostics: &mut dyn DiagnosticHandler,
     ) -> FatalNullResult {
-        if let Some(ref label) = statement.label {
-            parent.add(label.clone(), NamedEntityKind::Label, diagnostics);
+        if let Some(ref mut label) = statement.label {
+            parent.add(label.define(NamedEntityKind::Label), diagnostics);
         }
 
         match statement.statement {
@@ -89,8 +89,7 @@ impl<'a> AnalyzeContext<'a> {
                 self.analyze_discrete_range(parent, discrete_range, diagnostics)?;
                 let mut region = parent.nested();
                 region.add(
-                    index_name.clone(),
-                    NamedEntityKind::LoopParameter,
+                    index_name.define(NamedEntityKind::LoopParameter),
                     diagnostics,
                 );
                 self.analyze_generate_body(&mut region, body, diagnostics)?;
@@ -169,7 +168,7 @@ impl<'a> AnalyzeContext<'a> {
             statements,
         } = body;
         if let Some(label) = alternative_label {
-            region.add(label.clone(), NamedEntityKind::Label, diagnostics);
+            region.add(label.define(NamedEntityKind::Label), diagnostics);
         }
         if let Some(ref mut decl) = decl {
             self.analyze_declarative_part(region, decl, diagnostics)?;