src/frontend/device.c, cleanup usage of `IFparm.dataType'

This commit is contained in:
rlar 2015-03-21 13:52:55 +01:00
parent 426f567287
commit b69e61d010
1 changed files with 10 additions and 12 deletions

View File

@ -636,11 +636,10 @@ param_forall(dgen *dg, int flags)
} }
for (i = 0; i < xcount; i++) for (i = 0; i < xcount; i++)
if (plist[i].dataType & IF_ASK) if ((plist[i].dataType & IF_ASK)
if ((((CKTcircuit *) (dg->ckt))->CKTrhsOld || && !(plist[i].dataType & IF_REDUNDANT)
(plist[i].dataType & IF_SET)) && && ((plist[i].dataType & IF_SET) || ((CKTcircuit *) (dg->ckt))->CKTrhsOld)
(!(plist[i].dataType & (IF_REDUNDANT | IF_UNINTERESTING)) || && (!(plist[i].dataType & IF_UNINTERESTING) || (flags == DGEN_ALLPARAMS)))
(flags == DGEN_ALLPARAMS && !(plist[i].dataType & IF_REDUNDANT))))
{ {
j = 0; j = 0;
do { do {
@ -671,11 +670,10 @@ param_forall_old(dgen *dg, int flags)
} }
for (i = 0; i < xcount; i++) for (i = 0; i < xcount; i++)
if (plist[i].dataType & IF_ASK) if ((plist[i].dataType & IF_ASK)
if ((((CKTcircuit *) (dg->ckt))->CKTrhsOld || && !(plist[i].dataType & IF_REDUNDANT)
(plist[i].dataType & IF_SET)) && && ((plist[i].dataType & IF_SET) || ((CKTcircuit *) (dg->ckt))->CKTrhsOld)
(!(plist[i].dataType & (IF_REDUNDANT | IF_UNINTERESTING)) || && (!(plist[i].dataType & IF_UNINTERESTING) || (flags == DGEN_ALLPARAMS)))
(flags == DGEN_ALLPARAMS && !(plist[i].dataType & IF_REDUNDANT))))
{ {
j = 0; j = 0;
do { do {