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

update stop command

This commit is contained in:
h_vogt 2010-12-31 09:08:54 +00:00
parent 59a699e9ec
commit 62f22b4145
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
2010-12-30 Holger Vogt
10-12-31 Holger Vogt
* breakp.c: allow multiple conditionals with '=' in stop command
10-12-30 Holger Vogt
* aspice.c, inpcom.c, numparam/general.h, 1-f-code.h, equality.c
randnumb.c, spdefs.h, cktsens.c: remove compiler warnings
breakp.c: allow 'time = nnn' in stop command

11
src/frontend/breakp.c
View File

@ -72,7 +72,9 @@ com_stop(wordlist *wl)
} else if (eq(wl->wl_word, "when") && wl->wl_next) {
/* cp_lexer(string) will not discriminate '=', so we have
to do it here */
if (strstr(wl->wl_next->wl_word,"=") && !(wl->wl_next->wl_next)) {
if (strstr(wl->wl_next->wl_word,"=") && (!(wl->wl_next->wl_next) ||
strstr(wl->wl_next->wl_next->wl_word,"when") ||
strstr(wl->wl_next->wl_next->wl_word,"after"))) {
/* we have vec=val in a single word */
wordlist * wln;
char** charr = TMALLOC(char*, 4) ;
@ -85,9 +87,10 @@ com_stop(wordlist *wl)
charr[2] = tokafter;
charr[3] = NULL;
wln = wl_build(charr);
wl_free(wl->wl_next);
wl->wl_next = NULL;
wl = wl_append(wl, wln);
wl_splice(wl->wl_next, wln);
// wl_free(wl->wl_next);
// wl->wl_next = NULL;
// wl = wl_append(wl, wln);
}
if (wl->wl_next->wl_next &&