diff --git a/VERSION b/VERSION index adc464c..7e4aaed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.229 +1.5.234 diff --git a/tcltk/netgen.tcl.in b/tcltk/netgen.tcl.in index 55f1f10..18fa8d9 100644 --- a/tcltk/netgen.tcl.in +++ b/tcltk/netgen.tcl.in @@ -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} { diff --git a/tcltk/tclnetgen.c b/tcltk/tclnetgen.c index 165dba2..10c3355 100644 --- a/tcltk/tclnetgen.c +++ b/tcltk/tclnetgen.c @@ -2650,6 +2650,14 @@ _netcmp_verify(ClientData clientData, else Fprintf(stdout, "Netlists do not match.\n"); } + else if (automorphisms == -2) { + if (index == EQUIV_IDX) + Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1)); + else if (index == UNIQUE_IDX) + Tcl_SetObjResult(interp, Tcl_NewIntObj(-2)); + else if (index > 0) + Fprintf(stdout, "Circuits match uniquely with port errors.\n"); + } else { if (automorphisms) { if (index == EQUIV_IDX)