luke
/
netgen
mirror of https://github.com/RTimothyEdwards/netgen.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected parsing of resistor and capacitor values to include 

CDL-style expressions as well as numerical values.
This commit is contained in:
Tim Edwards 2016-10-17 17:47:27 -04:00
parent 7ef7ae36de
commit 366821fe7f
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
base/spice.c
View File

@ -42,6 +42,20 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
// Global storage for parameters from .PARAM // Global storage for parameters from .PARAM
struct hashdict spiceparams; struct hashdict spiceparams;
// Check if a token represents a numerical value (with
// units) or an expression. This is basically a hack
// to see if it either passes StringIsValue() or is
// enclosed in braces. Probably should attempt to
// parse the expression, to be pedantic. Not sure all
// expressions have to be in braces.
int StringIsValueOrExpression(char *token)
{
if (StringIsValue(token)) return TRUE;
else if (*token == '{') return TRUE;
else return FALSE;
}
void SpiceSubCell(struct nlist *tp, int IsSubCell) void SpiceSubCell(struct nlist *tp, int IsSubCell)
{ {
struct objlist *ob; struct objlist *ob;
@ -956,7 +970,7 @@ skip_ends:
/* Get capacitor value (if present), save as property "value" */ /* Get capacitor value (if present), save as property "value" */
if (nexttok != NULL) { if (nexttok != NULL) {
if (StringIsValue(nexttok)) { if (StringIsValueOrExpression(nexttok)) {
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
SpiceTokNoNewline(); SpiceTokNoNewline();
} }
@ -984,7 +998,7 @@ skip_ends:
if ((eqptr = strchr(model, ']')) != NULL) if ((eqptr = strchr(model, ']')) != NULL)
*eqptr = '\0'; *eqptr = '\0';
} }
else if (StringIsValue(nexttok)) { else if (StringIsValueOrExpression(nexttok)) {
// Suport for value passed to modeled capacitor // Suport for value passed to modeled capacitor
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
} }
@ -1050,7 +1064,7 @@ skip_ends:
/* Get resistor value (if present); save as property "value" */ /* Get resistor value (if present); save as property "value" */
if (nexttok != NULL) { if (nexttok != NULL) {
if (StringIsValue(nexttok)) { if (StringIsValueOrExpression(nexttok)) {
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
SpiceTokNoNewline(); SpiceTokNoNewline();
} }
@ -1077,7 +1091,7 @@ skip_ends:
if ((eqptr = strchr(model, ']')) != NULL) if ((eqptr = strchr(model, ']')) != NULL)
*eqptr = '\0'; *eqptr = '\0';
} }
else if (StringIsValue(nexttok)) { else if (StringIsValueOrExpression(nexttok)) {
// Suport for value passed to modeled resistor // Suport for value passed to modeled resistor
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
} }
@ -1277,7 +1291,7 @@ skip_ends:
/* Get inductance value (if present); save as property "value" */ /* Get inductance value (if present); save as property "value" */
if (nexttok != NULL) { if (nexttok != NULL) {
if (StringIsValue(nexttok)) { if (StringIsValueOrExpression(nexttok)) {
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
SpiceTokNoNewline(); SpiceTokNoNewline();
} }
@ -1368,7 +1382,7 @@ skip_ends:
*eqptr = '\0'; *eqptr = '\0';
AddProperty(&kvlist, nexttok, eqptr + 1); AddProperty(&kvlist, nexttok, eqptr + 1);
} }
else if (StringIsValue(nexttok)) { else if (StringIsValueOrExpression(nexttok)) {
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
SpiceTokNoNewline(); SpiceTokNoNewline();
} }
@ -1422,7 +1436,7 @@ skip_ends:
*eqptr = '\0'; *eqptr = '\0';
AddProperty(&kvlist, nexttok, eqptr + 1); AddProperty(&kvlist, nexttok, eqptr + 1);
} }
else if (StringIsValue(nexttok)) { else if (StringIsValueOrExpression(nexttok)) {
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
SpiceTokNoNewline(); SpiceTokNoNewline();
} }
@ -1485,7 +1499,7 @@ skip_ends:
*eqptr = '\0'; *eqptr = '\0';
AddProperty(&kvlist, nexttok, eqptr + 1); AddProperty(&kvlist, nexttok, eqptr + 1);
} }
else if (StringIsValue(nexttok)) { else if (StringIsValueOrExpression(nexttok)) {
AddProperty(&kvlist, "value", nexttok); AddProperty(&kvlist, "value", nexttok);
SpiceTokNoNewline(); SpiceTokNoNewline();
} }