Skip to content

Commit d930580

Browse files
Schottkyc137Schottkyc137
authored
Add baseline analysis and completions for simple external names (#383)
* Add baseline analysis and completions for simple external names * Add Region to concurrent entity kind
1 parent 0e7a8ff commit d930580

File tree

16 files changed

+291
-45
lines changed

16 files changed

+291
-45
lines changed

‎vhdl_lang/src/analysis/concurrent.rs‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<'a> AnalyzeContext<'a, '_> {
4949
let ent = self.arena.explicit(
5050
label.name(),
5151
parent,
52-
AnyEntKind::Concurrent(statement.statement.item.label_typ()),
52+
AnyEntKind::Concurrent(statement.statement.item.label_typ(), Region::default()),
5353
Some(label.pos(self.ctx)),
5454
span,
5555
Some(self.source()),
@@ -62,7 +62,7 @@ impl<'a> AnalyzeContext<'a, '_> {
6262
scope.anonymous_designator(),
6363
Some(parent),
6464
Related::None,
65-
AnyEntKind::Concurrent(statement.statement.item.label_typ()),
65+
AnyEntKind::Concurrent(statement.statement.item.label_typ(), Region::default()),
6666
None,
6767
span,
6868
Some(self.source()),
@@ -109,6 +109,13 @@ impl<'a> AnalyzeContext<'a, '_> {
109109
)?;
110110
self.analyze_declarative_part(&nested, parent, &mut block.decl, diagnostics)?;
111111
self.analyze_concurrent_part(&nested, parent, &mut block.statements, diagnostics)?;
112+
let ent = self.arena.get(statement.label.decl.get().unwrap());
113+
unsafe {
114+
ent.set_kind(AnyEntKind::Concurrent(
115+
Some(Concurrent::Block),
116+
nested.into_region(),
117+
));
118+
}
112119
}
113120
ConcurrentStatement::Process(ref mut process) => {
114121
let ProcessStatement {
@@ -131,6 +138,13 @@ impl<'a> AnalyzeContext<'a, '_> {
131138
self.define_labels_for_sequential_part(&nested, parent, statements, diagnostics)?;
132139
self.analyze_declarative_part(&nested, parent, decl, diagnostics)?;
133140
self.analyze_sequential_part(&nested, parent, statements, diagnostics)?;
141+
let ent = self.arena.get(statement.label.decl.get().unwrap());
142+
unsafe {
143+
ent.set_kind(AnyEntKind::Concurrent(
144+
Some(Concurrent::Process),
145+
nested.into_region(),
146+
));
147+
}
134148
}
135149
ConcurrentStatement::ForGenerate(ref mut gen) => {
136150
let ForGenerateStatement {
@@ -154,6 +168,13 @@ impl<'a> AnalyzeContext<'a, '_> {
154168
diagnostics,
155169
);
156170
self.analyze_generate_body(&nested, parent, body, src_span, diagnostics)?;
171+
let ent = self.arena.get(statement.label.decl.get().unwrap());
172+
unsafe {
173+
ent.set_kind(AnyEntKind::Concurrent(
174+
Some(Concurrent::Generate),
175+
nested.into_region(),
176+
));
177+
}
157178
}
158179
ConcurrentStatement::IfGenerate(ref mut gen) => {
159180
let Conditionals {
@@ -249,7 +270,7 @@ impl<'a> AnalyzeContext<'a, '_> {
249270
self.ctx,
250271
self.arena,
251272
parent,
252-
AnyEntKind::Concurrent(Some(Concurrent::Generate)),
273+
AnyEntKind::Concurrent(Some(Concurrent::Generate), Region::default()),
253274
span,
254275
Some(self.source()),
255276
);

‎vhdl_lang/src/analysis/declarative.rs‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,26 @@ impl Declaration {
4747
match parent {
4848
// LRM: block_declarative_item
4949
AnyEntKind::Design(Design::Architecture(..))
50-
| AnyEntKind::Concurrent(Some(Concurrent::Block | Concurrent::Generate)) => matches!(
51-
self,
52-
Object(ObjectDeclaration {
53-
class: Constant | Signal | SharedVariable,
54-
..
55-
}) | File(_)
56-
| Type(_)
57-
| Component(_)
58-
| Attribute(_)
59-
| Alias(_)
60-
| SubprogramDeclaration(_)
61-
| SubprogramInstantiation(_)
62-
| SubprogramBody(_)
63-
| Use(_)
64-
| Package(_)
65-
| Configuration(_)
66-
| View(_)
67-
),
50+
| AnyEntKind::Concurrent(Some(Concurrent::Block | Concurrent::Generate), _) => {
51+
matches!(
52+
self,
53+
Object(ObjectDeclaration {
54+
class: Constant | Signal | SharedVariable,
55+
..
56+
}) | File(_)
57+
| Type(_)
58+
| Component(_)
59+
| Attribute(_)
60+
| Alias(_)
61+
| SubprogramDeclaration(_)
62+
| SubprogramInstantiation(_)
63+
| SubprogramBody(_)
64+
| Use(_)
65+
| Package(_)
66+
| Configuration(_)
67+
| View(_)
68+
)
69+
}
6870
// LRM: configuration_declarative_item
6971
AnyEntKind::Design(Design::Configuration) => {
7072
matches!(self, Use(_) | Attribute(ast::Attribute::Specification(_)))
@@ -92,7 +94,7 @@ impl Declaration {
9294
| Overloaded::UninstSubprogramDecl(..)
9395
| Overloaded::UninstSubprogram(..),
9496
)
95-
| AnyEntKind::Concurrent(Some(Concurrent::Process))
97+
| AnyEntKind::Concurrent(Some(Concurrent::Process), _)
9698
| AnyEntKind::Type(named_entity::Type::Protected(..)) => matches!(
9799
self,
98100
Object(ObjectDeclaration {
@@ -1261,7 +1263,7 @@ fn get_entity_class(ent: EntRef<'_>) -> Option<EntityClass> {
12611263
AnyEntKind::Type(Type::Subtype(_)) => Some(EntityClass::Subtype),
12621264
AnyEntKind::Type(_) => Some(EntityClass::Type),
12631265
AnyEntKind::ElementDeclaration(_) => None,
1264-
AnyEntKind::Concurrent(_) => Some(EntityClass::Label),
1266+
AnyEntKind::Concurrent(..) => Some(EntityClass::Label),
12651267
AnyEntKind::Sequential(_) => Some(EntityClass::Label),
12661268
AnyEntKind::Object(obj) => match obj.class {
12671269
ObjectClass::Signal => Some(EntityClass::Signal),

‎vhdl_lang/src/analysis/names.rs‎

Lines changed: 63 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ impl<'a> ResolvedName<'a> {
202202
AnyEntKind::Library
203203
| AnyEntKind::Attribute(_)
204204
| AnyEntKind::ElementDeclaration(_)
205-
| AnyEntKind::Concurrent(_)
205+
| AnyEntKind::Concurrent(..)
206206
| AnyEntKind::Sequential(_)
207207
| AnyEntKind::LoopParameter(_) => {
208208
return Err((
@@ -258,7 +258,7 @@ impl<'a> ResolvedName<'a> {
258258
| AnyEntKind::View(_)
259259
| AnyEntKind::InterfaceFile(_)
260260
| AnyEntKind::Component(_)
261-
| AnyEntKind::Concurrent(_)
261+
| AnyEntKind::Concurrent(..)
262262
| AnyEntKind::Sequential(_)
263263
| AnyEntKind::LoopParameter(_)
264264
| AnyEntKind::PhysicalLiteral(_) => ResolvedName::Final(ent),
@@ -1273,8 +1273,40 @@ impl<'a> AnalyzeContext<'a, '_> {
12731273
});
12741274
}
12751275
SplitName::External(ename) => {
1276-
let ExternalName { subtype, class, .. } = ename;
1276+
let ExternalName {
1277+
subtype,
1278+
class,
1279+
path,
1280+
..
1281+
} = ename;
12771282
let subtype = self.resolve_subtype_indication(scope, subtype, diagnostics)?;
1283+
match self.resolve_external_path(scope, path, diagnostics)? {
1284+
Some(ResolvedName::ObjectName(obj)) => {
1285+
if !self.can_be_target_type(obj.type_mark(), subtype.base()) {
1286+
diagnostics.push(Diagnostic::type_mismatch(
1287+
&path.pos(self.ctx),
1288+
&obj.describe_type(),
1289+
subtype.type_mark(),
1290+
))
1291+
}
1292+
if *class != obj.base.class().into() {
1293+
diagnostics.push(Diagnostic::new(
1294+
path.pos(self.ctx),
1295+
format!("class {} does not match {}", *class, obj.base.class()),
1296+
ErrorCode::MismatchedObjectClass,
1297+
))
1298+
}
1299+
}
1300+
None => {
1301+
// ignore; we do not analyze this yet
1302+
}
1303+
_ => {
1304+
diagnostics.push(Diagnostic::mismatched_kinds(
1305+
path.pos(self.ctx),
1306+
"External path must point to a constant, variable or signal",
1307+
));
1308+
}
1309+
}
12781310
return Ok(ResolvedName::ObjectName(ObjectName {
12791311
base: ObjectBase::ExternalName(*class),
12801312
type_mark: Some(subtype.type_mark().to_owned()),
@@ -1583,6 +1615,24 @@ impl<'a> AnalyzeContext<'a, '_> {
15831615
Ok(resolved)
15841616
}
15851617

1618+
// Currently, only resolves Package name
1619+
fn resolve_external_path(
1620+
&self,
1621+
scope: &Scope<'a>,
1622+
path: &mut WithTokenSpan<ExternalPath>,
1623+
diagnostics: &mut dyn DiagnosticHandler,
1624+
) -> EvalResult<Option<ResolvedName<'a>>> {
1625+
match &mut path.item {
1626+
ExternalPath::Package(pkg) => Ok(Some(self.name_resolve(
1627+
scope,
1628+
pkg.span,
1629+
&mut pkg.item,
1630+
diagnostics,
1631+
)?)),
1632+
_ => Ok(None),
1633+
}
1634+
}
1635+
15861636
// Helper function:
15871637
// Resolve a name that must be some kind of object selection, index or slice
15881638
// Such names occur as assignment targets and aliases
@@ -2251,7 +2301,7 @@ constant c0 : rec_t := (others => 0);
22512301
",
22522302
);
22532303

2254-
assert_matches!(test.name_resolve(&test.snippet("c0.field"), None, &mut NoDiagnostics),
2304+
assert_matches!(test.name_resolve(&test.snippet("c0.field"), None, &mut NoDiagnostics),
22552305
Ok(ResolvedName::ObjectName(oname)) if oname.type_mark() == test.lookup_type("natural"));
22562306
}
22572307

@@ -2493,7 +2543,7 @@ type enum2_t is (alpha, beta);
24932543
test.declarative_part(
24942544
"
24952545
type ptr_t is access integer_vector;
2496-
variable vptr : ptr_t;
2546+
variable vptr : ptr_t;
24972547
",
24982548
);
24992549
let code = test.snippet("vptr(0 to 1)");
@@ -2509,7 +2559,7 @@ variable vptr : ptr_t;
25092559
test.declarative_part(
25102560
"
25112561
type ptr_t is access integer_vector;
2512-
variable vptr : ptr_t;
2562+
variable vptr : ptr_t;
25132563
",
25142564
);
25152565
let code = test.snippet("vptr(0)");
@@ -2637,7 +2687,7 @@ variable c0 : arr_t;
26372687
let test = TestSetup::new();
26382688
test.declarative_part(
26392689
"
2640-
type arr_t is array (integer range 0 to 3) of integer;
2690+
type arr_t is array (integer range 0 to 3) of integer;
26412691
",
26422692
);
26432693
let code = test.snippet("arr_t'left");
@@ -2654,7 +2704,7 @@ type arr_t is array (integer range 0 to 3) of integer;
26542704
let test = TestSetup::new();
26552705
test.declarative_part(
26562706
"
2657-
type arr_t is array (integer range 0 to 3, character range 'a' to 'c') of integer;
2707+
type arr_t is array (integer range 0 to 3, character range 'a' to 'c') of integer;
26582708
",
26592709
);
26602710
let code = test.snippet("arr_t'left(1)");
@@ -2710,7 +2760,7 @@ type arr_t is array (integer range 0 to 3, character range 'a' to 'c') of intege
27102760

27112761
test.declarative_part(
27122762
"
2713-
type arr_t is array (integer range 0 to 3) of integer;
2763+
type arr_t is array (integer range 0 to 3) of integer;
27142764
",
27152765
);
27162766

@@ -2729,7 +2779,7 @@ type arr_t is array (integer range 0 to 3) of integer;
27292779

27302780
test.declarative_part(
27312781
"
2732-
type arr_t is array (integer range 0 to 3) of integer;
2782+
type arr_t is array (integer range 0 to 3) of integer;
27332783
constant c0 : arr_t := (others => 0);
27342784
",
27352785
);
@@ -2749,7 +2799,7 @@ constant c0 : arr_t := (others => 0);
27492799

27502800
test.declarative_part(
27512801
"
2752-
type arr_t is array (integer range 0 to 3) of integer;
2802+
type arr_t is array (integer range 0 to 3) of integer;
27532803
constant c0 : arr_t := (others => 0);
27542804
",
27552805
);
@@ -2954,7 +3004,7 @@ variable thevar : integer;
29543004
let test = TestSetup::new();
29553005
test.declarative_part(
29563006
"
2957-
signal thesig : integer;
3007+
signal thesig : integer;
29583008
",
29593009
);
29603010

@@ -3100,7 +3150,7 @@ variable thevar : integer;
31003150
let test = TestSetup::new();
31013151
test.declarative_part(
31023152
"
3103-
signal thesig : integer;
3153+
signal thesig : integer;
31043154
",
31053155
);
31063156

‎vhdl_lang/src/analysis/package_instance.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ impl<'a> AnalyzeContext<'a, '_> {
173173
AnyEntKind::ElementDeclaration(self.map_subtype(mapping, *subtype, scope))
174174
}
175175
AnyEntKind::Sequential(s) => AnyEntKind::Sequential(*s),
176-
AnyEntKind::Concurrent(c) => AnyEntKind::Concurrent(*c),
176+
AnyEntKind::Concurrent(c, region) => {
177+
AnyEntKind::Concurrent(*c, self.map_region(parent, mapping, region, scope)?)
178+
}
177179
AnyEntKind::Object(obj) => AnyEntKind::Object(self.map_object(mapping, obj, scope)),
178180
AnyEntKind::LoopParameter(typ) => AnyEntKind::LoopParameter(
179181
typ.map(|typ| self.map_type_ent(mapping, typ.into(), scope).base()),

‎vhdl_lang/src/analysis/sequential.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ impl<'a> From<EntRef<'a>> for SequentialRoot<'a> {
438438
SequentialRoot::Process
439439
}
440440
}
441-
AnyEntKind::Concurrent(Some(Concurrent::Process)) => SequentialRoot::Process,
441+
AnyEntKind::Concurrent(Some(Concurrent::Process), _) => SequentialRoot::Process,
442442
_ => SequentialRoot::Process,
443443
}
444444
}

0 commit comments

Comments
 (0)