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

bug no. 3127808, and rem trailing white spaces

This commit is contained in:
h_vogt 2010-12-11 17:26:22 +00:00
parent e1292b0c3a
commit 2b4069f93e
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-12-11 Holger Vogt
* inpcom.c: && and || in B source, bug no. 3127808
* src/makefile.am: trailing white spaces removed
2010-12-04 Robert Larice 2010-12-04 Robert Larice
* src/xspice/mif/mifdelete.c : * src/xspice/mif/mifdelete.c :
bug fix, segmentation fault caused by `reset' when xspice used bug fix, segmentation fault caused by `reset' when xspice used

10
src/Makefile.am
View File

@ -156,7 +156,7 @@ endif
ngspice_LDADD += \ ngspice_LDADD += \
frontend/parser/libparser.la \ frontend/parser/libparser.la \
frontend/numparam/libnumparam.la \ frontend/numparam/libnumparam.la \
frontend/trannoise/libtrannoise.la \ frontend/trannoise/libtrannoise.la \
spicelib/parser/libinp.la spicelib/parser/libinp.la
if CIDER_WANTED if CIDER_WANTED
@ -171,7 +171,7 @@ ngspice_LDADD += \
maths/deriv/libderiv.la \ maths/deriv/libderiv.la \
maths/cmaths/libcmaths.la \ maths/cmaths/libcmaths.la \
maths/misc/libmathmisc.la \ maths/misc/libmathmisc.la \
maths/fft/libmathfft.la \ maths/fft/libmathfft.la \
maths/poly/libpoly.la \ maths/poly/libpoly.la \
maths/ni/libni.la \ maths/ni/libni.la \
maths/sparse/libsparse.la \ maths/sparse/libsparse.la \
@ -210,10 +210,10 @@ ngnutmeg_LDADD += \
frontend/plotting/libplotting.la \ frontend/plotting/libplotting.la \
frontend/parser/libparser.la \ frontend/parser/libparser.la \
frontend/numparam/libnumparam.la \ frontend/numparam/libnumparam.la \
frontend/trannoise/libtrannoise.la \ frontend/trannoise/libtrannoise.la \
maths/cmaths/libcmaths.la \ maths/cmaths/libcmaths.la \
maths/misc/libmathmisc.la \ maths/misc/libmathmisc.la \
maths/fft/libmathfft.la \ maths/fft/libmathfft.la \
maths/poly/libpoly.la \ maths/poly/libpoly.la \
misc/libmisc.la \ misc/libmisc.la \
spicelib/parser/libinp.la spicelib/parser/libinp.la
@ -388,7 +388,7 @@ libspice_la_LIBADD += \
maths/deriv/libderiv.la \ maths/deriv/libderiv.la \
maths/cmaths/libcmaths.la \ maths/cmaths/libcmaths.la \
maths/misc/libmathmisc.la \ maths/misc/libmathmisc.la \
maths/fft/libmathfft.la \ maths/fft/libmathfft.la \
maths/poly/libpoly.la \ maths/poly/libpoly.la \
maths/ni/libni.la \ maths/ni/libni.la \
maths/sparse/libsparse.la \ maths/sparse/libsparse.la \

18
src/frontend/inpcom.c
View File

@ -4352,6 +4352,18 @@ static void inp_bsource_compat(struct line *deck)
str_ptr++; str_ptr++;
ustate = 1; /* we have an operator */ ustate = 1; /* we have an operator */
} }
else if ((actchar == '|') || (actchar == '&'))
{
buf[0] = actchar;
buf[1] = actchar;
buf[2] = '\0';
cwl->wl_word = copy(buf);
str_ptr++;
ustate = 1; /* we have an operator */
/* just skip the second & or | */
if ((*str_ptr == '|') || (*str_ptr == '&'))
str_ptr++;
}
else if ((actchar == '-') && (ustate == 0)) { else if ((actchar == '-') && (ustate == 0)) {
buf[0] = actchar; buf[0] = actchar;
buf[1] = '\0'; buf[1] = '\0';
@ -4512,8 +4524,10 @@ static void inp_bsource_compat(struct line *deck)
new_line->li_error = NULL; new_line->li_error = NULL;
new_line->li_actual = NULL; new_line->li_actual = NULL;
new_line->li_line = final_str; new_line->li_line = final_str;
new_line->li_linenum = 0; /* Copy old line numbers into new B source line */
// comment out current old B line new_line->li_linenum = card->li_linenum;
new_line->li_linenum_orig = card->li_linenum_orig;
// comment out current line (old B source line)
*(card->li_line) = '*'; *(card->li_line) = '*';
// insert new B source line immediately after current line // insert new B source line immediately after current line
tmp_ptr = card->li_next; tmp_ptr = card->li_next;