Merge branch 'master' into netgen-1.5

Version updated along with the merge of pull request #62 from
Mitch Bailey.
2026-08-27 16:36:42 +02:00 · 2022-09-24 02:00:02 -04:00 · 2022-09-23 16:04:49 -04:00 · 2022-09-21 08:05:39 -07:00 · 2022-09-18 02:00:02 -04:00 · 2022-09-17 14:33:27 -04:00
3 changed files with 9 additions and 7 deletions
@@ -1 +1 @@
-1.5.231
+1.5.233
@@ -7675,8 +7675,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	 break;
      }
   }
-   if (hasDevices1 != hasDevices2)
-      result = -2;	// Attempt to compare empty cell to non-empty cell
+   if (hasDevices1 != hasDevices2 && result != 1)
+      result = -2;	// Attempt to compare empty cell to non-empty cell fails if pins don't match exactly

   if (result < 0) return result;

@@ -62,16 +62,18 @@ proc netgen::convert_to_json {filename lvs_final} {
 	          puts $fjson "      \["
 		  set cktval [lindex $value 0]
 		  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 "      \], \["
 		  set cktval [lindex $value 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 "      \]"
 		  if {$kidx == $nkeys} {
Author	SHA1	Message	Date
Tim Edwards	8d7569e9a3	Merge branch 'master' into netgen-1.5	2022-09-24 02:00:02 -04:00
Tim Edwards	2f9e898ec6	Version updated along with the merge of pull request #62 from Mitch Bailey.	2022-09-23 16:04:49 -04:00
D. Mitch Bailey	9663579dd0	Restore matching circuits if one is empty (but only if pins match).	2022-09-21 08:05:39 -07:00
Tim Edwards	d9425163e1	Merge branch 'master' into netgen-1.5	2022-09-18 02:00:02 -04:00
Tim Edwards	f02e2b1ee0	Handled backslash-escapes (convert "\" to "\\") when writing pins to the JSON format file (since JSON does not allow single backslash characters. Previously nets had been handled correctly, but not pins. Resolves github issue tracker Issue #60 from Proppy.	2022-09-17 14:33:27 -04:00
@@ -1 +1 @@
 .5.231
 .5.233