@@ -524,7 +524,7 @@ function expand_instream(csets::AbstractVector{<:ConnectionSet}, sys::AbstractSy
524
524
subsys = get_systems (sys)
525
525
526
526
if debug
527
- @info " Expanding" namespace
527
+ @info " Expanding" namespace
528
528
end
529
529
530
530
sub = Dict ()
@@ -547,7 +547,7 @@ function expand_instream(csets::AbstractVector{<:ConnectionSet}, sys::AbstractSy
547
547
expr_cset = Dict ()
548
548
for cset in csets
549
549
crep = first (cset. set)
550
- current = namespace == crep. sys. namespace
550
+ current = namespace == _getname ( crep. sys. namespace)
551
551
for v in cset. set
552
552
if (current || ! v. isouter)
553
553
expr_cset[namespaced_var (v)] = cset. set
@@ -605,7 +605,7 @@ function expand_instream(csets::AbstractVector{<:ConnectionSet}, sys::AbstractSy
605
605
606
606
# additional equations
607
607
additional_eqs = Equation[]
608
- csets = filter (cset -> any (e -> e. sys. namespace === namespace, cset. set), csets)
608
+ csets = filter (cset -> any (e -> _getname ( e. sys. namespace) === namespace, cset. set), csets)
609
609
for cset′ in csets
610
610
cset = cset′. set
611
611
connectors = Vector {Any} (undef, length (cset))
@@ -684,7 +684,7 @@ function expand_instream(csets::AbstractVector{<:ConnectionSet}, sys::AbstractSy
684
684
end
685
685
686
686
function get_current_var (namespace, cele, sv)
687
- states (renamespace (unnamespace (namespace, cele. sys. namespace), cele. sys. sys), sv)
687
+ states (renamespace (unnamespace (namespace, _getname ( cele. sys. namespace) ), cele. sys. sys), sv)
688
688
end
689
689
690
690
function get_cset_sv (full_name_sv, cset)
0 commit comments