| 45 |  | #include <map> | 
| 46 |  | #include <string> | 
| 47 |  | #include <vector> | 
| 48 | + | #include <fstream> | 
| 49 |  |  | 
| 50 |  | #include "brains/SimInfo.hpp" | 
| 51 |  | #include "selection/Token.hpp" | 
| 52 |  | #include "selection/SelectionCompiler.hpp" | 
| 53 |  | #include "selection/NameFinder.hpp" | 
| 54 | + | #include "selection/DistanceFinder.hpp" | 
| 55 | + | #include "selection/IndexFinder.hpp" | 
| 56 |  | #include "utils/BitSet.hpp" | 
| 57 |  | #include "primitives/StuntDouble.hpp" | 
| 58 | + | #include "utils/StringUtils.hpp" | 
| 59 |  | namespace oopse { | 
| 60 |  |  | 
| 61 |  |  | 
| 58 | – | //class Context { | 
| 59 | – | //    public: | 
| 60 | – | // | 
| 61 | – | //        void clear() { | 
| 62 | – | //            linenumbers.clear(); | 
| 63 | – | //            lineIndices.clear(); | 
| 64 | – | //            aatoken.clear(); | 
| 65 | – | //        } | 
| 66 | – | // | 
| 67 | – | //        std::string filename; | 
| 68 | – | //        std::string script; | 
| 69 | – | //        std::vector<int> linenumbers; | 
| 70 | – | //        std::vector<int> lineIndices; | 
| 71 | – | //        std::vector<std::vector<Token> > aatoken; | 
| 72 | – | //        int pc; | 
| 73 | – | //}; | 
| 74 | – |  | 
| 75 | – |  | 
| 62 |  | /** | 
| 63 |  | * @class SelectionEvaluator SelectionEvaluator.hpp "selection/SelectionEvaluator" | 
| 64 |  | * @brief Evalute the tokens compiled by SelectionCompiler and return a BitSet | 
| 74 |  |  | 
| 75 |  | BitSet evaluate(); | 
| 76 |  |  | 
| 91 | – | //BitSet evaluate(Snapshot* snapshot); | 
| 92 | – |  | 
| 77 |  | /** | 
| 78 |  | * Tests if the result from evaluation of script is dynamic. | 
| 79 |  | */ | 
| 126 |  | BitSet comparatorInstruction(const Token& instruction); | 
| 127 |  | void compareProperty(StuntDouble* sd, BitSet& bs, int property, int comparator, float comparisonValue); | 
| 128 |  | BitSet nameInstruction(const std::string& name); | 
| 129 | < |  | 
| 129 | > | BitSet indexInstruction(const boost::any& value); | 
| 130 |  | BitSet expression(const std::vector<Token>& tokens, int pc); | 
| 131 |  |  | 
| 132 |  | BitSet lookupValue(const std::string& variable); | 
| 151 |  | evalError("unrecognized identifier:" + identifier); | 
| 152 |  | } | 
| 153 |  |  | 
| 154 | + | void invalidIndexRange(std::pair<int, int> range) { | 
| 155 | + | evalError("invalid index range: [" + toString(range.first) + ", " + toString(range.second) + ")"); | 
| 156 | + | } | 
| 157 | + |  | 
| 158 | + | void invalidIndex(int index) { | 
| 159 | + | evalError("invalid index : " + toString(index) ); | 
| 160 | + | } | 
| 161 | + |  | 
| 162 | + |  | 
| 163 |  | bool containDynamicToken(const std::vector<Token>& tokens); | 
| 164 | + |  | 
| 165 | + | double getCharge(Atom* atom); | 
| 166 |  |  | 
| 167 |  | SelectionCompiler compiler; | 
| 168 |  |  | 
| 185 |  | int statementLength; | 
| 186 |  |  | 
| 187 |  | SimInfo* info; | 
| 188 | < | NameFinder finder; | 
| 188 | > | NameFinder nameFinder; | 
| 189 | > | DistanceFinder distanceFinder; | 
| 190 | > | IndexFinder indexFinder; | 
| 191 |  | int nStuntDouble;   //natoms + nrigidbodies | 
| 195 | – | std::map<std::string, boost::any > variables; | 
| 192 |  |  | 
| 193 | + | typedef std::map<std::string, boost::any > VariablesType; | 
| 194 | + | VariablesType variables; | 
| 195 | + |  | 
| 196 |  | bool isDynamic_; | 
| 197 |  | bool isLoaded_; | 
| 198 |  |  |