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

inpcom.c, bug fix in inp_chk_for_multi_in_vcvs()

This commit is contained in:
h_vogt 2016-08-09 18:31:16 +02:00 committed by rlar
parent e1904a78bd
commit e3df9bb931
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/frontend/inpcom.c
View File

@ -1319,10 +1319,11 @@ inp_chk_for_multi_in_vcvs(struct line *c, int *line_number)
char *fcn_b; char *fcn_b;
if ((fcn_b = strstr(line, "nand(")) != NULL || if (((fcn_b = strstr(line, "nand(")) != NULL ||
(fcn_b = strstr(line, "and(")) != NULL || (fcn_b = strstr(line, "and(")) != NULL ||
(fcn_b = strstr(line, "nor(")) != NULL || (fcn_b = strstr(line, "nor(")) != NULL ||
(fcn_b = strstr(line, "or(")) != NULL) (fcn_b = strstr(line, "or(")) != NULL) &&
isspace_c(fcn_b[-1]))
{ {
struct line *a_card, *model_card, *next_card; struct line *a_card, *model_card, *next_card;
char keep, *comma_ptr, *xy_values1[5], *xy_values2[5]; char keep, *comma_ptr, *xy_values1[5], *xy_values2[5];
@ -1332,6 +1333,19 @@ inp_chk_for_multi_in_vcvs(struct line *c, int *line_number)
int xy_count1, xy_count2; int xy_count1, xy_count2;
bool ok = FALSE; bool ok = FALSE;
#ifndef XSPICE
fprintf(stderr,
"\n"
"Error: XSPICE is required to run the 'multi-input pwl' option in line %d\n"
" %s\n"
"\n"
"See manual chapt. 31 for installation instructions\n",
*line_number,
line
);
controlled_exit(EXIT_BAD);
#endif
do { do {
ref_e = skip_non_ws(line); ref_e = skip_non_ws(line);