--- trunk/mdtools/interface_implementation/MakeStamps.cpp	2002/11/07 17:53:34	166
+++ trunk/mdtools/interface_implementation/MakeStamps.cpp	2002/12/06 21:20:42	198
@@ -4,32 +4,95 @@
 #include "MakeStamps.hpp"
 #include "MoleculeStamp.hpp"
 #include "simError.h"
+#ifdef IS_MPI
 #include "mpiBASS.h"
+#endif // is_mpi
 
 LinkedMolStamp::~LinkedMolStamp(){ 
   if( mol_stamp != NULL ) delete mol_stamp;
   if( next != NULL ) delete next; 
 }
 
+void LinkedMolStamp::add( LinkedMolStamp* newbie ){
+  
+  if( next != NULL ) next->add( newbie );
+  else{
+    next = newbie;
+    next->setPrev( this );
+  }
+}
+
 MoleculeStamp* LinkedMolStamp::match( char* id ){
 
   if( mol_stamp != NULL ){
-    
-    if(!strcmp( mol_stamp->getID(), id )) return mol_stamp;
-    
-    if( next != NULL ) return next->match( id );
+    if(!strcmp( mol_stamp->getID(), id )){
+      
+      // make sure we aren't hiding somebody else with the same name
+      if(next != NULL ){
+	if( next->match( id ) != NULL){
+	  sprintf( painCave.errMsg,
+		   "Molecule Stamp Error. Two separate of declarations of "
+		   "%s present.\n",
+		   id );
+	  painCave.isFatal = 1;
+	  simError();
+#ifdef IS_MPI
+	  if( painCave.isEventLoop ){
+	    if( worldRank == 0 ) mpiInterfaceExit();
+	  }
+#endif //is_mpi
+	}
+	else return mol_stamp;
+      }
+      else  return mol_stamp;
+    }
   }
   
+  if( next != NULL ) return next->match( id );
+  
   return NULL;
 }
 
+LinkedMolStamp* LinkedMolStamp::extract( char* id ){
+
+  if( mol_stamp != NULL ){
+    if(!strcmp( mol_stamp->getID(), id )){
+      
+      // make sure we aren't hiding somebody else with the same name
+      if(next != NULL ){
+	if( next->match( id ) != NULL){
+	  sprintf( painCave.errMsg,
+		   "Molecule Stamp Error. Two separate of declarations of "
+		   "%s present.\n",
+		   id );
+	  painCave.isFatal = 1;
+	  simError();
+#ifdef IS_MPI
+	  if( painCave.isEventLoop ){
+	    if( worldRank == 0 ) mpiInterfaceExit();
+	  }
+#endif //is_mpi
+	}
+      }
+	  
+      prev->setNext( next );
+      if( next != NULL ) next->setPrev( prev );
+      return this;
+    }
+  }
+  
+  if( next != NULL ) return next->extract( id );
+  
+  return NULL;
+}
+
 MakeStamps::MakeStamps(){
   
   int i;
   
   my_mols = new LinkedMolStamp*[hash_size];
   for( i=0; i<hash_size; i++ ){
-    my_mols[i] = NULL;
+    my_mols[i] = new LinkedMolStamp();
   }
 
 }
@@ -74,12 +137,12 @@ MoleculeStamp* MakeStamps::getMolecule( char* the_id )
   return key;
 }
 
-MoleculeStamp* MakeStamps::getMolecule( char* the_id ){
+LinkedMolStamp* MakeStamps::extractMolStamp( char* the_id ){
   int key;
   
   key = hash( the_id );
   if( my_mols[key] != NULL ){
-    return my_mols[key]->match( the_id );
+    return my_mols[key]->extract( the_id );
   }
   
   return NULL;
@@ -94,9 +157,9 @@ void MakeStamps::addMolStamp( MoleculeStamp* the_stamp
 
   linked_mol = new LinkedMolStamp;
   linked_mol->setStamp( the_stamp );
-  linked_mol->setNext( my_mols[key] );
 
-  my_mols[key] = linked_mol;
+  my_mols[key]->add( linked_mol );
+
 }
 
 
@@ -111,17 +174,17 @@ int MakeStamps::moleculeAssign( event* the_event ){
   switch( the_event->evt.asmt.asmt_type ){
     
   case STRING:
-    return current_mol->assignString( the_event->evt.asmt.lhs,
+    the_event->err_msg = current_mol->assignString( the_event->evt.asmt.lhs,
 				      the_event->evt.asmt.rhs.sval );
     break;
 
   case DOUBLE:
-    return current_mol->assignDouble( the_event->evt.asmt.lhs,
+    the_event->err_msg = current_mol->assignDouble( the_event->evt.asmt.lhs,
 				      the_event->evt.asmt.rhs.dval );
     break;
     
   case INT:
-    return current_mol->assignInt( the_event->evt.asmt.lhs,
+    the_event->err_msg = current_mol->assignInt( the_event->evt.asmt.lhs,
 				   the_event->evt.asmt.rhs.ival );
     break;
 
@@ -131,7 +194,8 @@ int MakeStamps::moleculeAssign( event* the_event ){
     return 0;
     break;
   }
-  return 0;
+  if( the_event->err_msg != NULL ) return 0;
+  return 1;
 }
 
 int MakeStamps::moleculeEnd( event* the_event ){
@@ -176,22 +240,25 @@ int MakeStamps::atomAssign( event* the_event ){
   switch( the_event->evt.asmt.asmt_type ){
     
   case STRING:
-    the_event->err_msg = current_atom->assignString( the_event->evt.asmt.lhs,
-						     the_event->evt.asmt.rhs.sval );
+    the_event->err_msg = 
+      current_atom->assignString( the_event->evt.asmt.lhs,
+				  the_event->evt.asmt.rhs.sval );
     if( the_event->err_msg != NULL ) return 0;
     return 1;
     break;
 
   case DOUBLE:
-    the_event->err_msg = current_atom->assignDouble( the_event->evt.asmt.lhs,
-						     the_event->evt.asmt.rhs.dval );
+    the_event->err_msg = 
+      current_atom->assignDouble( the_event->evt.asmt.lhs,
+				  the_event->evt.asmt.rhs.dval );
     if( the_event->err_msg != NULL ) return 0;
     return 1;    
     break;
 
   case INT:
-    the_event->err_msg = current_atom->assignInt( the_event->evt.asmt.lhs,
-						  the_event->evt.asmt.rhs.ival );
+    the_event->err_msg = 
+      current_atom->assignInt( the_event->evt.asmt.lhs,
+			       the_event->evt.asmt.rhs.ival );
     if( the_event->err_msg != NULL ) return 0;
     return 1;
     break;