fix 320334 make non-overridden methods non-virtual, patch by engel@physics.harvard.edu, r/sr=bienvenu

mailnews/imap/src/nsIMAPGenericParser.cpp

@@ -53,8 +53,7 @@ fLineOfTokens(nsnull),
 fStartOfLineOfTokens(nsnull),
 fCurrentTokenPlaceHolder(nsnull),
 fAtEndOfLine(PR_FALSE),
-fSyntaxError(PR_FALSE),
-fDisconnected(PR_FALSE)
+fParserState(stateOK)
 {
 }
 
@@ -80,33 +79,24 @@ void nsIMAPGenericParser::ResetLexAnalyzer()
 
 PRBool nsIMAPGenericParser::LastCommandSuccessful()
 {
-	return Connected() && !SyntaxError();
+  return fParserState == stateOK;
 }
 
 void nsIMAPGenericParser::SetSyntaxError(PRBool error)
 {
-  fSyntaxError = error;
+  if (error)
+      fParserState |= stateSyntaxErrorFlag;
+  else
+      fParserState &= ~stateSyntaxErrorFlag;
   NS_ASSERTION(!error, "syntax error in generic parser");	
 }
 
-PRBool nsIMAPGenericParser::SyntaxError()
-{
-  return fSyntaxError;
-}
-
 void nsIMAPGenericParser::SetConnected(PRBool connected)
 {
-  fDisconnected = !connected;
-}
-
-PRBool nsIMAPGenericParser::Connected()
-{
-  return !fDisconnected;
-}
-
-PRBool nsIMAPGenericParser::ContinueParse()
-{
-  return !fSyntaxError && !fDisconnected;
+  if (connected)
+      fParserState &= ~stateDisconnectedFlag;
+  else
+      fParserState |= stateDisconnectedFlag;
 }
 
 void nsIMAPGenericParser::skip_to_CRLF()

mailnews/imap/src/nsIMAPGenericParser.h

@@ -54,17 +54,13 @@ public:
 	nsIMAPGenericParser();
 	virtual ~nsIMAPGenericParser();
 
-  // Connected() && !SyntaxError()
-	// Add any specific stuff in the derived class
+  // Add any specific stuff in the derived class
   virtual PRBool     LastCommandSuccessful();
-    
-  PRBool     SyntaxError();
-  virtual PRBool     ContinueParse();
-    
-  // if we get disconnected, end the current url processing and report to the
-  // the user.
-  PRBool			    Connected();
-  virtual void        SetConnected(PRBool error);
+
+  PRBool SyntaxError() { return (fParserState & stateSyntaxErrorFlag) != 0; }
+  PRBool ContinueParse() { return fParserState == stateOK; }
+  PRBool Connected() { return !(fParserState & stateDisconnectedFlag); }
+  void SetConnected(PRBool error);
     
 protected:
 
@@ -77,20 +73,20 @@ protected:
 	virtual PRBool	GetNextLineForParser(char **nextLine) = 0;	
 
   virtual void	HandleMemoryFailure();
-  virtual void    skip_to_CRLF();
-  virtual void    skip_to_close_paren();
-	virtual char	*CreateString();
-	virtual char	*CreateAstring();
-	virtual char	*CreateNilString();
-  virtual char    *CreateLiteral();
-	virtual char	*CreateAtom();
-  virtual char    *CreateQuoted(PRBool skipToEnd = PR_TRUE);
-	virtual char	*CreateParenGroup();
+  void skip_to_CRLF();
+  void skip_to_close_paren();
+  char *CreateString();
+  char *CreateAstring();
+  char *CreateNilString();
+  char *CreateLiteral();
+  char *CreateAtom();
+  char *CreateQuoted(PRBool skipToEnd = PR_TRUE);
+  char *CreateParenGroup();
   virtual void        SetSyntaxError(PRBool error);
 
   void AdvanceToNextToken();
   void AdvanceToNextLine();
-	void AdvanceTokenizerStartingPoint (int32 bytesToAdvance);
+  void AdvanceTokenizerStartingPoint(int32 bytesToAdvance);
   void ResetLexAnalyzer();
 
 protected:
@@ -101,11 +97,12 @@ protected:
   char           *fStartOfLineOfTokens;
   char           *fCurrentTokenPlaceHolder;
   PRBool          fAtEndOfLine;
-  PRBool          fSyntaxError;
+
 private:
-  PRBool          fDisconnected;
-
-
+  enum nsIMAPGenericParserState { stateOK = 0,
+                                  stateSyntaxErrorFlag = 0x1,
+                                  stateDisconnectedFlag = 0x2 };
+  PRUint32 fParserState;
 };
 
 #endif

mailnews/imap/src/nsIMAPNamespace.cpp

@@ -40,7 +40,6 @@
 #include "nsImapCore.h"
 #include "nsIMAPNamespace.h"
 #include "nsImapProtocol.h"
-#include "nsIMAPGenericParser.h"
 #include "nsMsgImapCID.h"
 #include "nsImapUrl.h"
 #include "nsString.h"

mailnews/imap/src/nsImapUrl.cpp

@@ -45,7 +45,6 @@
 #include "nsImapUrl.h"
 #include "nsIMsgMailSession.h"
 #include "nsIIMAPHostSessionList.h"
-#include "nsIMAPGenericParser.h"
 #include "nsString.h"
 #include "prmem.h"
 #include "plstr.h"