offlineimap rev 498

You are receiving this message because
all commits get sent to this address.

Author: jgoerzen
Date: 2003-07-16 14:33:05 -0500 (Wed, 16 Jul 2003)
New Revision: 498

Modified:
  imaplib/head/imap2/parser/imap.g
  imaplib/head/imap2/parser/imap.py

Log:
Fixed some things based on tests.


Diff:
Modified: imaplib/head/imap2/parser/imap.g
==============================================================================
--- imaplib/head/imap2/parser/imap.g	2003-07-16 19:11:53 UTC (rev 497)
+++ imaplib/head/imap2/parser/imap.g	2003-07-16 19:33:05 UTC (rev 498)
@@ -86,9 +86,9 @@
 
     # ENTRY POINT
 
-    rule goal: response END
+    rule goal: response END {{ return response }}
+    rule goal_connect: response_data END {{ return response_data }}
 
-
     # Rules
 
     rule address: LPAREN addr_name SP addr_adl SP addr_mailbox SP addr_host 
@@ -393,8 +393,8 @@
 
     rule nil: r'(?i)NIL' {{ return None }}
     rule nstring: (string {{ v = string}} | nil {{ v = nil }} ) {{ return  v }}
-    rule number: number_tok {{ return int(number_tok) }}
-    rule nz_number: nz_number_tok {{ return int(nz_number_tok) }}
+    rule number: number_tok {{ return long(number_tok) }}
+    rule nz_number: nz_number_tok {{ return long(nz_number_tok) }}
     
     ##############################
     # P
@@ -423,7 +423,7 @@
        | response_data {{ v.append(response_data) }} )*
       response_done {{ return [response_done] + v }}
     rule response_data: ASTERISK SP (
-        resp_cond_state {{ v = resp_cond_date }}
+        resp_cond_state {{ v = resp_cond_state }}
         | resp_cond_bye {{ v = resp_cond_bye}}
         | mailbox_data {{ v = mailbox_data }}
         | message_data {{ v = message_data }}

Modified: imaplib/head/imap2/parser/imap.py
==============================================================================
--- imaplib/head/imap2/parser/imap.py	2003-07-16 19:11:53 UTC (rev 497)
+++ imaplib/head/imap2/parser/imap.py	2003-07-16 19:33:05 UTC (rev 498)
@@ -1,5 +1,5 @@
 # Implementation of grammar from RFC3501
-# $Id: imap.g 495 2003-07-16 18:58:20Z jgoerzen $
+# $Id: imap.g 496 2003-07-16 19:11:53Z jgoerzen $
 
 # COPYRIGHT #
 # Copyright (C) 2002 John Goerzen
@@ -125,7 +125,13 @@
     def goal(self):
         response = self.response()
         END = self._scan('END')
+        return response
 
+    def goal_connect(self):
+        response_data = self.response_data()
+        END = self._scan('END')
+        return response_data
+
     def address(self):
         LPAREN = self._scan('LPAREN')
         addr_name = self.addr_name()
@@ -957,11 +963,11 @@
 
     def number(self):
         number_tok = self._scan('number_tok')
-        return int(number_tok)
+        return long(number_tok)
 
     def nz_number(self):
         nz_number_tok = self._scan('nz_number_tok')
-        return int(nz_number_tok)
+        return long(nz_number_tok)
 
     def password(self):
         astring = self.astring()
@@ -1005,7 +1011,7 @@
         _token_ = self._peek('"(?i)FLAGS"', '"(?i)(LIST|LSUB)"', '"(?i)SEARCH"', '"(?i)STATUS"', '"(?i)CAPABILITY"', 'resp_cond_state_tok', "r'(?i)BYE'", 'number_tok', 'nz_number_tok')
         if _token_ == 'resp_cond_state_tok':
             resp_cond_state = self.resp_cond_state()
-            v = resp_cond_date
+            v = resp_cond_state
         elif _token_ == "r'(?i)BYE'":
             resp_cond_bye = self.resp_cond_bye()
             v = resp_cond_bye