ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/selection/SelectionCompiler.cpp
(Generate patch)

Comparing trunk/src/selection/SelectionCompiler.cpp (file contents):
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC vs.
Revision 1931 by gezelter, Mon Aug 19 19:20:32 2013 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "selection/SelectionCompiler.hpp"
# Line 118 | Line 119 | namespace OpenMD {
119          //    ltoken.push_back(Token(Token::string, str));
120          //    continue;
121          //}
122 <        if (lookingAtDecimal((tokCommand & Token::negnums) != 0)) {
122 >        //if (lookingAtDecimal((tokCommand & Token::negnums) != 0)) {
123 >        if (lookingAtDecimal((tokCommand) != 0)) {
124            float value = lexi_cast<float>(script.substr(ichToken, cchToken));        
125            ltoken.push_back(Token(Token::decimal, boost::any(value)));
126            continue;
127          }
128 <        if (lookingAtInteger((tokCommand & Token::negnums) != 0)) {
128 >        //if (lookingAtInteger((tokCommand & Token::negnums) != 0)) {
129 >        if (lookingAtInteger((tokCommand) != 0)) {
130  
131            int val = lexi_cast<int>(script.substr(ichToken, cchToken));
132            ltoken.push_back(Token(Token::integer,   boost::any(val)));
# Line 176 | Line 179 | namespace OpenMD {
179          continue;
180        }
181  
182 <      if (ltoken.size() == 0) {
182 >      if (ltoken.empty()) {
183          return commandExpected();
184        }
185          
# Line 440 | Line 443 | namespace OpenMD {
443  
444    bool SelectionCompiler::compileExpression() {
445      /** todo */
446 <    int i = 1;
446 >    unsigned int i = 1;
447      int tokCommand = atokenCommand[0].tok;
448      if (tokCommand == Token::define) {
449        i = 2;
# Line 572 | Line 575 | namespace OpenMD {
575        // fall into the code and below and just add the token
576      case Token::all:
577      case Token::none:
578 +    case Token::hull:
579        return addTokenToPostfix(tokenNext());
580      case Token::leftparen:
581        tokenNext();
# Line 664 | Line 668 | namespace OpenMD {
668    bool SelectionCompiler::isNameValid(const std::string& name) {
669      int nbracket = 0;
670      int ndot = 0;
671 <    for (int i =0 ; i < name.size(); ++i) {
671 >    for (unsigned int i = 0 ; i < name.size(); ++i) {
672        switch(name[i]) {
673  
674        case '[' :

Diff Legend

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