From 1bb486622630576643fa2f1971fc3d77d81ea90a Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Sat, 23 Oct 2021 14:41:58 -0400
Subject: [PATCH] Revert "Made a correction to the flattening code, removed a
 duplicate"

This reverts commit 625e043efffac2864275d0d74bf45a62f642bc11.

Reverting back to before pull request #33.
---
 VERSION             |  2 +-
 tcltk/netgen.tcl.in | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index 27774a1..4b0033d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.205
+1.5.204
diff --git a/tcltk/netgen.tcl.in b/tcltk/netgen.tcl.in
index 861b1c9..7c2e1e4 100644
--- a/tcltk/netgen.tcl.in
+++ b/tcltk/netgen.tcl.in
@@ -567,8 +567,7 @@ 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]"(1)"
-		   lappend matcherr [lindex $endval 1]"(2)"
+		   lappend matcherr [lindex $endval 0]
 	           # Match pins
                    netgen::log echo off
 	           if {$dolist == 1} {
@@ -610,15 +609,16 @@ 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 0]] == -1) &&
+	    if {([lsearch $noflat [lindex $endval 1]] == -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]"(1)"
-	       lappend matcherr [lindex $endval 1]"(2)"
+	       lappend matcherr [lindex $endval 0]
+	       netgen::log put "  Continuing with black-boxed subcircuits $endval\n"
+	       lappend matcherr [lindex $endval 0]
 	       # Match pins
                netgen::log echo off
 	       if {$dolist == 1} {