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

() handling repaired

This commit is contained in:
h_vogt 2009-04-23 22:46:30 +00:00
parent b5db0a1e36
commit 9dcfdd201c
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2009-04-23 Holger Vogt
* measure.c: .measure broken for trig, targ
2009-04-22 Holger Vogt 2009-04-22 Holger Vogt
* bsim4v2init.c, bsim4v3init.c: CIDER added * bsim4v2init.c, bsim4v3init.c: CIDER added

10
src/frontend/measure.c
View File

@ -344,6 +344,7 @@ static char*
get_vector_name( char **line ) { get_vector_name( char **line ) {
char *token, *name; char *token, *name;
// token = name = gettok(line);
token = name = gettok_paren(line); token = name = gettok_paren(line);
// *(name + strlen(name) - 1) = '\0'; // *(name + strlen(name) - 1) = '\0';
@ -366,6 +367,9 @@ do_delay_measurement( char *resname, char *out_line, char *line, char *o_line, i
trig_type = *line; line += 2; /* skip over vector type and open paren */ trig_type = *line; line += 2; /* skip over vector type and open paren */
trig_name = get_vector_name( &line ); trig_name = get_vector_name( &line );
while(*line && !(*line == ')')) line++; /* find ')' */
line++; /* move on beyond ')' */
if ( trig_type != 'v' && trig_type != 'i' ) { if ( trig_type != 'v' && trig_type != 'i' ) {
if ( just_chk_meas != TRUE ) { if ( just_chk_meas != TRUE ) {
fprintf( cp_err, "Error: unexpected vector type '%c' for .meas!\n", trig_type ); fprintf( cp_err, "Error: unexpected vector type '%c' for .meas!\n", trig_type );
@ -404,6 +408,9 @@ do_delay_measurement( char *resname, char *out_line, char *line, char *o_line, i
targ_type = *line; line += 2; /* skip over vector type and open paren */ targ_type = *line; line += 2; /* skip over vector type and open paren */
targ_name = get_vector_name( &line ); targ_name = get_vector_name( &line );
while(*line && !(*line == ')')) line++; /* find ')' */
line++; /* move on beyond ')' */
if ( targ_type != 'v' && targ_type != 'i' ) { if ( targ_type != 'v' && targ_type != 'i' ) {
if ( just_chk_meas != TRUE ) { if ( just_chk_meas != TRUE ) {
fprintf( cp_err, "Error: unexpected vector type '%c' for .meas!\n", targ_type ); fprintf( cp_err, "Error: unexpected vector type '%c' for .meas!\n", targ_type );
@ -458,6 +465,9 @@ do_other_measurement( char *resname, char *out_line, char *meas_type, char *line
vec_type = *line; line += 2; /* skip over vector type and open paren */ vec_type = *line; line += 2; /* skip over vector type and open paren */
vec_name = get_vector_name( &line ); vec_name = get_vector_name( &line );
while(*line && !(*line == ')')) line++; /* find ')' */
line++; /* move on beyond ')' */
if ( vec_type != 'v' && vec_type != 'i' ) { if ( vec_type != 'v' && vec_type != 'i' ) {
if ( just_chk_meas != TRUE ) { if ( just_chk_meas != TRUE ) {
fprintf( cp_err, "Error: unexpected vector type '%c' for .meas!\n", vec_type ); fprintf( cp_err, "Error: unexpected vector type '%c' for .meas!\n", vec_type );