[esmre commit] r39 - branches/groups/src

[codesite...@google.com]

Author: wharris
Date: Wed Oct 1 08:22:43 2008
New Revision: 39

Modified:
branches/groups/src/esmre.py

Log:
Refactor: merge conditionals.

Modified: branches/groups/src/esmre.py
==============================================================================
--- branches/groups/src/esmre.py (original)
+++ branches/groups/src/esmre.py Wed Oct 1 08:22:43 2008
@@ -88,21 +88,7 @@
self.to_append = ""
self.hints.append("")

- elif ch in "+.^$":
- if self.to_append:
- self.hints[-1] += self.to_append
-
- self.to_append = ""
- self.hints.append("")
-
- elif ch == "(":
- if self.to_append:
- self.hints[-1] += self.to_append
-
- self.to_append = ""
- self.hints.append("")
-
- elif ch == "[":
+ elif ch in "+.^$([\\":
if self.to_append:
self.hints[-1] += self.to_append

@@ -116,13 +102,6 @@
self.to_append = ""
self.hints.append("")

- elif ch == "\\":
- if self.to_append:
- self.hints[-1] += self.to_append
-
- self.to_append = ""
- self.hints.append("")
-
elif ch == "|":
self.hints = []

@@ -135,13 +114,7 @@

- if ch in "?*":
- return self
-
- elif ch in "+.^$":
- return self
-
- elif ch == "(":
+ if ch == "(":
return InGroupState(self)

elif ch == "[":