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

Changed the behavior with respect to backslashes in the JSON so that 

they are converted to the double-backslash escape that is the proper
JSON syntax for backslashes, instead of being removed, which changes
the name and can be confusing.
This commit is contained in:
Tim Edwards 2020-01-13 09:03:36 -05:00
parent a16086d2e9
commit bf671937b9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tcltk/netgen.tcl.in
View File

@ -138,7 +138,7 @@ proc netgen::convert_to_json {filename lvs_final} {
foreach net $cktval { foreach net $cktval {
incr nidx incr nidx
puts $fjson " \[" puts $fjson " \["
set netname [string map {"\\" ""} [lindex $net 0]] set netname [string map {"\\" "\\\\"} [lindex $net 0]]
puts $fjson " \"$netname\"," puts $fjson " \"$netname\","
puts $fjson " \[" puts $fjson " \["
set netconn [lindex $net 1] set netconn [lindex $net 1]
@ -169,7 +169,7 @@ proc netgen::convert_to_json {filename lvs_final} {
foreach net $cktval { foreach net $cktval {
incr nidx incr nidx
puts $fjson " \[" puts $fjson " \["
set netname [string map {"\\" ""} [lindex $net 0]] set netname [string map {"\\" "\\\\"} [lindex $net 0]]
puts $fjson " \"$netname\"," puts $fjson " \"$netname\","
puts $fjson " \[" puts $fjson " \["
set netconn [lindex $net 1] set netconn [lindex $net 1]
@ -221,7 +221,7 @@ proc netgen::convert_to_json {filename lvs_final} {
foreach inst $cktval { foreach inst $cktval {
incr iidx incr iidx
puts $fjson " \[" puts $fjson " \["
set instname [string map {"\\" ""} [lindex $inst 0]] set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
puts $fjson " \"$instname\"," puts $fjson " \"$instname\","
puts $fjson " \[" puts $fjson " \["
set instpins [lindex $inst 1] set instpins [lindex $inst 1]
@ -250,7 +250,7 @@ proc netgen::convert_to_json {filename lvs_final} {
foreach inst $cktval { foreach inst $cktval {
incr iidx incr iidx
puts $fjson " \[" puts $fjson " \["
set instname [string map {"\\" ""} [lindex $inst 0]] set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
puts $fjson " \"$instname\"," puts $fjson " \"$instname\","
puts $fjson " \[" puts $fjson " \["
set instpins [lindex $inst 1] set instpins [lindex $inst 1]
@ -292,8 +292,8 @@ proc netgen::convert_to_json {filename lvs_final} {
foreach instance $value { foreach instance $value {
incr pidx incr pidx
puts $fjson " \[" puts $fjson " \["
set instnames [string map {"\\" ""} [lindex $instance 0]] set instnames [string map {"\\" "\\\\"} [lindex $instance 0]]
set instname0 [string map {"\\" ""} [lindex $instnames 0]] set instname0 [string map {"\\" "\\\\"} [lindex $instnames 0]]
puts $fjson " \[" puts $fjson " \["
puts $fjson " \"${instname0}\"," puts $fjson " \"${instname0}\","
puts $fjson " \[" puts $fjson " \["
@ -310,7 +310,7 @@ proc netgen::convert_to_json {filename lvs_final} {
puts $fjson " \[\"${propname}\", \"${propval}\"\]" puts $fjson " \[\"${propname}\", \"${propval}\"\]"
puts $fjson " \]" puts $fjson " \]"
puts $fjson " \]," puts $fjson " \],"
set instname1 [string map {"\\" ""} [lindex $instnames 1]] set instname1 [string map {"\\" "\\\\"} [lindex $instnames 1]]
puts $fjson " \[" puts $fjson " \["
puts $fjson " \"${instname1}\"," puts $fjson " \"${instname1}\","
puts $fjson " \[" puts $fjson " \["