--- trunk/src/selection/SelectionEvaluator.cpp 2005/03/09 17:30:29 413 +++ trunk/src/selection/SelectionEvaluator.cpp 2005/03/10 16:14:07 418 @@ -86,9 +86,6 @@ void SelectionEvaluator::clearState() { } void SelectionEvaluator::clearState() { - //for (int i = scriptLevelMax; --i >= 0; ) - // stack[i].clear(); - //scriptLevel = 0; error = false; errorMessage = ""; } @@ -230,7 +227,6 @@ BitSet SelectionEvaluator::comparatorInstruction(const compareProperty(atom, bs, property, comparator, comparisonValue); } - //change the positions of atoms which belong to the rigidbodies for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) { compareProperty(rb, bs, property, comparator, comparisonValue); } @@ -403,7 +399,7 @@ BitSet SelectionEvaluator::indexInstruction(const boos if (index < 0 || index >= bs.size()) { invalidIndex(index); } else { - indexFinder.find(index); + bs = indexFinder.find(index); } } else if (value.type() == typeid(std::pair)) { std::pair indexRange= boost::any_cast >(value); @@ -411,7 +407,7 @@ BitSet SelectionEvaluator::indexInstruction(const boos if (indexRange.first < 0 || indexRange.second >= bs.size()) { invalidIndexRange(indexRange); }else { - indexFinder.find(indexRange.first, indexRange.second); + bs = indexFinder.find(indexRange.first, indexRange.second); } }