diff --git a/VERSION b/VERSION index 26e650d..a025f90 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.142 +1.5.143 diff --git a/base/spice.c b/base/spice.c index 060c2f9..2e040dd 100644 --- a/base/spice.c +++ b/base/spice.c @@ -1983,11 +1983,15 @@ void IncludeSpice(char *fname, int parent, struct cellstack **CellStackPtr, if (strchr(fname, '.') == NULL) { SetExtension(name, fname, SPICE_EXTENSION); filenum = OpenParseFile(name, parent); - } - if (filenum < 0) { - Fprintf(stderr,"Error in SPICE file include: No file %s\n",name); - return; + if (filenum < 0) { + Fprintf(stderr, "Error in SPICE file include: No file %s\n", name); + return; + } } + else { + Fprintf(stderr, "Error in SPICE file include: No file %s\n", fname); + return; + } } } ReadSpiceFile(fname, parent, CellStackPtr, blackbox); diff --git a/base/verilog.c b/base/verilog.c index ccecf45..c9e7a2c 100644 --- a/base/verilog.c +++ b/base/verilog.c @@ -2043,11 +2043,15 @@ void IncludeVerilog(char *fname, int parent, struct cellstack **CellStackPtr, if (strchr(fname, '.') == NULL) { SetExtension(name, fname, VERILOG_EXTENSION); filenum = OpenParseFile(name, parent); + if (filenum < 0) { + fprintf(stderr,"Error in Verilog file include: No file %s\n", name); + return; + } } - if (filenum < 0) { + else { fprintf(stderr,"Error in Verilog file include: No file %s\n", fname); return; - } + } } } ReadVerilogFile(fname, parent, CellStackPtr, blackbox); diff --git a/tcltk/tclnetgen.c b/tcltk/tclnetgen.c index 96a6e03..67ea64f 100644 --- a/tcltk/tclnetgen.c +++ b/tcltk/tclnetgen.c @@ -2974,6 +2974,10 @@ _netcmp_equate(ClientData clientData, Fprintf(stdout, "Warning: Equate pins: cell %s " "has no definition, treated as a black box.\n", name2); } + // If a cell in either circuit is marked as a black box, then + // the cells in both circuits should be marked as a black box. + tp1->flags |= CELL_PLACEHOLDER; + tp2->flags |= CELL_PLACEHOLDER; } else { Fprintf(stdout, "Equate pins: cell %s and/or %s "