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 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 1931 by gezelter, Mon Aug 19 19:20:32 2013 UTC

# Line 119 | 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)));

Diff Legend

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