[ViewVC] Diff of: OpenMD/trunk/src/selection/SelectionCompiler.cpp

Comparing trunk/src/selection/SelectionCompiler.cpp (file contents):
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 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).
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		*/
#	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)));
#	Line 177 \| Line 179 \| namespace OpenMD {
179		continue;
180		}
181
182	<	if (ltoken.size() == 0) {
182	>	if (ltoken.empty()) {
183		return commandExpected();
184		}
185

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