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

inp.c, evtinit.c: improved error message

Browse Source 
suggested by Calin Andrian
This commit is contained in:
h_vogt
2014-01-02 09:31:23 +01:00
committed by rlar
parent 780ccbfb3c
commit bb121fe903
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/inp.c
+9 -4
View File
@@ -60,6 +60,8 @@ void create_circbyline(char *line);
void inp_evaluate_temper(void); void inp_evaluate_temper(void);
extern bool ft_batchmode;
/* structure used to save expression parse trees for .model and /* structure used to save expression parse trees for .model and
* device instance lines * device instance lines
*/ */
@@ -764,7 +766,7 @@ inp_dodeck(
wordlist *wl; wordlist *wl;
bool noparse, ii; bool noparse, ii;
int print_listing; int print_listing;
bool have_err = FALSE;
double startTime; double startTime;
/* First throw away any old error messages there might be and fix /* First throw away any old error messages there might be and fix
@@ -879,7 +881,7 @@ inp_dodeck(
if (dd->li_error) { if (dd->li_error) {
char *p, *q; char *p, *q;
have_err = TRUE;
#ifdef XSPICE #ifdef XSPICE
/* add setting of ipc syntax error flag */ /* add setting of ipc syntax error flag */
g_ipc.syntax_error = IPC_TRUE; g_ipc.syntax_error = IPC_TRUE;
@@ -895,7 +897,7 @@ inp_dodeck(
out_printf("Model issue on line %d : %.*s ...\n%s\n", out_printf("Model issue on line %d : %.*s ...\n%s\n",
dd->li_linenum_orig, 56, dd->li_line, dd->li_error); dd->li_linenum_orig, 56, dd->li_line, dd->li_error);
else else
out_printf("Error on line %d : %s\n%s\n", out_printf("Error on line %d : %s\n %s\n",
dd->li_linenum_orig, dd->li_line, dd->li_error); dd->li_linenum_orig, dd->li_line, dd->li_error);
if (ft_stricterror) if (ft_stricterror)
controlled_exit(EXIT_BAD); controlled_exit(EXIT_BAD);
@@ -911,8 +913,11 @@ inp_dodeck(
} /* for (dd = deck; dd; dd = dd->li_next) */ } /* for (dd = deck; dd; dd = dd->li_next) */
/* Only print out netlist if brief is FALSE */ /* Stop here and exit if error occurred in batch mode */
if (have_err && ft_batchmode)
controlled_exit(EXIT_BAD);
/* Only print out netlist if brief is FALSE */
if (!cp_getvar("brief", CP_BOOL, NULL)) { if (!cp_getvar("brief", CP_BOOL, NULL)) {
/* output deck */ /* output deck */
out_printf("\nProcessed Netlist\n"); out_printf("\nProcessed Netlist\n");
src/xspice/evt/evtinit.c
+1 -3
View File
@@ -221,9 +221,7 @@ static int EVTcheck_nodes(
sprintf(errMsg, "%s%s%s", err_prefix, sprintf(errMsg, "%s%s%s", err_prefix,
event_node->name, event_node->name,
err_collide); err_collide);
fprintf(stdout, "%s\n", errMsg);
fprintf(stdout, "%s", errMsg);
return(E_PRIVATE); return(E_PRIVATE);
} }
analog_node = analog_node->next; analog_node = analog_node->next;