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

numparam, rename `entry' --> `entry_t'

pre-master-46
rlar 12 years ago
parent
1910f50179
commit
f3ce5bde2c
3 changed files with 32 additions and 32 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. 8
      src/frontend/numparam/numparam.h
  2. 20
      src/frontend/numparam/spicenum.c
  3. 36
      src/frontend/numparam/xpressn.c

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

@ -16,7 +16,7 @@ typedef enum {Psp = '{'} _nPsp; /* Ps expression */
/* ----------------------------------------------------------------- /* -----------------------------------------------------------------
* I believe the entry should be a union of type but I need more info.
* I believe the entry_t should be a union of type but I need more info.
* ----------------------------------------------------------------- */ * ----------------------------------------------------------------- */
typedef struct entry_s { typedef struct entry_s {
@ -27,7 +27,7 @@ typedef struct entry_s {
int ivl; /* int value or string buffer index */ int ivl; /* int value or string buffer index */
char *sbbase; /* string buffer base address if any */ char *sbbase; /* string buffer base address if any */
struct entry_s *pointer; /* pointer chain */ struct entry_s *pointer; /* pointer chain */
} entry;
} entry_t;
typedef struct { /* the input scanner data structure */ typedef struct { /* the input scanner data structure */
@ -51,7 +51,7 @@ typedef struct { /* the input scanner data structure */
void initdico(tdico *dico); void initdico(tdico *dico);
int donedico(tdico *dico); int donedico(tdico *dico);
void dico_free_entry(entry *entry_p);
void dico_free_entry(entry_t *entry_p);
bool defsubckt(tdico *dico, char *s, int w, char categ); bool defsubckt(tdico *dico, char *s, int w, char categ);
int findsubckt(tdico *dico, char *s, SPICE_DSTRINGPTR subname); int findsubckt(tdico *dico, char *s, SPICE_DSTRINGPTR subname);
bool nupa_substitute(tdico *dico, char *s, char *r, bool err); bool nupa_substitute(tdico *dico, char *s, char *r, bool err);
@ -60,5 +60,5 @@ bool nupa_subcktcall(tdico *dico, char *s, char *x, bool err);
void nupa_subcktexit(tdico *dico); void nupa_subcktexit(tdico *dico);
tdico *nupa_fetchinstance(void); tdico *nupa_fetchinstance(void);
char getidtype(tdico *d, char *s); char getidtype(tdico *d, char *s);
entry *attrib(tdico *d, NGHASHPTR htable, char *t, char op);
entry_t *attrib(tdico *d, NGHASHPTR htable, char *t, char op);
void del_attrib(void *); void del_attrib(void *);

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

@ -535,13 +535,13 @@ static void
dump_symbol_table(tdico *dico_p, NGHASHPTR htable_p, FILE *cp_out) dump_symbol_table(tdico *dico_p, NGHASHPTR htable_p, FILE *cp_out)
{ {
char *name; /* current symbol */ char *name; /* current symbol */
entry *entry_p; /* current entry */
entry_t *entry_p; /* current entry */
NGHASHITER iter; /* hash iterator - thread safe */ NGHASHITER iter; /* hash iterator - thread safe */
NGHASH_FIRST(&iter); NGHASH_FIRST(&iter);
for (entry_p = (entry *) nghash_enumerateRE(htable_p, &iter);
for (entry_p = (entry_t *) nghash_enumerateRE(htable_p, &iter);
entry_p; entry_p;
entry_p = (entry *) nghash_enumerateRE(htable_p, &iter))
entry_p = (entry_t *) nghash_enumerateRE(htable_p, &iter))
{ {
if (entry_p->tp == 'R') { if (entry_p->tp == 'R') {
spice_dstring_reinit(& dico_p->lookup_buf); spice_dstring_reinit(& dico_p->lookup_buf);
@ -597,7 +597,7 @@ nupa_get_param(char *param_name, int *found)
{ {
int depth; /* nested subcircit depth */ int depth; /* nested subcircit depth */
char *up_name; /* current parameter upper case */ char *up_name; /* current parameter upper case */
entry *entry_p; /* current entry */
entry_t *entry_p; /* current entry */
tdico *dico_p; /* local copy for speed */ tdico *dico_p; /* local copy for speed */
double result = 0; /* parameter value */ double result = 0; /* parameter value */
@ -610,7 +610,7 @@ nupa_get_param(char *param_name, int *found)
for (depth = dico_p->stack_depth; depth >= 0; depth--) { for (depth = dico_p->stack_depth; depth >= 0; depth--) {
NGHASHPTR htable_p = dico_p->symbols[depth]; NGHASHPTR htable_p = dico_p->symbols[depth];
if (htable_p) { if (htable_p) {
entry_p = (entry *) nghash_find(htable_p, up_name);
entry_p = (entry_t *) nghash_find(htable_p, up_name);
if (entry_p) { if (entry_p) {
result = entry_p->vl; result = entry_p->vl;
*found = 1; *found = 1;
@ -628,7 +628,7 @@ void
nupa_add_param(char *param_name, double value) nupa_add_param(char *param_name, double value)
{ {
char *up_name; /* current parameter upper case */ char *up_name; /* current parameter upper case */
entry *entry_p; /* current entry */
entry_t *entry_p; /* current entry */
tdico *dico_p; /* local copy for speed */ tdico *dico_p; /* local copy for speed */
NGHASHPTR htable_p; /* hash table of interest */ NGHASHPTR htable_p; /* hash table of interest */
@ -663,7 +663,7 @@ void
nupa_add_inst_param(char *param_name, double value) nupa_add_inst_param(char *param_name, double value)
{ {
char *up_name; /* current parameter upper case */ char *up_name; /* current parameter upper case */
entry *entry_p; /* current entry */
entry_t *entry_p; /* current entry */
tdico *dico_p; /* local copy for speed */ tdico *dico_p; /* local copy for speed */
dico_p = dicoS; dico_p = dicoS;
@ -694,7 +694,7 @@ nupa_add_inst_param(char *param_name, double value)
void void
nupa_copy_inst_dico(void) nupa_copy_inst_dico(void)
{ {
entry *entry_p; /* current entry */
entry_t *entry_p; /* current entry */
tdico *dico_p; /* local copy for speed */ tdico *dico_p; /* local copy for speed */
NGHASHITER iter; /* hash iterator - thread safe */ NGHASHITER iter; /* hash iterator - thread safe */
@ -705,9 +705,9 @@ nupa_copy_inst_dico(void)
fprintf(stderr, "stack depth should be zero.\n"); fprintf(stderr, "stack depth should be zero.\n");
NGHASH_FIRST(&iter); NGHASH_FIRST(&iter);
for (entry_p = (entry *) nghash_enumerateRE(dico_p->inst_symbols, &iter);
for (entry_p = (entry_t *) nghash_enumerateRE(dico_p->inst_symbols, &iter);
entry_p; entry_p;
entry_p = (entry *) nghash_enumerateRE(dico_p->inst_symbols, &iter))
entry_p = (entry_t *) nghash_enumerateRE(dico_p->inst_symbols, &iter))
{ {
nupa_add_param(entry_p->symbol, entry_p->vl); nupa_add_param(entry_p->symbol, entry_p->vl);
dico_free_entry(entry_p); dico_free_entry(entry_p);

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

@ -272,7 +272,7 @@ initdico(tdico *dico)
void void
dico_free_entry(entry *entry_p)
dico_free_entry(entry_t *entry_p)
{ {
if (entry_p->symbol) if (entry_p->symbol)
txfree(entry_p->symbol); txfree(entry_p->symbol);
@ -312,7 +312,7 @@ dicostack_pop(tdico *dico)
{ {
char *inst_name; /* name of subcircuit instance */ char *inst_name; /* name of subcircuit instance */
char *param_p; /* qualified inst parameter name */ char *param_p; /* qualified inst parameter name */
entry *entry_p; /* current entry */
entry_t *entry_p; /* current entry */
NGHASHPTR htable_p; /* current hash table */ NGHASHPTR htable_p; /* current hash table */
NGHASHITER iter; /* hash iterator - thread safe */ NGHASHITER iter; /* hash iterator - thread safe */
@ -332,9 +332,9 @@ dicostack_pop(tdico *dico)
spice_dstring_init(&param_name); spice_dstring_init(&param_name);
NGHASH_FIRST(&iter); NGHASH_FIRST(&iter);
for (entry_p = (entry *) nghash_enumerateRE(htable_p, &iter);
for (entry_p = (entry_t *) nghash_enumerateRE(htable_p, &iter);
entry_p; entry_p;
entry_p = (entry *) nghash_enumerateRE(htable_p, &iter))
entry_p = (entry_t *) nghash_enumerateRE(htable_p, &iter))
{ {
spice_dstring_reinit(&param_name); spice_dstring_reinit(&param_name);
param_p = spice_dstring_print(&param_name, "%s.%s", param_p = spice_dstring_print(&param_name, "%s.%s",
@ -366,18 +366,18 @@ donedico(tdico *dico)
* look thru the stack of local symbols and then look at the global * look thru the stack of local symbols and then look at the global
* symbols in that order. * symbols in that order.
* ----------------------------------------------------------------- */ * ----------------------------------------------------------------- */
static entry *
static entry_t *
entrynb(tdico *d, char *s) entrynb(tdico *d, char *s)
{ {
int depth; /* stack depth */ int depth; /* stack depth */
entry *entry_p; /* search hash table */
entry_t *entry_p; /* search hash table */
NGHASHPTR htable_p; /* hash table */ NGHASHPTR htable_p; /* hash table */
/* look at the current scope and then backup the stack */ /* look at the current scope and then backup the stack */
for (depth = d->stack_depth; depth >= 0; depth--) { for (depth = d->stack_depth; depth >= 0; depth--) {
htable_p = d->symbols[depth]; htable_p = d->symbols[depth];
if (htable_p) { if (htable_p) {
entry_p = (entry *) nghash_find(htable_p, s);
entry_p = (entry_t *) nghash_find(htable_p, s);
if (entry_p) if (entry_p)
return (entry_p); return (entry_p);
} }
@ -391,7 +391,7 @@ char
getidtype(tdico *d, char *s) getidtype(tdico *d, char *s)
/* test if identifier s is known. Answer its type, or '?' if not in table */ /* test if identifier s is known. Answer its type, or '?' if not in table */
{ {
entry *entry_p; /* hash table entry */
entry_t *entry_p; /* hash table entry */
char itp = '?'; /* assume unknown */ char itp = '?'; /* assume unknown */
entry_p = entrynb(d, s); entry_p = entrynb(d, s);
@ -407,7 +407,7 @@ fetchnumentry(tdico *dico, char *t, bool *perr)
{ {
bool err = *perr; bool err = *perr;
double u; double u;
entry *entry_p; /* hash table entry */
entry_t *entry_p; /* hash table entry */
entry_p = entrynb(dico, t); /* no keyword */ entry_p = entrynb(dico, t); /* no keyword */
/*dbg -- if (k <= 0) { printf("Dico num lookup fails."); } */ /*dbg -- if (k <= 0) { printf("Dico num lookup fails."); } */
@ -434,15 +434,15 @@ fetchnumentry(tdico *dico, char *t, bool *perr)
/******* writing dictionary entries *********/ /******* writing dictionary entries *********/
entry *
entry_t *
attrib(tdico *dico_p, NGHASHPTR htable_p, char *t, char op) attrib(tdico *dico_p, NGHASHPTR htable_p, char *t, char op)
{ {
/* seek or attribute dico entry number for string t. /* seek or attribute dico entry number for string t.
Option op='N' : force a new entry, if tos>level and old is valid. Option op='N' : force a new entry, if tos>level and old is valid.
*/ */
entry *entry_p; /* symbol table entry */
entry_t *entry_p; /* symbol table entry */
entry_p = (entry *) nghash_find(htable_p, t);
entry_p = (entry_t *) nghash_find(htable_p, t);
if (entry_p && (op == 'N') && if (entry_p && (op == 'N') &&
(entry_p->level < dico_p->stack_depth) && (entry_p->tp != '?')) (entry_p->level < dico_p->stack_depth) && (entry_p->tp != '?'))
{ {
@ -450,7 +450,7 @@ attrib(tdico *dico_p, NGHASHPTR htable_p, char *t, char op)
} }
if (!entry_p) { if (!entry_p) {
entry_p = TMALLOC(entry, 1);
entry_p = TMALLOC(entry_t, 1);
entry_p->symbol = strdup(t); entry_p->symbol = strdup(t);
entry_p->tp = '?'; /* signal Unknown */ entry_p->tp = '?'; /* signal Unknown */
entry_p->level = dico_p->stack_depth; entry_p->level = dico_p->stack_depth;
@ -469,7 +469,7 @@ attrib(tdico *dico_p, NGHASHPTR htable_p, char *t, char op)
void void
del_attrib(void *e_p) del_attrib(void *e_p)
{ {
entry *entry_p = (entry*)e_p;
entry_t *entry_p = (entry_t*)e_p;
if(entry_p) { if(entry_p) {
tfree(entry_p->symbol); tfree(entry_p->symbol);
tfree(entry_p); tfree(entry_p);
@ -484,7 +484,7 @@ nupa_define(tdico *dico,
char tpe, /* type marker */ char tpe, /* type marker */
double z, /* float value if any */ double z, /* float value if any */
int w, /* integer value if any */ int w, /* integer value if any */
entry *pval, /* pointer value if any */
entry_t *pval, /* pointer value if any */
char *base) /* string pointer if any */ char *base) /* string pointer if any */
{ {
/*define t as real or integer, /*define t as real or integer,
@ -497,7 +497,7 @@ nupa_define(tdico *dico,
*/ */
char c; char c;
bool err, warn; bool err, warn;
entry *entry_p; /* spice table entry */
entry_t *entry_p; /* spice table entry */
NGHASHPTR htable_p; /* hash table */ NGHASHPTR htable_p; /* hash table */
NG_IGNORE(pval); NG_IGNORE(pval);
@ -600,7 +600,7 @@ findsubckt(tdico *dico, char *s, SPICE_DSTRINGPTR subname)
returns 0 if not found, else the stored definition line number value returns 0 if not found, else the stored definition line number value
and the name in string subname */ and the name in string subname */
{ {
entry *entry_p; /* symbol table entry */
entry_t *entry_p; /* symbol table entry */
SPICE_DSTRING ustr; /* u= subckt name is last token in string s */ SPICE_DSTRING ustr; /* u= subckt name is last token in string s */
int j, k; int j, k;
int line; /* stored line number */ int line; /* stored line number */
@ -1169,7 +1169,7 @@ evaluate(tdico *dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode)
double u = 0.0; double u = 0.0;
int j, lq; int j, lq;
char dt; char dt;
entry *entry_p;
entry_t *entry_p;
bool numeric, done, nolookup; bool numeric, done, nolookup;
bool err; bool err;

Write Preview
Loading…
Cancel
Save