epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cleanup, some more (*p).foo --> p->foo

pre-master-46
rlar 15 years ago
parent
3349b98145
commit
c1683a5571
7 changed files with 40 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      ChangeLog
  2. 11
      src/spicelib/parser/inpaname.c
  3. 15
      src/spicelib/parser/inpdpar.c
  4. 15
      src/spicelib/parser/inpgmod.c
  5. 8
      src/spicelib/parser/inppname.c
  6. 4
      src/spicelib/parser/inptyplk.c
  7. 16
      src/xspice/mif/mifgetmod.c

9
ChangeLog
View File

@ -1,3 +1,12 @@
2011-05-01 Robert Larice
* src/spicelib/parser/inpaname.c ,
* src/spicelib/parser/inpdpar.c ,
* src/spicelib/parser/inpgmod.c ,
* src/spicelib/parser/inppname.c ,
* src/spicelib/parser/inptyplk.c ,
* src/xspice/mif/mifgetmod.c :
cleanup, some more (*p).foo --> p->foo
2011-04-30 Robert Larice 2011-04-30 Robert Larice
* src/spicelib/devices/cktbindnode.c , * src/spicelib/devices/cktbindnode.c ,
* src/spicelib/devices/hisimhv/hsmhvmask.c , * src/spicelib/devices/hisimhv/hsmhvmask.c ,

11
src/spicelib/parser/inpaname.c
View File

@ -49,22 +49,21 @@ INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam,
* this device type and look for a name match of an 'ask'able * this device type and look for a name match of an 'ask'able
* parameter. * parameter.
*/ */
for (i = 0; i < (*(*(sim->devices)[*dev]).numInstanceParms); i++) {
for (i = 0; i < *(sim->devices[*dev]->numInstanceParms); i++) {
if (strcmp(parm, if (strcmp(parm,
((*(sim->devices)[*dev]).instanceParms[i].keyword)) == 0
&& (((*(sim->devices)[*dev]).instanceParms[i].dataType) &
sim->devices[*dev]->instanceParms[i].keyword) == 0
&& (sim->devices[*dev]->instanceParms[i].dataType &
IF_ASK)) { IF_ASK)) {
/* found it, so we ask the question using the device info we got /* found it, so we ask the question using the device info we got
* above and put the results in the IFvalue structure our caller * above and put the results in the IFvalue structure our caller
* gave us originally * gave us originally
*/ */
error = sim->askInstanceQuest (ckt, *fast, error = sim->askInstanceQuest (ckt, *fast,
(*(sim->devices)[*dev]).
instanceParms[i].id, val,
sim->devices[*dev]->instanceParms[i].id, val,
selector); selector);
if (dataType) if (dataType)
*dataType = *dataType =
(*(sim->devices)[*dev]).instanceParms[i].dataType;
sim->devices[*dev]->instanceParms[i].dataType;
return (error); return (error);
} }
} }

15
src/spicelib/parser/inpdpar.c
View File

