--- trunk/OOPSE/libBASS/parse_tree.c 2004/01/19 16:08:21 957 +++ trunk/OOPSE/libBASS/parse_tree.c 2004/01/29 23:01:17 998 @@ -188,18 +188,19 @@ void walk_down( struct node_tag* the_node, struct name switch( the_node->type ){ - case MEMBER_STMT: + case MEMBERS_STMT: switch( the_namespc.type ){ case BOND_HEAD: // fall through case BEND_HEAD: // fall through case TORSION_HEAD: // same for the first three + case RIGIDBODY_HEAD: init_members( the_node, the_namespc ); break; default: print_tree_error( the_node, - "Member statement not in a bond, bend, " - "or torsion" ); + "Members statement not in a bond, bend, " + "torsion, or rigidBody." ); break; } break; @@ -313,17 +314,10 @@ void print_tree_error( struct node_tag* err_node, char case BEND_HEAD: sprintf( painCave.errMsg, "Parse tree error: bend head node error [%d] -> %s\n", - err_node->index, - err_msg ); - break; - - case TORSION_HEAD: - sprintf( painCave.errMsg, - "Parse tree error: torsion head node error [%d] -> %s\n", err_node->index, err_msg ); break; - + case ZCONSTRAINT_HEAD: sprintf( painCave.errMsg, "Parse tree error: Zconstraint head node error [%d] -> %s\n", @@ -331,14 +325,11 @@ void print_tree_error( struct node_tag* err_node, char err_msg ); break; - case MEMBER_STMT: + case MEMBERS_STMT: sprintf( painCave.errMsg, - "Parse tree error: member node error => ( %d, %d, %d, %d )\n" + "Parse tree error: members node error (nMembers = %d)\n" " -> %s\n", - err_node->the_data.mbr.a, - err_node->the_data.mbr.b, - err_node->the_data.mbr.c, - err_node->the_data.mbr.d, + err_node->the_data.mbrs.nMembers, err_msg ); break; @@ -397,9 +388,9 @@ void print_tree_error( struct node_tag* err_node, char sprintf( painCave.errMsg, "Parse tree error: orientation node error => ( %lf, %lf, %lf )\n" " -> %s\n", - err_node->the_data.ort.x, - err_node->the_data.ort.y, - err_node->the_data.ort.z, + err_node->the_data.ort.phi, + err_node->the_data.ort.theta, + err_node->the_data.ort.psi, err_msg ); break;