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

Added a "-quiet" option to "load" so that scripts that use "load" 

to create a new cell that is not expected to exist on disk will
not generate annoying error messages.
This commit is contained in:
Tim Edwards 2020-12-30 09:43:24 -05:00
parent 1426f5921f
commit 3b137a6d14
3 changed files with 78 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.107
8.3.108

70
commands/CmdLQ.c
View File

@ -309,6 +309,10 @@ CmdLabel(w, cmd)
CmdLabelProc(p, font, size, rotate, offx, offy, pos, sticky, type);
}
#define LOAD_NOWINDOW 0
#define LOAD_DEREFERENCE 1
#define LOAD_FORCE 2
#define LOAD_QUIET 3
/*
* ----------------------------------------------------------------------------
@ -318,7 +322,7 @@ CmdLabel(w, cmd)
* Implement the "load" command.
*
* Usage:
* load [name [scaled n [d]]] [-force] [-nowindow] [-dereference]
* load [name [scaled n [d]]] [-force] [-nowindow] [-dereference] [-quiet]
*
* If name is supplied, then the window containing the point tool is
* remapped so as to edit the cell with the given name.
@ -354,29 +358,52 @@ CmdLoad(w, cmd)
{
int n = 1;
int d = 1;
int option;
int locargc = cmd->tx_argc;
bool ignoreTech = FALSE;
bool noWindow = FALSE;
bool dereference = FALSE;
bool beQuiet = FALSE;
bool saveVerbose;
int keepGoing(); /* forward declaration */
extern bool DBVerbose; /* from DBio.c */
saveVerbose = DBVerbose;
static char *cmdLoadOption[] =
{
"-nowindow load file but do not display in the layout window",
"-dereference use search paths and ignore embedded cell paths in file",
"-force load file even if tech in header does not match",
"-quiet no alert if file does not exist",
NULL
};
while (cmd->tx_argv[locargc - 1][0] == '-')
{
option = Lookup(cmd->tx_argv[locargc - 1], cmdLoadOption);
switch (option)
{
case LOAD_NOWINDOW:
noWindow = TRUE;
break;
case LOAD_DEREFERENCE:
dereference = TRUE;
break;
case LOAD_FORCE:
ignoreTech = TRUE;
break;
case LOAD_QUIET:
beQuiet = TRUE;
break;
default:
TxError("No such option \"%s\".\n", cmd->tx_argv[locargc - 1]);
}
locargc--;
}
if (locargc > 2)
{
if (!strncmp(cmd->tx_argv[locargc - 1], "-nowindow", 8))
{
locargc--;
noWindow = TRUE;
}
if (!strncmp(cmd->tx_argv[locargc - 1], "-deref", 5))
{
locargc--;
dereference = TRUE;
}
if (!strncmp(cmd->tx_argv[locargc - 1], "-force", 6))
{
locargc--;
ignoreTech = TRUE;
}
if ((locargc >= 4) && !strncmp(cmd->tx_argv[2], "scale", 5) &&
StrIsInt(cmd->tx_argv[3]))
{
@ -397,7 +424,7 @@ CmdLoad(w, cmd)
else if (!ignoreTech && !noWindow && !dereference)
{
TxError("Usage: %s name [scaled n [d]] [-force] "
"[-nowindow] [-dereference]\n",
"[-nowindow] [-dereference] [-quiet]\n",
cmd->tx_argv[0]);
return;
}
@ -422,8 +449,10 @@ CmdLoad(w, cmd)
*(cmd->tx_argv[1] + strlen(cmd->tx_argv[1]) - 1) = '\0';
}
#endif
DBVerbose = !beQuiet;
DBWloadWindow((noWindow == TRUE) ? NULL : w, cmd->tx_argv[1],
ignoreTech, FALSE, dereference);
DBVerbose = saveVerbose;
if ((n > 1) || (d > 1))
{
@ -456,7 +485,12 @@ CmdLoad(w, cmd)
ReduceFraction(&DBLambda[0], &DBLambda[1]);
}
}
else DBWloadWindow(w, (char *) NULL, TRUE, FALSE, FALSE);
else
{
DBVerbose = !beQuiet;
DBWloadWindow(w, (char *) NULL, TRUE, FALSE, FALSE);
DBVerbose = saveVerbose;
}
}
/*

33
database/DBio.c
View File

@ -990,6 +990,11 @@ DBCellRead(cellDef, name, ignoreTech, dereference, errptr)
* CDAVAILABLE, with the CDNOTFOUND bit clear, if we
* were successful.
*
* Notes:
* Global variable DBVerbose determines whether or not error
* messages are generated by this routine. This can be controlled
* by "load -quiet".
*
* ----------------------------------------------------------------------------
*/
@ -1062,15 +1067,20 @@ dbReadOpen(cellDef, name, setFileName, errptr)
/* somewhere else in the search paths. */
if (pptr != NULL) *pptr = '.';
TxError("Warning: Parent cell lists instance of \"%s\" at bad file "
"path %s.\n", cellDef->cd_name, cellDef->cd_file);
if (DBVerbose)
TxError("Warning: Parent cell lists instance of \"%s\" at "
"bad file path %s.\n",
cellDef->cd_name, cellDef->cd_file);
/* Write the new path to cd_file or else magic will */
/* generate another error later. */
StrDup(&cellDef->cd_file, filename);
TxError("The cell exists in the search paths at %s.\n", filename);
TxError("The discovered version will be used.\n");
if (DBVerbose)
{
TxError("The cell exists in the search paths at %s.\n", filename);
TxError("The discovered version will be used.\n");
}
}
}
@ -1091,17 +1101,24 @@ dbReadOpen(cellDef, name, setFileName, errptr)
return ((FILE *) NULL);
if (name != (char *) NULL)
TxError("File %s%s couldn't be read\n", name, DBSuffix);
{
if (DBVerbose)
TxError("File %s%s couldn't be read\n", name, DBSuffix);
}
else if (cellDef->cd_file != (char *) NULL)
TxError("File %s couldn't be read\n", cellDef->cd_file);
{
if (DBVerbose)
TxError("File %s couldn't be read\n", cellDef->cd_file);
}
else {
TxError("Cell %s couldn't be read\n", cellDef->cd_name);
if (DBVerbose)
TxError("Cell %s couldn't be read\n", cellDef->cd_name);
realname = (char *) mallocMagic((unsigned) (strlen(cellDef->cd_name)
+ strlen(DBSuffix) + 1));
(void) sprintf(realname, "%s%s", cellDef->cd_name, DBSuffix);
StrDup(&cellDef->cd_file, realname);
}
if (errptr) TxError("%s\n", strerror(*errptr));
if (errptr && DBVerbose) TxError("%s\n", strerror(*errptr));
cellDef->cd_flags |= CDNOTFOUND;
return ((FILE *) NULL);