luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numparam, #4/4, defsubckt(), use struct card * argument

This commit is contained in:
rlar 2017-10-31 20:02:37 +01:00
parent 2a149d7541
commit bc0782aba1
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/numparam/numparam.h
View File

@ -52,7 +52,7 @@ typedef struct { /* the input scanner data structure */
void initdico(dico_t *); void initdico(dico_t *);
int donedico(dico_t *); int donedico(dico_t *);
void dico_free_entry(entry_t *); void dico_free_entry(entry_t *);
bool defsubckt(dico_t *, char *s, int w, char categ); bool defsubckt(dico_t *, struct card *, char categ);
int findsubckt(dico_t *, char *s, SPICE_DSTRINGPTR subname); int findsubckt(dico_t *, char *s, SPICE_DSTRINGPTR subname);
bool nupa_substitute(dico_t *, char *s, char *r, bool err); bool nupa_substitute(dico_t *, char *s, char *r, bool err);
bool nupa_assignment(dico_t *, char *s, char mode); bool nupa_assignment(dico_t *, char *s, char mode);

4
src/frontend/numparam/spicenum.c
View File

@ -532,9 +532,9 @@ void
nupa_scan(struct card *card, int is_subckt) nupa_scan(struct card *card, int is_subckt)
{ {
if (is_subckt) if (is_subckt)
defsubckt(dicoS, card->line, card->linenum, 'U'); defsubckt(dicoS, card, 'U');
else else
defsubckt(dicoS, card->line, card->linenum, 'O'); defsubckt(dicoS, card, 'O');
} }

5
src/frontend/numparam/xpressn.c
View File

@ -538,11 +538,14 @@ nupa_define(dico_t *dico,
bool bool
defsubckt(dico_t *dico, char *s, int w, char categ) defsubckt(dico_t *dico, struct card *card, char categ)
/* called on 1st pass of spice source code, /* called on 1st pass of spice source code,
to enter subcircuit (categ=U) and model (categ=O) names to enter subcircuit (categ=U) and model (categ=O) names
*/ */
{ {
char *s = card->line;
int w = card->linenum;
bool err; bool err;
int i, j, ls; int i, j, ls;