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

bug, see support tracker no. 3013968

This commit is contained in:
h_vogt 2010-06-19 18:23:32 +00:00
parent 1f290ed13e
commit aab308e863
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-06-19 Holger Vogt
* subckt.c: line indentations
com_measure2.c: remove bug, see support tracker no. 3013968
2010-06-19 Robert Larice
* ng-spice-rework/src/xspice/Makefile.am:
exclude some junk from `make dist'

2
src/frontend/com_measure2.c
View File

@ -1413,7 +1413,7 @@ get_measure2(
return MEASUREMENT_FAILURE;
}
measure_at(measFind, measFind->m_measured);
measure_at(meas, measFind->m_measured);
meas->m_measured = measFind->m_measured;
} else {

17
src/frontend/subckt.c
View File

@ -360,14 +360,15 @@ inp_subcktexpand(struct line *deck)
ok= ok && nupa_signal(NUPASUBDONE, NULL);
c= ll;
while (c != NULL) {
/* 'param' .meas statements can have dependencies on measurement values */
/* need to skip evaluating here and evaluate after other .meas statements */
if ( ciprefix( ".meas", c->li_line ) ) {
if ( !strstr( c->li_line, "param" ) ) nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
} else {
nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
}
c= c->li_next;
/* 'param' .meas statements can have dependencies on measurement values */
/* need to skip evaluating here and evaluate after other .meas statements */
if ( ciprefix( ".meas", c->li_line ) ) {
if ( !strstr( c->li_line, "param" ) )
nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
} else {
nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
}
c= c->li_next;
}
#ifdef TRACE
fprintf(stderr,"Numparams converted deck:\n");