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

Attempt to lighten up on the use of "fatal" referring to errors 

that are not fatal to the program, the circuit, and sometimes not
even errors.
This commit is contained in:
Tim Edwards 2021-12-31 14:02:58 -05:00
parent 271449128a
commit d65be34f98
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extract/ExtArray.c
View File

@ -377,7 +377,7 @@ extArrayProcess(ha, primary)
DBWFeedbackAdd(primary, DBWFeedbackAdd(primary,
"System error: expected array element but none found", "System error: expected array element but none found",
ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS);
extNumFatal++; extNumErrors++;
return; return;
} }
if (SigInterruptPending) goto done; if (SigInterruptPending) goto done;
@ -802,7 +802,7 @@ extArrayTileToNode(tp, pNum, et, ha, doHard)
/* Blew it */ /* Blew it */
if (!doHard) return ((char *) NULL); if (!doHard) return ((char *) NULL);
extNumFatal++; extNumErrors++;
TiToRect(tp, &r); TiToRect(tp, &r);
if (!DebugIsSet(extDebugID, extDebNoFeedback)) if (!DebugIsSet(extDebugID, extDebNoFeedback))
DBWFeedbackAdd(&r, errorStr, ha->ha_parentUse->cu_def, 1, DBWFeedbackAdd(&r, errorStr, ha->ha_parentUse->cu_def, 1,

16
extract/ExtCell.c
View File

@ -76,9 +76,9 @@ void extHeader();
* Side effects: * Side effects:
* Creates the file 'outName'.ext and writes to it. * Creates the file 'outName'.ext and writes to it.
* May leave feedback information where errors were encountered. * May leave feedback information where errors were encountered.
* Upon return, extNumFatal contains the number of fatal errors * Upon return, extNumErrors contains the number of (likely serious)
* encountered while extracting 'def', and extNumWarnings contains * errors encountered while extracting 'def', and extNumWarnings
* the number of warnings. * contains the number of warnings.
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
@ -115,16 +115,16 @@ ExtCell(def, outName, doLength)
return NULL; return NULL;
} }
extNumFatal = extNumWarnings = 0; extNumErrors = extNumWarnings = 0;
savePlane = extCellFile(def, f, doLength); savePlane = extCellFile(def, f, doLength);
(void) fclose(f); (void) fclose(f);
if (extNumFatal > 0 || extNumWarnings > 0) if (extNumErrors > 0 || extNumWarnings > 0)
{ {
TxPrintf("%s:", def->cd_name); TxPrintf("%s:", def->cd_name);
if (extNumFatal > 0) if (extNumErrors > 0)
TxPrintf(" %d fatal error%s", TxPrintf(" %d fatal error%s",
extNumFatal, extNumFatal != 1 ? "s" : ""); extNumErrors, extNumErrors != 1 ? "s" : "");
if (extNumWarnings > 0) if (extNumWarnings > 0)
TxPrintf(" %d warning%s", TxPrintf(" %d warning%s",
extNumWarnings, extNumWarnings != 1 ? "s" : ""); extNumWarnings, extNumWarnings != 1 ? "s" : "");
@ -366,7 +366,7 @@ ExtRevertSubstrate(def, savePlane)
* *
* Side effects: * Side effects:
* May leave feedback information where errors were encountered. * May leave feedback information where errors were encountered.
* Upon return, extNumFatal has been incremented by the number of * Upon return, extNumErrors has been incremented by the number of
* fatal errors encountered while extracting 'def', and extNumWarnings * fatal errors encountered while extracting 'def', and extNumWarnings
* by the number of warnings. * by the number of warnings.
* *

4
extract/ExtHier.c
View File

@ -540,7 +540,7 @@ extHierConnectFunc2(cum, ha)
} }
else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot) else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot)
{ {
extNumFatal++; extNumErrors++;
if (!DebugIsSet(extDebugID, extDebNoFeedback)) if (!DebugIsSet(extDebugID, extDebNoFeedback))
DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)", DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)",
ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS);
@ -642,7 +642,7 @@ extHierConnectFunc3(cum, ha)
} }
else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot) else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot)
{ {
extNumFatal++; extNumErrors++;
if (!DebugIsSet(extDebugID, extDebNoFeedback)) if (!DebugIsSet(extDebugID, extDebNoFeedback))
DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)", DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)",
ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS);

