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

xpressn.c, drop "Defd" enum, to be incorporated into a bigger enum

This commit is contained in:
rlar 2013-12-01 12:01:00 +01:00
parent 76c7cd6fbd
commit 297778127b
2 changed files with 2 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

@ -13,8 +13,6 @@ typedef enum {Nodekey = '#'} _nNodekey; /* Introduces node symbol */
typedef enum {Intro = '&'} _nIntro; /* Introduces preprocessor tokens */ typedef enum {Intro = '&'} _nIntro; /* Introduces preprocessor tokens */
typedef enum {Comment = '*'} _nComment; /* Spice Comment lines */ typedef enum {Comment = '*'} _nComment; /* Spice Comment lines */
typedef enum {Psp = '{'} _nPsp; /* Ps expression */ typedef enum {Psp = '{'} _nPsp; /* Ps expression */
typedef enum {Defd = 6} _nDefd; /* serial numb. of 'defined' keyword.
The others are not used (yet) */
typedef char *auxtable; /* dummy */ typedef char *auxtable; /* dummy */

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

@ -1016,7 +1016,7 @@ opfunctkey(tdico *dico,
state = S_binop; state = S_binop;
level = 3; level = 3;
break; break;
case Defd: case 6:
c = '?'; c = '?';
state = S_atom; state = S_atom;
level = 0; level = 0;
@ -1260,7 +1260,7 @@ formula(tdico *dico, const char *s, const char *s_end, bool *perror)
c = opfunctkey(dico, kw, c, &state, &level, &error); c = opfunctkey(dico, kw, c, &state, &level, &error);
} }
if (kw == Defd) { if (kw == 6) {
u = exists(dico, s_end, &s, &error); u = exists(dico, s_end, &s, &error);
} }
} else if (((c == '.') || ((c >= '0') && (c <= '9')))) { } else if (((c == '.') || ((c >= '0') && (c <= '9')))) {