Add InterfaceObject data

Author: kraigher

vhdl_lang/src/analysis.rs

@@ -4,6 +4,7 @@
 //
 // Copyright (c) 2019, Olof Kraigher olof.kraigher@gmail.com
 
+#[macro_use]
 mod analyze;
 mod concurrent;
 mod declarative;

vhdl_lang/src/analysis/analyze.rs

@@ -72,6 +72,19 @@ impl AnalysisError {
     }
 }
 
+/// Converts an AnalysisResult to FatalNullResult
+macro_rules! ok_or_return {
+    ($result:ident, $diagnostics:ident) => {
+        match $result {
+            Ok(value) => value,
+            Err(err) => {
+                err.add_to($diagnostics)?;
+                return Ok(());
+            }
+        }
+    };
+}
+
 pub(super) struct AnalyzeContext<'a> {
     root: &'a DesignRoot,
 

vhdl_lang/src/analysis/declarative.rs

@@ -533,17 +533,26 @@ impl<'a> AnalyzeContext<'a> {
                 );
             }
             InterfaceDeclaration::Object(ref mut object_decl) => {
-                self.analyze_subtype_indication(
+                let subtype = self.resolve_subtype_indication(
                     region,
                     &mut object_decl.subtype_indication,
                     diagnostics,
-                )?;
+                );
+
                 if let Some(ref mut expression) = object_decl.expression {
                     self.analyze_expression(region, expression, diagnostics)?
                 }
+
+                let subtype = ok_or_return!(subtype, diagnostics);
+
                 region.add(
                     &object_decl.ident,
-                    NamedEntityKind::InterfaceObject(object_decl.class),
+                    NamedEntityKind::InterfaceObject(InterfaceObject {
+                        class: object_decl.class,
+                        mode: object_decl.mode,
+                        subtype,
+                        has_default: object_decl.expression.is_some(),
+                    }),
                     diagnostics,
                 );
             }

vhdl_lang/src/analysis/named_entity.rs

@@ -26,7 +26,7 @@ pub enum NamedEntityKind {
     InterfaceType,
     Label,
     Object(ObjectClass),
-    InterfaceObject(ObjectClass),
+    InterfaceObject(InterfaceObject),
     PhysicalLiteral,
     DeferredConstant,
     // The region of the protected type which needs to be extendend by the body
@@ -91,7 +91,7 @@ impl NamedEntityKind {
             InterfaceType => "type",
             Label => "label",
             Object(class) => class.describe(),
-            InterfaceObject(class) => class.describe(),
+            InterfaceObject(object) => object.class.describe(),
             PhysicalLiteral => "physical literal",
             DeferredConstant => "deferred constant",
             ProtectedType(..) => "protected type",
@@ -107,6 +107,15 @@ impl NamedEntityKind {
     }
 }
 
+/// Signals, (shared) variables and constants
+#[derive(Clone)]
+pub struct InterfaceObject {
+    pub class: ObjectClass,
+    pub mode: Mode,
+    pub subtype: Subtype,
+    pub has_default: bool,
+}
+
 #[derive(Clone)]
 pub struct Subtype {
     base: Arc<NamedEntity>,