@ -53,21 +53,20 @@ char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
rtn = (INPerror(error)); rtn = (INPerror(error));
goto quit; goto quit;
} }
for (i = 0; i < (*(*(ft_sim->devices)[dev]).numInstanceParms); i++) {
for (i = 0; i < *(ft_sim->devices[dev]->numInstanceParms); i++) {
if (strcmp(parm, if (strcmp(parm,
((*(ft_sim->devices)[dev]).instanceParms[i].
keyword)) == 0) {
ft_sim->devices[dev]->instanceParms[i].keyword) == 0) {
val = val =
INPgetValue(ckt, line, INPgetValue(ckt, line,
((*(ft_sim->devices)[dev]).
instanceParms[i].dataType), tab);
ft_sim->devices[dev]->
instanceParms[i].dataType, tab);
if (!val) { if (!val) {
rtn = (INPerror(E_PARMVAL)); rtn = (INPerror(E_PARMVAL));
goto quit; goto quit;
} }
error = ft_sim->setInstanceParm (ckt, fast, error = ft_sim->setInstanceParm (ckt, fast,
(*(ft_sim->devices)
[dev]).
ft_sim->devices
[dev]->
instanceParms[i].id, instanceParms[i].id,
val, val,
NULL); NULL);
@ -78,7 +77,7 @@ char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
break; break;
} }
} }
if (i == (*(*(ft_sim->devices)[dev]).numInstanceParms)) {
if (i == *(ft_sim->devices[dev]->numInstanceParms)) {
errbuf = TMALLOC(char, strlen(parm) + 25); errbuf = TMALLOC(char, strlen(parm) + 25);
(void) sprintf(errbuf, " unknown parameter (%s) \n", parm); (void) sprintf(errbuf, " unknown parameter (%s) \n", parm);
rtn = (errbuf); rtn = (errbuf);

15
src/spicelib/parser/inpgmod.c
View File

@ -86,20 +86,20 @@ create_model( CKTcircuit* ckt, INPmodel* modtmp, INPtables* tab )
if (!*parm) if (!*parm)
continue; continue;
for (j = 0; j < (* (*(ft_sim->devices)[(modtmp)->INPmodType]).numModelParms); j++) {
for (j = 0; j < *(ft_sim->devices[(modtmp)->INPmodType]->numModelParms); j++) {
if (strcmp(parm, "txl") == 0) { if (strcmp(parm, "txl") == 0) {
if (strcmp("cpl", ((*(ft_sim->devices) [ (modtmp)->INPmodType ]).modelParms[j].keyword)) == 0) {
if (strcmp("cpl", ft_sim->devices[(modtmp)->INPmodType]->modelParms[j].keyword) == 0) {
strcpy(parm, "cpl"); strcpy(parm, "cpl");
} }
} }
if (strcmp(parm,((*(ft_sim->devices)[(modtmp)->INPmodType]).modelParms[j].keyword)) == 0) {
if (strcmp(parm, ft_sim->devices[(modtmp)->INPmodType]->modelParms[j].keyword) == 0) {
val = INPgetValue(ckt, &line, ((* (ft_sim->devices)[(modtmp)->INPmodType]).modelParms[j].dataType), tab);
val = INPgetValue(ckt, &line, ft_sim->devices[(modtmp)->INPmodType]->modelParms[j].dataType, tab);
error = ft_sim->setModelParm (ckt, modtmp->INPmodfast, error = ft_sim->setModelParm (ckt, modtmp->INPmodfast,
(* (ft_sim->devices)[(modtmp)->INPmodType]).modelParms[j].id,
ft_sim->devices[(modtmp)->INPmodType]->modelParms[j].id,
val, NULL); val, NULL);
if (error) if (error)
return error; return error;
@ -111,10 +111,7 @@ create_model( CKTcircuit* ckt, INPmodel* modtmp, INPtables* tab )
/* just grab the level number and throw away */ /* just grab the level number and throw away */
/* since we already have that info from pass1 */ /* since we already have that info from pass1 */
val = INPgetValue(ckt, &line, IF_REAL, tab); val = INPgetValue(ckt, &line, IF_REAL, tab);
} else if (j >=
(*
(*(ft_sim->devices)
[(modtmp)->INPmodType]).numModelParms)) {
} else if (j >= *(ft_sim->devices[(modtmp)->INPmodType]->numModelParms)) {
/* want only the parameter names in output - not the values */ /* want only the parameter names in output - not the values */
errno = 0; /* To distinguish success/failure after call */ errno = 0; /* To distinguish success/failure after call */

8
src/spicelib/parser/inppname.c
View File

@ -27,13 +27,13 @@ int INPpName(char *parm, IFvalue * val, CKTcircuit *ckt, int dev, GENinstance *f
int error; /* int to store evaluate error return codes in */ int error; /* int to store evaluate error return codes in */
int i; int i;
for (i = 0; i < (*(*(ft_sim->devices)[dev]).numInstanceParms); i++) {
for (i = 0; i < *(ft_sim->devices[dev]->numInstanceParms); i++) {
if (strcmp(parm, if (strcmp(parm,
((*(ft_sim->devices)[dev]).instanceParms[i].keyword)) ==
ft_sim->devices[dev]->instanceParms[i].keyword) ==
0) { 0) {
error = error =
ft_sim->setInstanceParm (ckt, fast, ft_sim->setInstanceParm (ckt, fast,
(*(ft_sim->devices)[dev]).
ft_sim->devices[dev]->
instanceParms[i].id, val, instanceParms[i].id, val,
NULL); NULL);
if (error) if (error)
@ -41,7 +41,7 @@ int INPpName(char *parm, IFvalue * val, CKTcircuit *ckt, int dev, GENinstance *f
break; break;
} }
} }
if (i == (*(*(ft_sim->devices)[dev]).numInstanceParms)) {
if (i == *(ft_sim->devices[dev]->numInstanceParms)) {
return (E_BADPARM); return (E_BADPARM);
} }
return (OK); return (OK);

4
src/spicelib/parser/inptyplk.c
View File

@ -31,10 +31,10 @@ int INPtypelook(char *type)
if ((ft_sim->devices[i]) == NULL) if ((ft_sim->devices[i]) == NULL)
printf("In INPtypelook, checking model type = %s against existing model = %s, . . .\n", type, "NULL"); printf("In INPtypelook, checking model type = %s against existing model = %s, . . .\n", type, "NULL");
else else
printf("In INPtypelook, checking model type = %s against existing model = %s, . . .\n", type, (*(ft_sim->devices)[i]).name );
printf("In INPtypelook, checking model type = %s against existing model = %s, . . .\n", type, ft_sim->devices[i]->name);
#endif #endif
if ((ft_sim->devices)[i] && strcmp(type, (*(ft_sim->devices)[i]).name) == 0) {
if (ft_sim->devices[i] && strcmp(type, ft_sim->devices[i]->name) == 0) {
/* found the device - return it */ /* found the device - return it */
#ifdef TRACE #ifdef TRACE

16
src/xspice/mif/mifgetmod.c
View File

@ -189,23 +189,21 @@ char *MIFgetMod(
while(*line != 0) { while(*line != 0) {
INPgetTok(&line,&parm,1); INPgetTok(&line,&parm,1);
for(j=0;j<*((*(ft_sim->devices)[(modtmp)->INPmodType]).numModelParms); j++) {
if (strcmp(parm,((*(ft_sim->devices) [ (modtmp)->
INPmodType ]).modelParms[j].keyword)) == 0) {
for(j=0 ; j < *(ft_sim->devices[(modtmp)->INPmodType]->numModelParms); j++) {
if (strcmp(parm, ft_sim->devices[(modtmp)->INPmodType]->modelParms[j].keyword) == 0) {
/* gtri modification: call MIFgetValue instead of INPgetValue */ /* gtri modification: call MIFgetValue instead of INPgetValue */
err1 = NULL; err1 = NULL;
val = MIFgetValue(ckt,&line, val = MIFgetValue(ckt,&line,
((*(ft_sim->devices)[(modtmp)->
INPmodType ]).modelParms[j].
dataType),tab,&err1);
ft_sim->devices[(modtmp)->INPmodType]->modelParms[j].dataType,
tab, &err1);
if(err1) { if(err1) {
err2 = TMALLOC(char, 25 + strlen(name) + strlen(err1)); err2 = TMALLOC(char, 25 + strlen(name) + strlen(err1));
sprintf(err2, "MIF-ERROR - model: %s - %s\n", name, err1); sprintf(err2, "MIF-ERROR - model: %s - %s\n", name, err1);
return(err2); return(err2);
} }
error = ft_sim->setModelParm (ckt, error = ft_sim->setModelParm (ckt,
((modtmp)->INPmodfast),
(*(ft_sim->devices)[(modtmp)->INPmodType ]).
(modtmp)->INPmodfast,
ft_sim->devices[(modtmp)->INPmodType]->
modelParms[j].id, val, NULL); modelParms[j].id, val, NULL);
if(error) if(error)
return(INPerror(error)); return(INPerror(error));
@ -213,7 +211,7 @@ char *MIFgetMod(
} }
} }
/* gtri modification: processing of special parameter "level" removed */ /* gtri modification: processing of special parameter "level" removed */
if(j >= *((*(ft_sim->devices)[(modtmp)->INPmodType]).numModelParms))
if(j >= *(ft_sim->devices[(modtmp)->INPmodType]->numModelParms))
{ {
//err has not been allocated, but free() in INPerrCat() //err has not been allocated, but free() in INPerrCat()

Write Preview
Loading…
Cancel
Save