ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/selection/SelectionEvaluator.hpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/selection/SelectionEvaluator.hpp (file contents):
Revision 1972 by tim, Fri Feb 4 22:39:26 2005 UTC vs.
Revision 1979 by tim, Mon Feb 7 19:13:18 2005 UTC

# Line 50 | Line 50
50   #include "selection/Token.hpp"
51   #include "selection/SelectionCompiler.hpp"
52   #include "selection/NameFinder.hpp"
53 + #include "selection/DistanceFinder.hpp"
54   #include "utils/BitSet.hpp"
55   #include "primitives/StuntDouble.hpp"
56 + #include "utils/StringUtils.hpp"
57   namespace oopse {
58  
59  
# Line 142 | Line 144 | class SelectionEvaluator{
144          BitSet comparatorInstruction(const Token& instruction);
145          void compareProperty(StuntDouble* sd, BitSet& bs, int property, int comparator, float comparisonValue);
146          BitSet nameInstruction(const std::string& name);
147 <
147 >        BitSet indexInstruction(const boost::any& value);
148          BitSet expression(const std::vector<Token>& tokens, int pc);
149  
150          BitSet lookupValue(const std::string& variable);
# Line 167 | Line 169 | class SelectionEvaluator{
169              evalError("unrecognized identifier:" + identifier);
170          }    
171  
172 +        void invalidIndexRange(std::pair<int, int> range) {
173 +            evalError("invalid index range: [" + toString(range.first) + ", " + toString(range.second) + ")");
174 +        }
175 +
176 +        void invalidIndex(int index) {
177 +            evalError("invalid index : " + toString(index) );
178 +        }
179 +
180 +        
181          bool containDynamicToken(const std::vector<Token>& tokens);
182          
183          SelectionCompiler compiler;
# Line 190 | Line 201 | class SelectionEvaluator{
201          int statementLength;
202  
203          SimInfo* info;
204 <        NameFinder finder;
204 >        NameFinder nameFinder;
205 >        DistanceFinder distanceFinder;
206          int nStuntDouble;   //natoms + nrigidbodies
207          std::map<std::string, boost::any > variables;
208  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines