ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libBASS/parse_tree.c
(Generate patch)

Comparing trunk/OOPSE/libBASS/parse_tree.c (file contents):
Revision 988 by gezelter, Tue Jan 27 19:37:48 2004 UTC vs.
Revision 998 by gezelter, Thu Jan 29 23:01:17 2004 UTC

# Line 162 | Line 162 | void walk_down( struct node_tag* the_node, struct name
162            walk_down( the_node->stmt_list, current_namespc );
163          }
164          break;
165 –
166 –      case MEMBER_HEAD:
167 –        if( the_namespc.type != RIGIDBODY_HEAD ){
168 –          print_tree_error( the_node,
169 –                            "The Member block is not in "
170 –                            "a rigidBody namespace" );
171 –        }
172 –        else{
173 –          init_member( the_node->index );
174 –          current_namespc.index = the_node->index;
175 –          current_namespc.type = the_node->type;
176 –          walk_down( the_node->stmt_list, current_namespc );
177 –        }
178 –        break;
165        
166        case ZCONSTRAINT_HEAD:
167          if( the_namespc.type != GLOBAL_HEAD ){
# Line 207 | Line 193 | void walk_down( struct node_tag* the_node, struct name
193          case BOND_HEAD: // fall through
194          case BEND_HEAD: // fall through
195          case TORSION_HEAD: // same for the first three
196 +        case RIGIDBODY_HEAD:
197            init_members( the_node, the_namespc );
198            break;
199  
200          default:
201            print_tree_error( the_node,
202                              "Members statement not in a bond, bend, "
203 <                            "or torsion" );
203 >                            "torsion, or rigidBody." );
204            break;
205          }
206          break;
# Line 338 | Line 325 | void print_tree_error( struct node_tag* err_node, char
325               err_msg );
326      break;
327  
341 –  case MEMBER_HEAD:
342 –    sprintf( painCave.errMsg,
343 –             "Parse tree error: member head node error [%d] -> %s\n",
344 –             err_node->index,
345 –             err_msg );
346 –    break;
347 –
328    case MEMBERS_STMT:
329      sprintf( painCave.errMsg,
330 <             "Parse tree error: members node error => ( %d, %d, %d, %d )\n"
330 >             "Parse tree error: members node error (nMembers = %d)\n"
331               "                  -> %s\n",
332 <             err_node->the_data.mbrs.a,
353 <             err_node->the_data.mbrs.b,
354 <             err_node->the_data.mbrs.c,
355 <             err_node->the_data.mbrs.d,
332 >             err_node->the_data.mbrs.nMembers,
333               err_msg );
334      break;
335  
# Line 411 | Line 388 | void print_tree_error( struct node_tag* err_node, char
388      sprintf( painCave.errMsg,
389               "Parse tree error: orientation node error => ( %lf, %lf, %lf )\n"
390               "                  -> %s\n",
391 <             err_node->the_data.ort.x,
392 <             err_node->the_data.ort.y,
393 <             err_node->the_data.ort.z,
391 >             err_node->the_data.ort.phi,
392 >             err_node->the_data.ort.theta,
393 >             err_node->the_data.ort.psi,
394               err_msg );
395      break;
396  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines