ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/selection/SelectionCompiler.cpp

Comparing trunk/src/selection/SelectionCompiler.cpp (file contents):
Revision 1364 by cli2, Wed Oct 7 20:49:50 2009 UTC vs.
Revision 1953 by gezelter, Thu Dec 5 18:19:26 2013 UTC

#	Line 6 | Line 6
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
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, 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"
44		#include "utils/StringUtils.hpp"
45	<	namespace oopse {
45	>	namespace OpenMD {
46
47		bool SelectionCompiler::compile(const std::string& filename,
48		const std::string& script) {
#	Line 55 | Line 56 | namespace oopse {
56		if (internalCompile()) {
57		return true;
58		}
59	<
59	>
60		int icharEnd;
61		if ((icharEnd = script.find('\r', ichCurrentCommand)) == std::string::npos &&
62		(icharEnd = script.find('\n', ichCurrentCommand)) == std::string::npos) {
#	Line 118 | Line 119 | namespace oopse {
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 oopse {
179		continue;
180		}
181
182	<	if (ltoken.size() == 0) {
182	>	if (ltoken.empty()) {
183		return commandExpected();
184		}
185
#	Line 371 | Line 374 | namespace oopse {
374		return false;
375		}
376		cchToken = ichT - ichToken;
377	<	return true;
377	>	return isInteger(script.substr(ichToken, ichT).c_str());
378		}
379
380		bool SelectionCompiler::lookingAtLookupToken() {
#	Line 440 | Line 443 | namespace oopse {
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 oopse {
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 oopse {
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 '[' :
#	Line 688 | Line 692 | namespace oopse {
692		if (token.tok == Token::integer) {
693		int index = boost::any_cast<int>(token.value);
694		int tok = tokPeek();
691	–	std::cout << "Token::to is " << Token::to << ", tok = " << tok << std::endl;
695		if (tok == Token::to) {
696		tokenNext();
697		tok = tokPeek();

Comparing trunk/src/selection/SelectionCompiler.cpp (property svn:keywords):
Revision 1364 by cli2, Wed Oct 7 20:49:50 2009 UTC vs.
Revision 1953 by gezelter, Thu Dec 5 18:19:26 2013 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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