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 9579f55824
commit 2d7919b4bd
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
static void inp_poly_2g6_compat(struct card* deck);
static int inp_poly_2g6_compat(struct card* deck);
#else
static void inp_poly_err(struct card *deck);
#endif
@ -797,8 +797,10 @@ struct card *inp_readall(FILE *fp, const char *dir_name,
inp_remove_excess_ws(working);
if(inp_vdmos_model(working))
if(inp_vdmos_model(working)) {
line_free_x(cc, TRUE);
return NULL;
}
/* don't remove unused model if we have an .if clause, because we
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))
inp_add_control_section(working, &rv.line_number);
#ifdef XSPICE
inp_poly_2g6_compat(working);
if (inp_poly_2g6_compat(working)) {
line_free_x(cc, TRUE);
return NULL;
}
#else
inp_poly_err(working);
#endif
@ -9417,7 +9422,7 @@ static void inp_repair_dc_ps(struct card* deck) {
/* spice2g6 allows to omit the poly(n) statement, if the
polynomial is one-dimensional (n==1).
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;
int skip_control = 0;
@ -9481,7 +9486,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line);
if (!curr_line) {
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
enclosed in brackets */
@ -9493,7 +9498,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line);
if (!curr_line) {
fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline);
controlled_exit(1);
return 1;
}
if (*curr_line == '\0')
continue;
@ -9503,7 +9508,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line);
if (!curr_line) {
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
enclosed in brackets */
@ -9515,7 +9520,7 @@ static void inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok(curr_line);
if (!curr_line) {
fprintf(stderr, "Error: not enough parameters in line\n %s\n", thisline);
controlled_exit(1);
return 1;
}
if (*curr_line == '\0')
continue;
@ -9540,5 +9545,6 @@ static void inp_poly_2g6_compat(struct card* deck) {
card->line = newline;
tfree(endofline);
}
return 0;
}
#endif