1.1 --- a/parser.h	Mon Apr 09 15:42:21 2007 +0000
     1.2 +++ b/parser.h	Thu May 17 20:19:03 2007 +0000
     1.3 @@ -10,9 +10,10 @@
     1.4  {
     1.5  public:
     1.6  	Parser();
     1.7 -	void parseAtom (const QString &input);
     1.8 -	QString command();
     1.9 -	QStringList parameters();
    1.10 +	void parseAtom (QString input);
    1.11 +	QString getAtom();
    1.12 +	QString getCommand();
    1.13 +	QStringList getParameters();
    1.14  	int paramCount();
    1.15  	QString errorMessage();
    1.16  	QString errorDescription();
    1.17 @@ -30,15 +31,18 @@
    1.18  	void setScript (const QString &);
    1.19  	QString getScript();
    1.20  	void runScript();
    1.21 -	bool scriptNextAtom();
    1.22 +	bool next();
    1.23  
    1.24  
    1.25  private:
    1.26 -	void initCommand();
    1.27 +	void initParser();
    1.28 +	void initAtom();
    1.29  
    1.30  	QString input;
    1.31 +	QString atom;
    1.32  	QString com;
    1.33  	QStringList paramList;
    1.34 +	int current;
    1.35  	QString script;
    1.36  
    1.37  	QString errMessage;