From 140e7ce90072d8631d8196537b1306ee6c6a9e6f Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 9 Jun 2013 19:31:08 -0400
Subject: [PATCH] PEP8 pytools.lex
---
pytools/lex.py | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/pytools/lex.py b/pytools/lex.py
index 2066c28..a1c0b43 100644
--- a/pytools/lex.py
+++ b/pytools/lex.py
@@ -1,5 +1,6 @@
import re
+
class RuleError:
def __init__(self, rule):
self.Rule = rule
@@ -7,6 +8,7 @@ class RuleError:
def __str__(self):
return repr(self.Rule)
+
class InvalidTokenError:
def __init__(self, s, str_index):
self.string = s
@@ -16,6 +18,7 @@ class InvalidTokenError:
return "at index %d: ...%s..." % \
(self.index, self.string[self.index:self.index+20])
+
class ParseError:
def __init__(self, msg, s, token):
self.message = msg
@@ -27,9 +30,8 @@ class ParseError:
return "%s at end of input" % self.message
else:
return "%s at index %d: ...%s..." % \
- (self.message, self.Token[2], self.string[self.Token[2]:self.Token[2]+20])
-
-
+ (self.message, self.Token[2],
+ self.string[self.Token[2]:self.Token[2]+20])
class RE:
@@ -41,8 +43,6 @@ class RE:
return "RE(%s)" % self.Content
-
-
def lex(lex_table, str, debug=False):
rule_dict = dict(lex_table)
@@ -74,7 +74,7 @@ def lex(lex_table, str, debug=False):
else:
return 0
else:
- raise RuleError, rule
+ raise RuleError(rule)
result = []
i = 0
@@ -88,12 +88,10 @@ def lex(lex_table, str, debug=False):
rule_matched = True
break
if not rule_matched:
- raise InvalidTokenError, (str, i)
+ raise InvalidTokenError(str, i)
return result
-
-
class LexIterator(object):
def __init__(self, lexed, raw_str, lex_index=0):
self.lexed = lexed
@@ -131,17 +129,19 @@ class LexIterator(object):
def raise_parse_error(self, msg):
if self.is_at_end():
- raise ParseError, (msg, self.raw_string, None)
+ raise ParseError(msg, self.raw_string, None)
else:
- raise ParseError, (msg, self.raw_string, self.lexed[self.index])
+ raise ParseError(msg, self.raw_string, self.lexed[self.index])
def expected(self, what_expected):
if self.is_at_end():
- self.raise_parse_error("%s expected, end of input found instead" % \
- what_expected)
+ self.raise_parse_error(
+ "%s expected, end of input found instead" %
+ what_expected)
else:
- self.raise_parse_error("%s expected, %s found instead" % \
- (what_expected, str(self.next_tag())))
+ self.raise_parse_error(
+ "%s expected, %s found instead" %
+ (what_expected, str(self.next_tag())))
def expect_not_end(self):
if self.is_at_end():
@@ -151,5 +151,3 @@ class LexIterator(object):
self.expect_not_end()
if not self.is_next(tag):
self.expected(str(tag))
-
-
--
GitLab