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

.measure skip braces in a special case

This commit is contained in:
h_vogt 2010-06-19 18:50:39 +00:00
parent aab308e863
commit a3a4d4409c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
2010-06-19 Holger Vogt
* subckt.c: line indentations
com_measure2.c: remove bug, see support tracker no. 3013968
inpcom.c: no braces around out_variable3 in
.MEASURE {DC|AC|TRAN} result FIND out_variable WHEN out_variable2=out_variable3
2010-06-19 Robert Larice
* ng-spice-rework/src/xspice/Makefile.am:

12
src/frontend/inpcom.c
View File

@ -2675,7 +2675,7 @@ static void
inp_fix_param_values( struct line *deck )
{
struct line *c = deck;
char *line, *beg_of_str, *end_of_str, *old_str, *equal_ptr, *new_str;
char *line, *beg_of_str, *end_of_str, *old_str, *equal_ptr, *new_str, *tmp_str;
char *vec_str, *natok, *buffer, *newvec, *whereisgt;
bool control_section = FALSE, has_paren = FALSE;
int n = 0;
@ -2711,6 +2711,16 @@ inp_fix_param_values( struct line *deck )
while ( ( equal_ptr = strstr( line, "=" ) ) ) {
// special case: .MEASURE {DC|AC|TRAN} result FIND out_variable WHEN out_variable2=out_variable3
// no braces around out_variable3. out_variable3 may be v(...) or i(...)
if ( ciprefix( ".meas", line ))
if ((( *(equal_ptr+1) == 'v' ) || ( *(equal_ptr+1) == 'i' )) && ( *(equal_ptr+2) == '(' )) {
// find closing ')' and skip token v(...) or i(...)
while (( equal_ptr) && *equal_ptr != ')') equal_ptr++;
line = equal_ptr + 1;
continue;
}
// skip over equality '=='
if ( *(equal_ptr+1) == '=' ) { line += 2; continue; }
// check for '!=', '<=', '>='