From 625e043efffac2864275d0d74bf45a62f642bc11 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Fri, 15 Oct 2021 09:13:02 -0400
Subject: [PATCH] Made a correction to the flattening code, removed a duplicate
 print statement, and clarified the messages about non-matching circuits at
 the end, all of them suggestions made by Mitch Bailey (see issue #34 on
 github).

---
 VERSION             |  2 +-
 tcltk/netgen.tcl.in | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index 4b0033d..27774a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.204
+1.5.205
diff --git a/tcltk/netgen.tcl.in b/tcltk/netgen.tcl.in
index 7c2e1e4..861b1c9 100644
--- a/tcltk/netgen.tcl.in
+++ b/tcltk/netgen.tcl.in
@@ -567,7 +567,8 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
 	           netgen::flatten class "[lindex $endval 1] $fnum2"
 	       } else {
 	           netgen::log put "  Continuing with black-boxed subcircuits $endval\n"
-		   lappend matcherr [lindex $endval 0]
+		   lappend matcherr [lindex $endval 0]"(1)"
+		   lappend matcherr [lindex $endval 1]"(2)"
 	           # Match pins
                    netgen::log echo off
 	           if {$dolist == 1} {
@@ -609,16 +610,15 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
       } else {
 	 # Flatten the non-matching subcircuit (but not the top-level cells)
          if {[netgen::print queue] != {}} {
-	    if {([lsearch $noflat [lindex $endval 1]] == -1) &&
+	    if {([lsearch $noflat [lindex $endval 0]] == -1) &&
 		    ([lsearch $noflat [lindex $endval 1]] == -1)} {
 	       netgen::log put "  Flattening non-matched subcircuits $endval\n"
 	       netgen::flatten class "[lindex $endval 0] $fnum1"
 	       netgen::flatten class "[lindex $endval 1] $fnum2"
 	    } else {
 	       netgen::log put "  Continuing with black-boxed subcircuits $endval\n"
-	       lappend matcherr [lindex $endval 0]
-	       netgen::log put "  Continuing with black-boxed subcircuits $endval\n"
-	       lappend matcherr [lindex $endval 0]
+	       lappend matcherr [lindex $endval 0]"(1)"
+	       lappend matcherr [lindex $endval 1]"(2)"
 	       # Match pins
                netgen::log echo off
 	       if {$dolist == 1} {