Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards 2022-09-18 02:00:02 -04:00
commit d9425163e1
2 changed files with 7 additions and 5 deletions

View File

@ -1 +1 @@
1.5.231 1.5.232

View File

@ -62,16 +62,18 @@ proc netgen::convert_to_json {filename lvs_final} {
puts $fjson " \[" puts $fjson " \["
set cktval [lindex $value 0] set cktval [lindex $value 0]
foreach pin [lrange $cktval 0 end-1] { foreach pin [lrange $cktval 0 end-1] {
puts $fjson " \"$pin\"," set pinstr [string map {"\\" "\\\\"} $pin]
puts $fjson " \"$pinstr\","
} }
set pin [lindex $cktval end] set pin [string map {"\\" "\\\\"} [lindex $cktval end]]
puts $fjson " \"$pin\"" puts $fjson " \"$pin\""
puts $fjson " \], \[" puts $fjson " \], \["
set cktval [lindex $value 1] set cktval [lindex $value 1]
foreach pin [lrange $cktval 0 end-1] { foreach pin [lrange $cktval 0 end-1] {
puts $fjson " \"$pin\"," set pinstr [string map {"\\" "\\\\"} $pin]
puts $fjson " \"$pinstr\","
} }
set pin [lindex $cktval end] set pin [string map {"\\" "\\\\"} [lindex $cktval end]]
puts $fjson " \"$pin\"" puts $fjson " \"$pin\""
puts $fjson " \]" puts $fjson " \]"
if {$kidx == $nkeys} { if {$kidx == $nkeys} {