From 9dcfdd201caecb5d4325a79262fedb18fabf4315 Mon Sep 17 00:00:00 2001
From: h_vogt <h_vogt>
Date: Thu, 23 Apr 2009 22:46:30 +0000
Subject: [PATCH] () handling repaired

---
 ChangeLog              |  3 +++
 src/frontend/measure.c | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 321b8f7b6..1a7877cf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-04-23 Holger Vogt
+ * measure.c: .measure broken for trig, targ
+
 2009-04-22 Holger Vogt
  * bsim4v2init.c, bsim4v3init.c: CIDER added
    
diff --git a/src/frontend/measure.c b/src/frontend/measure.c
index 19b035fba..ffe7ce55c 100644
--- a/src/frontend/measure.c
+++ b/src/frontend/measure.c
@@ -344,6 +344,7 @@ static char*
 get_vector_name( char **line ) {
   char *token, *name;
 
+//  token = name = gettok(line);
   token = name = gettok_paren(line);
 
 //  *(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_name = get_vector_name( &line );
+  while(*line && !(*line == ')')) line++; /* find ')' */
+  line++; /* move on beyond ')' */
+
   if ( trig_type != 'v' && trig_type != 'i' ) {
     if ( just_chk_meas != TRUE ) {
       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_name = get_vector_name( &line );
+  while(*line && !(*line == ')')) line++; /* find ')' */
+  line++; /* move on beyond ')' */
+
   if ( targ_type != 'v' && targ_type != 'i' ) {
     if ( just_chk_meas != TRUE ) {
       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_name = get_vector_name( &line );
+   while(*line && !(*line == ')')) line++; /* find ')' */
+   line++; /* move on beyond ')' */
+      
    if ( vec_type != 'v' && vec_type != 'i' ) {
       if ( just_chk_meas != TRUE ) {
          fprintf( cp_err, "Error: unexpected vector type '%c' for .meas!\n", vec_type );