--- trunk/OOPSE/libBASS/parse_tree.c 2004/01/27 19:37:48 988 +++ trunk/OOPSE/libBASS/parse_tree.c 2004/01/29 23:01:17 998 @@ -162,20 +162,6 @@ void walk_down( struct node_tag* the_node, struct name walk_down( the_node->stmt_list, current_namespc ); } break; - - case MEMBER_HEAD: - if( the_namespc.type != RIGIDBODY_HEAD ){ - print_tree_error( the_node, - "The Member block is not in " - "a rigidBody namespace" ); - } - else{ - init_member( the_node->index ); - current_namespc.index = the_node->index; - current_namespc.type = the_node->type; - walk_down( the_node->stmt_list, current_namespc ); - } - break; case ZCONSTRAINT_HEAD: if( the_namespc.type != GLOBAL_HEAD ){ @@ -207,13 +193,14 @@ void walk_down( struct node_tag* the_node, struct name 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, "Members statement not in a bond, bend, " - "or torsion" ); + "torsion, or rigidBody." ); break; } break; @@ -338,21 +325,11 @@ void print_tree_error( struct node_tag* err_node, char err_msg ); break; - case MEMBER_HEAD: - sprintf( painCave.errMsg, - "Parse tree error: member head node error [%d] -> %s\n", - err_node->index, - err_msg ); - break; - case MEMBERS_STMT: sprintf( painCave.errMsg, - "Parse tree error: members node error => ( %d, %d, %d, %d )\n" + "Parse tree error: members node error (nMembers = %d)\n" " -> %s\n", - err_node->the_data.mbrs.a, - err_node->the_data.mbrs.b, - err_node->the_data.mbrs.c, - err_node->the_data.mbrs.d, + err_node->the_data.mbrs.nMembers, err_msg ); break; @@ -411,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;