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

Comparing trunk/OOPSE/libBASS/BASS_interface.cpp (file contents):
Revision 993 by gezelter, Tue Jan 27 20:34:11 2004 UTC vs.
Revision 1153 by gezelter, Tue May 11 04:21:52 2004 UTC

# Line 16 | Line 16 | typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BON
16  
17   typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BOND_BLK, BEND_BLK,
18                 TORSION_BLK, COMPONENT_BLK, ZCONSTRAINT_BLK,
19 <               RIGIDBODY_BLK, MEMBER_BLK } block_type;
19 >               RIGIDBODY_BLK, CUTOFFGROUP_BLK } block_type;
20  
21   block_type current_block = GLOBAL_BLK;
22   #define MAX_NEST 20 // the max number of nested blocks
# Line 106 | Line 106 | int event_handler( event* the_event ){
106        handled = the_stamps->newRigidBody( the_event );
107        break;
108  
109 +    case CUTOFFGROUP:
110 +      incr_block( CUTOFFGROUP_BLK );
111 +      handled = the_stamps->newCutoffGroup( the_event );
112 +      break;
113 +
114      case ASSIGNMENT:
115        handled = the_stamps->moleculeAssign( the_event );
116        break;
# Line 131 | Line 136 | int event_handler( event* the_event ){
136        handled = the_stamps->rigidBodyAssign( the_event );
137        break;
138  
139 <    case MEMBER:
140 <      incr_block( MEMBER_BLK );
136 <      handled = the_stamps->newMember( the_event );
139 >    case MEMBERS:
140 >      handled = the_stamps->rigidBodyMembers( the_event );
141        break;
142        
143      case BLOCK_END:
# Line 144 | Line 148 | int event_handler( event* the_event ){
148      default:
149        the_event->err_msg =
150          strdup( "Not a valid RigidBody event\n" );
151 +      return 0;
152 +    }
153 +    break;
154 +
155 +  case CUTOFFGROUP_BLK:
156 +    
157 +    switch( the_event->event_type ){
158 +      
159 +    case ASSIGNMENT:
160 +      handled = the_stamps->cutoffGroupAssign( the_event );
161 +      break;
162 +
163 +    case MEMBERS:
164 +      handled = the_stamps->cutoffGroupMembers( the_event );
165 +      break;
166 +      
167 +    case BLOCK_END:
168 +      decr_block();
169 +      handled = the_stamps->cutoffGroupEnd( the_event );
170 +      break;
171 +      
172 +    default:
173 +      the_event->err_msg =
174 +        strdup( "Not a valid CutoffGroup event\n" );
175        return 0;
176      }
177      break;
# Line 261 | Line 289 | int event_handler( event* the_event ){
289      }
290      break;
291  
264 –  case MEMBER_BLK:
265 –    
266 –    switch( the_event->event_type ){
267 –      
268 –    case ASSIGNMENT:
269 –      handled = the_stamps->memberAssign( the_event );
270 –      break;
271 –            
272 –    case BLOCK_END:
273 –      decr_block();
274 –      handled = the_stamps->memberEnd(the_event );
275 –      break;
276 –
277 –    default:
278 –      the_event->err_msg =
279 –        strdup( "not a valid member event\n" );
280 –      return 0;
281 –    }
282 –    break;
283 –
292    case ZCONSTRAINT_BLK:
293  
294      switch( the_event->event_type ){

Diff Legend

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