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

replace controlles_exit by error return, 

delete netlist cc when returning upon error.
This commit is contained in:
Holger Vogt 2021-01-20 09:40:54 +01:00
parent 058f474f90
commit ed15d6f975
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/frontend/inpcom.c
View File

@ -202,7 +202,7 @@ struct inp_read_t inp_read( FILE *fp, int call_depth, const char *dir_name,
#ifdef XSPICE #ifdef XSPICE
static void inp_poly_2g6_compat(struct card* deck); static int inp_poly_2g6_compat(struct card* deck);
#else #else
static void inp_poly_err(struct card *deck); static void inp_poly_err(struct card *deck);
#endif #endif
@ -797,8 +797,10 @@ struct card *inp_readall(FILE *fp, const char *dir_name,
inp_remove_excess_ws(working); inp_remove_excess_ws(working);
if(inp_vdmos_model(working)) if(inp_vdmos_model(working)) {
line_free_x(cc, TRUE);
return NULL; return NULL;
}
/* don't remove unused model if we have an .if clause, because we /* don't remove unused model if we have an .if clause, because we
cannot yet decide here which model we finally will need. cannot yet decide here which model we finally will need.
@ -844,7 +846,10 @@ struct card *inp_readall(FILE *fp, const char *dir_name,
if (cp_getvar("addcontrol", CP_BOOL, NULL, 0)) if (cp_getvar("addcontrol", CP_BOOL, NULL, 0))
inp_add_control_section(working, &rv.line_number); inp_add_control_section(working, &rv.line_number);
#ifdef XSPICE #ifdef XSPICE
inp_poly_2g6_compat(working); if (inp_poly_2g6_compat(working)) {
line_free_x(cc, TRUE);
return NULL;
}
#else #else
inp_poly_err(working); inp_poly_err(working);
#endif #endif
@ -9419,7 +9424,7 @@ static void inp_repair_dc_ps(struct card* deck) {
/* spice2g6 allows to omit the poly(n) statement, if the /* spice2g6 allows to omit the poly(n) statement, if the
polynomial is one-dimensional (n==1). polynomial is one-dimensional (n==1).
For compatibility with the XSPIXE code, we have to add poly(1) appropriately. */ For compatibility with the XSPIXE code, we have to add poly(1) appropriately. */
static void inp_poly_2g6_compat(struct card* deck) { static int inp_poly_2g6_compat(struct card* deck) {
struct card* card; struct card* card;
int skip_control = 0; int skip_control = 0;
@ -9483,7 +9488,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line); curr_line = nexttok(curr_line);
if (!curr_line) { if (!curr_line) {
fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline); fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline);
controlled_exit(1); return 1;
} }
/* The next token may be a simple text token or an expression /* The next token may be a simple text token or an expression
enclosed in brackets */ enclosed in brackets */
@ -9495,7 +9500,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line); curr_line = nexttok(curr_line);
if (!curr_line) { if (!curr_line) {
fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline); fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline);
controlled_exit(1); return 1;
} }
if (*curr_line == '\0') if (*curr_line == '\0')
continue; continue;
@ -9505,7 +9510,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line); curr_line = nexttok(curr_line);
if (!curr_line) { if (!curr_line) {
fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline); fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline);
controlled_exit(1); return 1;
} }
/* The next token may be a simple text token or an expression /* The next token may be a simple text token or an expression
enclosed in brackets */ enclosed in brackets */
@ -9517,7 +9522,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line); curr_line = nexttok(curr_line);
if (!curr_line) { if (!curr_line) {
fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline); fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline);
controlled_exit(1); return 1;
} }
if (*curr_line == '\0') if (*curr_line == '\0')
continue; continue;
@ -9542,5 +9547,6 @@ static void inp_poly_2g6_compat(struct card* deck) {
card->line = newline; card->line = newline;
tfree(endofline); tfree(endofline);
} }
return 0;
} }
#endif #endif