luke/ngspice
1
0
Fork 0
mirror of https://git.code.sf.net/p/ngspice/ngspice synced 2026-08-22 05:47:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

The tc for R, L, C may include an expression

Browse Source 
like tc={expression} or tc={expression}, 1.3u or
tc={expression}, {expression2}
This commit is contained in:
Holger Vogt
2023-03-18 14:37:53 +01:00
parent d8505f0069
commit e4202ea181
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/inpcom.c
+18 -2
View File
@@ -8819,6 +8819,7 @@ static struct card *pspice_compat(struct card *oldcard)
} }
char *tctok = search_plain_identifier(ntok, "tc"); char *tctok = search_plain_identifier(ntok, "tc");
if (tctok) { if (tctok) {
char *tc1, *tc2;
char *tctok1 = strchr(tctok, '='); char *tctok1 = strchr(tctok, '=');
if (tctok1) if (tctok1)
/* skip '=' */ /* skip '=' */
@@ -8826,8 +8827,23 @@ static struct card *pspice_compat(struct card *oldcard)
else else
/* no '=' found, skip 'tc' */ /* no '=' found, skip 'tc' */
tctok1 = tctok + 2; tctok1 = tctok + 2;
char *tc1 = gettok_node(&tctok1); /* tc1 may be an expression, enclosed in {} */
char *tc2 = gettok_node(&tctok1); if (*tctok1 == '{') {
tc1 = gettok_char(&tctok1, '}', TRUE, TRUE);
}
else {
tc1 = gettok_node(&tctok1);
}
/* skip spaces and commas */
while (isspace_c(*tctok1) || (*tctok1 == ','))
tctok1++;
/* tc2 may be an expression, enclosed in {} */
if (*tctok1 == '{') {
tc2 = gettok_char(&tctok1, '}', TRUE, TRUE);
}
else {
tc2 = gettok_node(&tctok1);
}
tctok[-1] = '\0'; tctok[-1] = '\0';
char *newstring; char *newstring;
if (tc1 && tc2) if (tc1 && tc2)