Changeset 152:989709474b5a

Timestamp:

08/05/10 09:46:22 (21 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Lexer cleanup done. All tests passing.

Location:

imapclient

Files:

• response_lexer.py (modified) (5 diffs)
• response_parser.py (modified) (2 diffs)

imapclient/response_lexer.py

@@ -1 @@
-"""A lexical analyzer class for IMAP responses."""
+"""
+A lexical analyzer class for IMAP responses.
+
+Although Lexer does all the work, TokenSource is probably the class to
+use for external callers.
+"""
 
 # This was heavily inspired by (ie, ripped off from) python 2.6's shlex
@@ -9 +14 @@
 
 
+class TokenSource(object):
+    """
+    A simple iterator for the Lexer class that also provides access to
+    the current IMAP literal.
+    """
+
+    def __init__(self, text):
+        lex = Lexer()
+        lex.sources = (LiteralHandlingIter(lex, chunk) for chunk in text)
+        self.lex = lex
+        self.src = iter(lex)
+
+    @property
+    def current_literal(self):
+        return self.lex.current_source.literal
+
+    def __iter__(self):
+        return self.src
+    
+
 class Lexer(object):
     "A lexical analyzer class for IMAP"
@@ -17 +42 @@
     NON_SPECIALS = [ch for ch in ALL_CHARS if ch not in SPECIALS]
 
-    def __init__(self, sources):
+    def __init__(self):
         self.wordchars = set(self.NON_SPECIALS)
         self.whitespace = set((' \t\r\n'))
-        self.sources = (LiteralHandlingIter(self, chunk) for chunk in sources)
+        self.sources = None
         self.current_source = None
 
@@ -106 +131 @@
                 yield tok
 
-    @classmethod
-    def create_token_source(cls, text):
-        lex = cls(text)
-        return TokenIterator(lex)
-
-
-class TokenIterator(object):
-
-    def __init__(self, lex):
-        self.lex = lex
-        self.src = iter(lex)
-
-    @property
-    def current_literal(self):
-        return self.lex.current_source.literal
-
-    def __iter__(self):
-        return self.src
-    
 
 # imaplib has poor handling of 'literals' - it both fails to remove the
@@ -146 +152 @@
             src_text, self.literal = resp_record
             assert src_text.endswith("}"), src_text
-            self.src_text = self.literal
+            self.src_text = src_text
         else:
             # just a line with no literals.

imapclient/response_parser.py

@@ -11 +11 @@
 from datetime import datetime
 from fixed_offset import FixedOffset
-from response_lexer import Lexer
+from response_lexer import TokenSource
 
 
@@ -32 +32 @@
     if not text:
         return
-    src = Lexer.create_token_source(text)
+    src = TokenSource(text)
     
     token = None