10
extract/ExtMain.c
View File

@ -67,7 +67,7 @@ CellDef *extYdefCum = NULL;
ClientData extDebugID; ClientData extDebugID;
/* Number of errors encountered during extraction */ /* Number of errors encountered during extraction */
int extNumFatal; int extNumErrors;
int extNumWarnings; int extNumWarnings;
/* Dummy use pointing to def being extracted */ /* Dummy use pointing to def being extracted */
@ -662,7 +662,7 @@ extExtractStack(stack, doExtract, rootDef)
Stack *stack; Stack *stack;
CellDef *rootDef; CellDef *rootDef;
{ {
int fatal = 0, warnings = 0; int errorcnt = 0, warnings = 0;
bool first = TRUE; bool first = TRUE;
Plane *savePlane; Plane *savePlane;
CellDef *def; CellDef *def;
@ -685,7 +685,7 @@ extExtractStack(stack, doExtract, rootDef)
sl = newsl; sl = newsl;
} }
fatal += extNumFatal; errorcnt += extNumErrors;
warnings += extNumWarnings; warnings += extNumWarnings;
} }
else else
@ -714,9 +714,9 @@ extExtractStack(stack, doExtract, rootDef)
} }
else else
{ {
if (fatal > 0) if (errorcnt > 0)
TxError("Total of %d error%s (check feedback entries).\n", TxError("Total of %d error%s (check feedback entries).\n",
fatal, fatal != 1 ? "s" : ""); errorcnt, errorcnt != 1 ? "s" : "");
if (warnings > 0) if (warnings > 0)
TxError("Total of %d warning%s.\n", TxError("Total of %d warning%s.\n",
warnings, warnings != 1 ? "s" : ""); warnings, warnings != 1 ? "s" : "");

2
extract/ExtSubtree.c
View File

@ -1061,7 +1061,7 @@ extSubtreeTileToNode(tp, pNum, et, ha, doHard)
return (extNodeName(reg)); return (extNodeName(reg));
} }
extNumFatal++; extNumErrors++;
if (!DebugIsSet(extDebugID, extDebNoFeedback)) if (!DebugIsSet(extDebugID, extDebNoFeedback))
DBWFeedbackAdd(&r, errorStr, parentDef, 1, STYLE_MEDIUMHIGHLIGHTS); DBWFeedbackAdd(&r, errorStr, parentDef, 1, STYLE_MEDIUMHIGHLIGHTS);
return ("(none)"); return ("(none)");

2
extract/extractInt.h
View File

@ -1059,7 +1059,7 @@ extern void extMakeNodeNumPrint();
/* --------------------- Miscellaneous globals ------------------------ */ /* --------------------- Miscellaneous globals ------------------------ */
extern int extNumFatal; /* Number fatal errors encountered so far */ extern int extNumErrors; /* Number of errors encountered so far */
extern int extNumWarnings; /* Number warning messages so far */ extern int extNumWarnings; /* Number warning messages so far */
extern CellUse *extParentUse; /* Dummy use for def being extracted */ extern CellUse *extParentUse; /* Dummy use for def being extracted */
extern ClientData extNbrUn; /* Ditto */ extern ClientData extNbrUn; /* Ditto */

2
extract/extractInt.h.new
View File

@ -1026,7 +1026,7 @@ extern int extNbrPushFunc();
/* --------------------- Miscellaneous globals ------------------------ */ /* --------------------- Miscellaneous globals ------------------------ */
extern int extNumFatal; /* Number fatal errors encountered so far */ extern int extNumErrors; /* Number of errors encountered so far */
extern int extNumWarnings; /* Number warning messages so far */ extern int extNumWarnings; /* Number warning messages so far */
extern CellUse *extParentUse; /* Dummy use for def being extracted */ extern CellUse *extParentUse; /* Dummy use for def being extracted */
extern ClientData extNbrUn; /* Ditto */ extern ClientData extNbrUn; /* Ditto */