luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix LVS: same_nets with two arguments was not working as described

This commit is contained in:
Matthias Koefferlein 2023-02-02 00:30:00 +01:00
parent d98bfa67d0
commit 0e60c90514
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lvs/lvs/built-in-macros/_lvs_netter.rb
View File

@ -587,7 +587,7 @@ CODE
raise("Too many arguments to 'same_nets' (need max 4)") raise("Too many arguments to 'same_nets' (need max 4)")
end end
if args.size == 3 if args.size == 2
( ca, a ) = args ( ca, a ) = args
cb = nil cb = nil
ca.is_a?(String) || raise("Circuit argument of 'same_nets' must be a string") ca.is_a?(String) || raise("Circuit argument of 'same_nets' must be a string")
@ -620,7 +620,7 @@ CODE
cs = !(nl_a.is_case_sensitive? && nl_b.is_case_sensitive?) cs = !(nl_a.is_case_sensitive? && nl_b.is_case_sensitive?)
if ca.is_a?(String) && !cb if ca.is_a?(String) && (!cb || cb == "*")
n2c = {} n2c = {}
nl_a.circuits_by_name(ca).each { |c| name = cs ? c.name.upcase : c.name; n2c[name] ||= [ nil, nil ]; n2c[name][0] = c } nl_a.circuits_by_name(ca).each { |c| name = cs ? c.name.upcase : c.name; n2c[name] ||= [ nil, nil ]; n2c[name][0] = c }
@ -647,7 +647,7 @@ CODE
circuits.each do |circuit_a, circuit_b| circuits.each do |circuit_a, circuit_b|
if a.is_a?(String) && !b if a.is_a?(String) && (!b || b == "*")
n2n = {} n2n = {}
circuit_a.nets_by_name(a).each { |n| name = cs ? n.name.upcase : n.name; n2n[name] ||= [ nil, nil ]; n2n[name][0] = n } circuit_a.nets_by_name(a).each { |n| name = cs ? n.name.upcase : n.name; n2n[name] ||= [ nil, nil ]; n2n[name][0] = n }

2
testdata/lvs/blackbox2.lvs vendored
View File

@ -6,7 +6,7 @@ schematic("blackbox_schematic.cir")
deep deep
same_nets!("TOP", "*", "*") same_nets!("TOP", "*")
m1 = input(1, 0) m1 = input(1, 0)
via = input(2, 0) via = input(2, 0)