Cleanup and bump version
diff --git a/pytoml/parser.py b/pytoml/parser.py
index 88a7ffc..0b26ea5 100644
--- a/pytoml/parser.py
+++ b/pytoml/parser.py
@@ -6,35 +6,6 @@
else:
_chr = chr
-def _translate_datetime(s):
- match = _datetime_re.match(s)
-
- y = int(match.group(1))
- m = int(match.group(2))
- d = int(match.group(3))
- H = int(match.group(4))
- M = int(match.group(5))
- S = int(match.group(6))
-
- if match.group(7) is not None:
- micro = float(match.group(7))
- else:
- micro = 0
-
- if match.group(8) is not None:
- tzh = int(match.group(8))
- tzm = int(match.group(9))
- if tzh < 0:
- tzm = -tzm
- offs = tzh * 60 + tzm
- else:
- offs = 0
-
- dt = datetime.datetime(y, m, d, H, M, S, int(micro * 1000000),
- _TimeZone(datetime.timedelta(0, offs*60)))
-
- return dt
-
def load(fin, translate=lambda t, x, v: v):
return loads(fin.read(), translate=translate, filename=fin.name)
@@ -48,8 +19,11 @@
tables = {}
scope = root
- from parser2 import parse
- ast = parse(s, filename=filename)
+ src = _Source(s, filename=filename)
+ try:
+ ast = _p_toml(src)
+ except TomlError:
+ src.raise_latest()
def error(msg):
raise TomlError(msg, pos[0], pos[1], filename)
@@ -114,3 +88,290 @@
return scope
return merge_tables(root, tables)
+
+class _Source:
+ def __init__(self, s, filename=None):
+ self.s = s
+ self._pos = (1, 1)
+ self._last = None
+ self._filename = filename
+ self._latest_error = None
+ self.backtrack_stack = []
+
+ def raise_latest(self):
+ raise self._latest_error[0], self._latest_error[1], self._latest_error[2]
+
+ def last(self):
+ return self._last
+
+ def pos(self):
+ return self._pos
+
+ def fail(self):
+ return self._expect(None)
+
+ def consume_dot(self):
+ if self.s:
+ self._last = self.s[0]
+ self.s = self[1:]
+ self._advance(self._last)
+ return self._last
+ return None
+
+ def expect_dot(self):
+ return self._expect(self.consume_dot())
+
+ def consume_eof(self):
+ if not self.s:
+ self._last = ''
+ return True
+ return False
+
+ def expect_eof(self):
+ return self._expect(self.consume_eof())
+
+ def consume(self, s):
+ if self.s.startswith(s):
+ self.s = self.s[len(s):]
+ self._last = s
+ self._advance(s)
+ return True
+ return False
+
+ def expect(self, s):
+ return self._expect(self.consume(s))
+
+ def consume_re(self, re):
+ m = re.match(self.s)
+ if m:
+ self.s = self.s[len(m.group(0)):]
+ self._last = m
+ self._advance(m.group(0))
+ return m
+ return None
+
+ def expect_re(self, re):
+ return self._expect(self.consume_re(re))
+
+ def __enter__(self):
+ self.backtrack_stack.append((self.s, self._pos))
+
+ def __exit__(self, type, value, traceback):
+ if type is None:
+ self.backtrack_stack.pop()
+ else:
+ self.s, self._pos = self.backtrack_stack.pop()
+ if type == TomlError:
+ if self._latest_error is None or self._latest_error[1][1:3] < value.args[1:3]:
+ self._latest_error = (type, value, traceback)
+ return True
+ else:
+ return False
+
+ def commit(self):
+ self.backtrack_stack[-1] = (self.s, self._pos)
+
+ def _expect(self, r):
+ if not r:
+ raise TomlError('msg', self._pos[0], self._pos[1], self._filename)
+ return r
+
+ def _advance(self, s):
+ suffix_pos = s.rfind('\n')
+ if suffix_pos == -1:
+ self._pos = (self._pos[0], self._pos[1] + len(s))
+ else:
+ self._pos = (self._pos[0] + s.count('\n'), len(s) - suffix_pos)
+
+_ews_re = re.compile(r'(?:[ \t]|#[^\n]*\n|\n)*')
+def _p_ews(s):
+ s.expect_re(_ews_re)
+
+_ws_re = re.compile(r'[ \t]*')
+def _p_ws(s):
+ s.expect_re(_ws_re)
+
+_escapes = { 'b': '\b', 'n': '\n', 'r': '\r', 't': '\t', '"': '"', '\'': '\'',
+ '\\': '\\', '/': '/', 'f': '\f' }
+
+_basicstr_re = re.compile(ur'[^"\\\000-\037]*')
+_short_uni_re = re.compile(r'u([0-9a-fA-F]{4})')
+_long_uni_re = re.compile(r'U([0-9a-fA-F]{8})')
+_escapes_re = re.compile('[bnrt"\'\\\\/f]')
+_newline_esc_re = re.compile('\n[ \t\n]*')
+def _p_basicstr_content(s, content=_basicstr_re):
+ res = []
+ while True:
+ res.append(s.expect_re(content).group(0))
+ if not s.consume('\\'):
+ break
+ if s.consume_re(_newline_esc_re):
+ pass
+ elif s.consume_re(_short_uni_re) or s.consume_re(_long_uni_re):
+ res.append(unichr(int(s.last().group(1), 16)))
+ else:
+ s.expect_re(_escapes_re)
+ res.append(_escapes[s.last().group(0)])
+ return ''.join(res)
+
+_key_re = re.compile(r'[0-9a-zA-Z-_]+')
+def _p_key(s):
+ with s:
+ s.expect('"')
+ r = _p_basicstr_content(s, _basicstr_re)
+ s.expect('"')
+ return r
+ return s.expect_re(_key_re).group(0)
+
+_float_re = re.compile(r'[+-]?(?:0|[1-9](?:_?\d)*)(?:\.(?:_?\d)+)?(?:[eE][+-]?(?:0|[1-9](?:_?\d)*))?')
+_datetime_re = re.compile(r'(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d+)?(?:Z|([+-]\d{2}):(\d{2}))')
+
+_basicstr_ml_re = re.compile(ur'(?:(?:|"|"")[^"\\\000-\011\013-\037])*')
+_litstr_re = re.compile(ur"[^'\000-\037]*")
+_litstr_ml_re = re.compile(ur"(?:(?:|'|'')(?:[^'\000-\011\013-\037]))*")
+def _p_value(s):
+ pos = s.pos()
+
+ if s.consume('true'):
+ return 'bool', s.last(), True, pos
+ if s.consume('false'):
+ return 'bool', s.last(), False, pos
+
+ if s.consume('"'):
+ if s.consume('""'):
+ r = _p_basicstr_content(s, _basicstr_ml_re)
+ s.expect('"""')
+ else:
+ r = _p_basicstr_content(s, _basicstr_re)
+ s.expect('"')
+ return 'str', r, r, pos
+
+ if s.consume('\''):
+ if s.consume('\'\''):
+ r = s.expect_re(_litstr_ml_re).group(0)
+ s.expect('\'\'\'')
+ else:
+ r = s.expect_re(_litstr_re).group(0)
+ s.expect('\'')
+ return 'str', r, r, pos
+
+ if s.consume_re(_datetime_re):
+ m = s.last()
+ s0 = m.group(0)
+ r = map(int, m.groups()[:6])
+ if m.group(7):
+ micro = float(m.group(7))
+ else:
+ micro = 0
+
+ if m.group(8):
+ g = int(m.group(8), 10) * 60 + int(m.group(9), 10)
+ tz = _TimeZone(datetime.timedelta(0, g * 60))
+ else:
+ tz = _TimeZone(datetime.timedelta(0, 0))
+
+ y, m, d, H, M, S = r
+ dt = datetime.datetime(y, m, d, H, M, S, int(micro * 1000000), tz)
+ return 'datetime', s0, dt, pos
+
+ if s.consume_re(_float_re):
+ m = s.last().group(0)
+ if '.' in m or 'e' in m or 'E' in m:
+ return 'float', m, float(m), pos
+ else:
+ return 'int', m, int(m, 10), pos
+
+ if s.consume('['):
+ items = []
+ with s:
+ while True:
+ _p_ews(s)
+ items.append(_p_value(s))
+ s.commit()
+ _p_ews(s)
+ s.expect(',')
+ s.commit()
+ _p_ews(s)
+ s.expect(']')
+ return 'array', None, items, pos
+
+ if s.consume('{'):
+ _p_ws(s)
+ items = {}
+ if not s.consume('}'):
+ k = _p_key(s)
+ _p_ws(s)
+ s.expect('=')
+ _p_ws(s)
+ items[k] = _p_value(s)
+ _p_ws(s)
+ while s.consume(','):
+ _p_ws(s)
+ k = _p_key(s)
+ _p_ws(s)
+ s.expect('=')
+ _p_ws(s)
+ items[k] = _p_value(s)
+ _p_ws(s)
+ s.expect('}')
+ return 'table', None, items, pos
+
+ s.fail()
+
+def _p_stmt(s):
+ pos = s.pos()
+ if s.consume( '['):
+ is_array = s.consume('[')
+ _p_ws(s)
+ keys = [_p_key(s)]
+ _p_ws(s)
+ while s.consume('.'):
+ _p_ws(s)
+ keys.append(_p_key(s))
+ _p_ws(s)
+ s.expect(']')
+ if is_array:
+ s.expect(']')
+ return 'table_array' if is_array else 'table', keys, pos
+
+ key = _p_key(s)
+ _p_ws(s)
+ s.expect('=')
+ _p_ws(s)
+ value = _p_value(s)
+ return 'kv', (key, value), pos
+
+_stmtsep_re = re.compile(r'(?:[ \t]*(?:#[^\n]*)?\n)+[ \t]*')
+def _p_toml(s):
+ stmts = []
+ _p_ews(s)
+ with s:
+ stmts.append(_p_stmt(s))
+ while True:
+ s.commit()
+ s.expect_re(_stmtsep_re)
+ stmts.append(_p_stmt(s))
+ _p_ews(s)
+ s.expect_eof()
+ return stmts
+
+class _TimeZone(datetime.tzinfo):
+ def __init__(self, offset):
+ self._offset = offset
+
+ def utcoffset(self, dt):
+ return self._offset
+
+ def dst(self, dt):
+ return None
+
+ def tzname(self, dt):
+ m = self._offset.total_seconds() // 60
+ if m < 0:
+ res = '-'
+ m = -m
+ else:
+ res = '+'
+ h = m // 60
+ m = m - h * 60
+ return '{}{:.02}{:.02}'.format(res, h, m)
diff --git a/pytoml/parser2.py b/pytoml/parser2.py
deleted file mode 100644
index 34402af..0000000
--- a/pytoml/parser2.py
+++ /dev/null
@@ -1,292 +0,0 @@
-import re, datetime
-from .core import TomlError
-
-class _Source:
- def __init__(self, s, filename=None):
- self.s = s
- self._pos = (1, 1)
- self._last = None
- self._filename = filename
- self._latest_error = None
- self.backtrack_stack = []
-
- def last(self):
- return self._last
-
- def pos(self):
- return self._pos
-
- def fail(self):
- return self._expect(None)
-
- def consume_dot(self):
- if self.s:
- self._last = self.s[0]
- self.s = self[1:]
- self._advance(self._last)
- return self._last
- return None
-
- def expect_dot(self):
- return self._expect(self.consume_dot())
-
- def consume_eof(self):
- if not self.s:
- self._last = ''
- return True
- return False
-
- def expect_eof(self):
- return self._expect(self.consume_eof())
-
- def consume(self, s):
- if self.s.startswith(s):
- self.s = self.s[len(s):]
- self._last = s
- self._advance(s)
- return True
- return False
-
- def expect(self, s):
- return self._expect(self.consume(s))
-
- def consume_re(self, re):
- m = re.match(self.s)
- if m:
- self.s = self.s[len(m.group(0)):]
- self._last = m
- self._advance(m.group(0))
- return m
- return None
-
- def expect_re(self, re):
- return self._expect(self.consume_re(re))
-
- def __enter__(self):
- self.backtrack_stack.append((self.s, self._pos))
-
- def __exit__(self, type, value, traceback):
- if type is None:
- self.backtrack_stack.pop()
- else:
- self.s, self._pos = self.backtrack_stack.pop()
- if type == TomlError:
- if self._latest_error is None or self._latest_error[1][1:3] < value.args[1:3]:
- self._latest_error = (type, value, traceback)
- return True
- else:
- return False
-
- def commit(self):
- self.backtrack_stack[-1] = (self.s, self._pos)
-
- def _expect(self, r):
- if not r:
- raise TomlError('msg', self._pos[0], self._pos[1], self._filename)
- return r
-
- def _advance(self, s):
- suffix_pos = s.rfind('\n')
- if suffix_pos == -1:
- self._pos = (self._pos[0], self._pos[1] + len(s))
- else:
- self._pos = (self._pos[0] + s.count('\n'), len(s) - suffix_pos)
-
-_ews_re = re.compile(r'(?:[ \t]|#[^\n]*\n|\n)*')
-def _p_ews(s):
- s.expect_re(_ews_re)
-
-_ws_re = re.compile(r'[ \t]*')
-def _p_ws(s):
- s.expect_re(_ws_re)
-
-_escapes = { 'b': '\b', 'n': '\n', 'r': '\r', 't': '\t', '"': '"', '\'': '\'',
- '\\': '\\', '/': '/', 'f': '\f' }
-
-_basicstr_re = re.compile(ur'[^"\\\000-\037]*')
-_short_uni_re = re.compile(r'u([0-9a-fA-F]{4})')
-_long_uni_re = re.compile(r'U([0-9a-fA-F]{8})')
-_escapes_re = re.compile('[bnrt"\'\\\\/f]')
-_newline_esc_re = re.compile('\n[ \t\n]*')
-def _p_basicstr_content(s, content=_basicstr_re):
- res = []
- while True:
- res.append(s.expect_re(content).group(0))
- if not s.consume('\\'):
- break
- if s.consume_re(_newline_esc_re):
- pass
- elif s.consume_re(_short_uni_re) or s.consume_re(_long_uni_re):
- res.append(unichr(int(s.last().group(1), 16)))
- else:
- s.expect_re(_escapes_re)
- res.append(_escapes[s.last().group(0)])
- return ''.join(res)
-
-_key_re = re.compile(r'[0-9a-zA-Z-_]+')
-def _p_key(s):
- with s:
- s.expect('"')
- r = _p_basicstr_content(s, _basicstr_re)
- s.expect('"')
- return r
- return s.expect_re(_key_re).group(0)
-
-_float_re = re.compile(r'[+-]?(?:0|[1-9](?:_?\d)*)(?:\.(?:_?\d)+)?(?:[eE][+-]?(?:0|[1-9](?:_?\d)*))?')
-_datetime_re = re.compile(r'(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d+)?(?:Z|([+-]\d{2}):(\d{2}))')
-
-_basicstr_ml_re = re.compile(ur'(?:(?:|"|"")[^"\\\000-\011\013-\037])*')
-_litstr_re = re.compile(ur"[^'\000-\037]*")
-_litstr_ml_re = re.compile(ur"(?:(?:|'|'')(?:[^'\000-\011\013-\037]))*")
-def _p_value(s):
- pos = s.pos()
-
- if s.consume('true'):
- return 'bool', s.last(), True, pos
- if s.consume('false'):
- return 'bool', s.last(), False, pos
-
- if s.consume('"'):
- if s.consume('""'):
- r = _p_basicstr_content(s, _basicstr_ml_re)
- s.expect('"""')
- else:
- r = _p_basicstr_content(s, _basicstr_re)
- s.expect('"')
- return 'str', r, r, pos
-
- if s.consume('\''):
- if s.consume('\'\''):
- r = s.expect_re(_litstr_ml_re).group(0)
- s.expect('\'\'\'')
- else:
- r = s.expect_re(_litstr_re).group(0)
- s.expect('\'')
- return 'str', r, r, pos
-
- if s.consume_re(_datetime_re):
- m = s.last()
- s0 = m.group(0)
- r = map(int, m.groups()[:6])
- if m.group(7):
- micro = float(m.group(7))
- else:
- micro = 0
-
- if m.group(8):
- g = int(m.group(8), 10) * 60 + int(m.group(9), 10)
- tz = _TimeZone(datetime.timedelta(0, g * 60))
- else:
- tz = _TimeZone(datetime.timedelta(0, 0))
-
- y, m, d, H, M, S = r
- dt = datetime.datetime(y, m, d, H, M, S, int(micro * 1000000), tz)
- return 'datetime', s0, dt, pos
-
- if s.consume_re(_float_re):
- m = s.last().group(0)
- if '.' in m or 'e' in m or 'E' in m:
- return 'float', m, float(m), pos
- else:
- return 'int', m, int(m, 10), pos
-
- if s.consume('['):
- items = []
- with s:
- while True:
- _p_ews(s)
- items.append(_p_value(s))
- s.commit()
- _p_ews(s)
- s.expect(',')
- s.commit()
- _p_ews(s)
- s.expect(']')
- return 'array', None, items, pos
-
- if s.consume('{'):
- _p_ws(s)
- items = {}
- if not s.consume('}'):
- k = _p_key(s)
- _p_ws(s)
- s.expect('=')
- _p_ws(s)
- items[k] = _p_value(s)
- _p_ws(s)
- while s.consume(','):
- _p_ws(s)
- k = _p_key(s)
- _p_ws(s)
- s.expect('=')
- _p_ws(s)
- items[k] = _p_value(s)
- _p_ws(s)
- s.expect('}')
- return 'table', None, items, pos
-
- s.fail()
-
-def _p_stmt(s):
- pos = s.pos()
- if s.consume( '['):
- is_array = s.consume('[')
- _p_ws(s)
- keys = [_p_key(s)]
- _p_ws(s)
- while s.consume('.'):
- _p_ws(s)
- keys.append(_p_key(s))
- _p_ws(s)
- s.expect(']')
- if is_array:
- s.expect(']')
- return 'table_array' if is_array else 'table', keys, pos
-
- key = _p_key(s)
- _p_ws(s)
- s.expect('=')
- _p_ws(s)
- value = _p_value(s)
- return 'kv', (key, value), pos
-
-_stmtsep_re = re.compile(r'(?:[ \t]*(?:#[^\n]*)?\n)+[ \t]*')
-def _p_toml(s):
- stmts = []
- _p_ews(s)
- with s:
- stmts.append(_p_stmt(s))
- while True:
- s.commit()
- s.expect_re(_stmtsep_re)
- stmts.append(_p_stmt(s))
- _p_ews(s)
- s.expect_eof()
- return stmts
-
-def parse(s, filename=None):
- src = _Source(s, filename=filename)
- with src:
- return _p_toml(src)
- raise src._latest_error[0], src._latest_error[1], src._latest_error[2]
-
-class _TimeZone(datetime.tzinfo):
- def __init__(self, offset):
- self._offset = offset
-
- def utcoffset(self, dt):
- return self._offset
-
- def dst(self, dt):
- return None
-
- def tzname(self, dt):
- m = self._offset.total_seconds() // 60
- if m < 0:
- res = '-'
- m = -m
- else:
- res = '+'
- h = m // 60
- m = m - h * 60
- return '{}{:.02}{:.02}'.format(res, h, m)
diff --git a/setup.py b/setup.py
index f755ef9..90775b9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
setup(
name='pytoml',
- version='0.1.2',
+ version='0.1.3',
description='A parser for TOML-0.4.0',
author='Martin Vejnár',
