luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into magic-8.2

This commit is contained in:
Tim Edwards 2019-11-20 03:00:05 -05:00
parent 90a2cc4fdc 3aa09725cb
commit 1c499c2593
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cif/CIFrdcl.c
View File

@ -1508,13 +1508,18 @@ CIFReadCellCleanup(filetype)
freeMagic((char *)def->cd_client);
def->cd_client = (ClientData)CLIENTDEFAULT;
#if 0
/* If the CDFLATTENED flag was not set, then this geometry */
/* was never instantiated, and should generate a warning. */
/* was never instantiated, and should generate a message. */
/* However, this is not an error condition as there are a */
/* number of useful reasons to copy lots of information up */
/* the GDS hierarchy for "just in case" scenarios. */
if (!(def->cd_flags & CDFLATTENED))
CIFReadError("%s read error: Unresolved geometry in cell"
CIFReadWarning("%s read: Unresolved geometry in cell"
" %s maps to no magic layers\n",
(filetype == FILE_CIF) ? "CIF" : "GDS", def->cd_name);
#endif
#if 0
/* Remove the cell if it has no parents, no children, and no geometry */

10
cif/CIFrdutils.c
View File

@ -120,7 +120,10 @@ CIFReadError(char *format, ...)
if (CIFWarningLevel == CIF_WARN_NONE) return;
if ((cifTotalErrors < 100) || (CIFWarningLevel != CIF_WARN_LIMIT))
{
TxError("Error at line %d of CIF file: ", cifLineNumber);
if (cifLineNumber > 0)
TxError("Error at line %d of CIF file: ", cifLineNumber);
else
TxError("CIF file read error: ", cifLineNumber);
va_start(args, format);
Vfprintf(stderr, format, args);
va_end(args);
@ -141,7 +144,10 @@ CIFReadWarning(char *format, ...)
if (CIFWarningLevel == CIF_WARN_NONE) return;
if ((cifTotalWarnings < 100) || (CIFWarningLevel != CIF_WARN_LIMIT))
{
TxError("Warning at line %d of CIF file: ", cifLineNumber);
if (cifLineNumber > 0)
TxError("Warning at line %d of CIF file: ", cifLineNumber);
else
TxError("CIF file read warning: ");
va_start(args, format);
Vfprintf(stderr, format, args);
va_end(args);

10
extract/ExtBasic.c
View File

@ -2800,10 +2800,16 @@ extTransPerimFunc(bp)
devptr = extDevFindMatch(devptr, tinside);
if (devptr == deventry) devptr = NULL;
}
if (devptr == NULL)
{
TxError("Error: Cannot find valid terminals on device %s!\n",
DBTypeLongNameTbl[tinside]);
/* Outside type is not a terminal, so return to the original */
/* device record. NOTE: Should probably check if this device */
/* type is a FET, as being here would indicate an error. */
/* However, failure to find all terminals will be flagged as an */
/* error elsewhere. */
extTransRec.tr_devrec = deventry;
}
/*