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

don't transform operators ('&|' -> '&&' '&' -> '&&' etc) pass them *literally*

This commit is contained in:
rlar 2010-12-11 18:34:29 +00:00
parent 2b4069f93e
commit 34a6676dc8
2 changed files with 8 additions and 8 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 Robert Larice
* src/frontend/inpcom.c :
don't transform operators ('&|' -> '&&' '&' -> '&&' etc) pass them *literally*
2010-12-11 Holger Vogt 2010-12-11 Holger Vogt
* inpcom.c: && and || in B source, bug no. 3127808 * inpcom.c: && and || in B source, bug no. 3127808
* src/makefile.am: trailing white spaces removed * src/makefile.am: trailing white spaces removed

12
src/frontend/inpcom.c
View File

@ -4354,15 +4354,11 @@ static void inp_bsource_compat(struct line *deck)
} }
else if ((actchar == '|') || (actchar == '&')) else if ((actchar == '|') || (actchar == '&'))
{ {
buf[0] = actchar; char *beg = str_ptr++;
buf[1] = actchar; if ((*str_ptr == '|') || (*str_ptr == '&'))
buf[2] = '\0'; str_ptr++;
cwl->wl_word = copy(buf); cwl->wl_word = copy_substring(beg, str_ptr);
str_ptr++;
ustate = 1; /* we have an operator */ 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;