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

Comparing trunk/src/selection/SelectionCompiler.hpp (file contents):
Revision 283 by tim, Thu Feb 3 23:14:05 2005 UTC vs.
Revision 452 by tim, Tue Apr 5 23:09:48 2005 UTC

# Line 106 | Line 106 | class SelectionCompiler{
106                  strError += filename;
107              }
108  
109 –            strError += " line#" + lineCurrent;
109              return strError;
110          }
111  
# Line 117 | Line 116 | class SelectionCompiler{
116  
117  
118          bool lookingAtLeadingWhitespace();
119 <        bool lookingAtComment();
119 >        //bool lookingAtComment();
120          bool lookingAtEndOfLine();
121          bool lookingAtEndOfStatement();
122          bool lookingAtString();
# Line 140 | Line 139 | class SelectionCompiler{
139          bool clauseWithin();
140          bool clauseComparator();
141          bool clauseChemObjName();        
142 <        bool clauseName(std::string& name);
144 <
142 >        bool clauseIndex();
143          Token tokenNext();
144          boost::any valuePeek();
145          int tokPeek();
146  
147          bool addTokenToPostfix(const Token& token);
148 +        bool isNameValid(const std::string& name);
149  
151 –
150          bool compileError(const std::string& errorMessage) {
151              std::cerr << "SelectionCompiler Error: " << errorMessage << std::endl;
152              error = true;
# Line 205 | Line 203 | class SelectionCompiler{
203              return compileError("comparison operator expected");
204          }
205  
206 <        bool integerExpected() {
207 <            return compileError("integer expected");
206 >        bool numberExpected() {
207 >            return compileError("number expected");
208          }        
209          
210          bool numberOrKeywordExpected() {

Diff Legend

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