Skip to content

GitLab

Commit aa2c5763 authored by di68kap's avatar di68kap
Browse files
Options

- parsers.py implemented __repr__ for parsers

parent 95b06fd4
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 35 deletions
DHParser/parsers.py
View file @ aa2c5763
......@@ -58,14 +58,14 @@ try:
except ImportError:
import re
try:
from typing import Any, Callable, Collection, Dict, Iterator, List, Set, Tuple, Union
from typing import Any, Callable, Collection, cast, Dict, Iterator, List, Set, Tuple, Union
except ImportError:
from .typing34 import Any, Callable, Dict, Iterator, List, Set, Tuple, Union
from .typing34 import Any, Callable, cast, Dict, Iterator, List, Set, Tuple, Union
from DHParser.toolkit import is_logging, log_dir, logfile_basename, escape_re, sane_parser_name
from DHParser.syntaxtree import WHITESPACE_PTYPE, TOKEN_PTYPE, ZOMBIE_PARSER, ParserBase, \
Node, TransformationFunc
from DHParser.toolkit import load_if_file, error_messages
from DHParser.toolkit import repr_call, load_if_file, error_messages
__all__ = ['ScannerFunc',
'HistoryRecord',
......@@ -95,6 +95,9 @@ __all__ = ['ScannerFunc',
'NegativeLookahead',
'Lookbehind',
'NegativeLookbehind',
'last_value',
'counterpart',
'accumulate',
'Capture',
'Retrieve',
'Pop',
......@@ -253,9 +256,6 @@ class Parser(ParserBase, metaclass=ParserMetaClass):
def __call__(self, text: str) -> Tuple[Node, str]:
return None, text # default behaviour: don't match
def __str__(self):
return self.name or self.ptype
def __add__(self, other):
return Series(self, other)
......@@ -622,6 +622,9 @@ class RegExp(Parser):
return Node(self, text[:end]), text[end:]
return None, text
def __repr__(self):
return repr_call(self.__init__, (self.regexp, self.name))
def __str__(self):
return self.name or self.ptype + ' /%s/' % self.regexp.pattern
......@@ -685,6 +688,9 @@ class RE(Parser):
return Node(self, result), t
return None, text
def __repr__(self):
return repr_call(self.__init__, (self.regexp, self.wL, self.wR, self.name))
def __str__(self):
if self.ptype == TOKEN_PTYPE:
return 'Token "%s"' % self.main.regexp.pattern.replace('\\', '')
......@@ -727,6 +733,9 @@ class Token(RE):
def __deepcopy__(self, memo={}):
return self.__class__(self.token, self.wL, self.wR, self.name)
def __repr__(self):
return repr_call(self.__init__, (self.token, self.wL, self.wR, self.name))
def mixin_comment(whitespace: str, comment: str) -> str:
"""Returns a regular expression that merges comment and whitespace
......@@ -758,6 +767,9 @@ class UnaryOperator(Parser):
parser = copy.deepcopy(self.parser, memo)
return self.__class__(parser, self.name)
def __repr__(self):
return repr_call(self.__init__, (self.parser, self.name))
def apply(self, func: Parser.ApplyFunc):
if super(UnaryOperator, self).apply(func):
self.parser.apply(func)
......@@ -767,12 +779,15 @@ class NaryOperator(Parser):
def __init__(self, *parsers: Parser, name: str = '') -> None:
super(NaryOperator, self).__init__(name)
# assert all([isinstance(parser, Parser) for parser in parsers]), str(parsers)
self.parsers = parsers # type: Collection
self.parsers = parsers # type: Tuple[Parser, ...]
def __deepcopy__(self, memo):
parsers = copy.deepcopy(self.parsers, memo)
return self.__class__(*parsers, name=self.name)
def __repr__(self):
return repr_call(self.__init__, (*self.parsers, self.name))
def apply(self, func: Parser.ApplyFunc):
if super(NaryOperator, self).apply(func):
for parser in self.parsers:
......@@ -872,18 +887,18 @@ class Series(NaryOperator):
assert len(results) <= len(self.parsers)
return Node(self, results), text_
def __add__(self, other: 'Series') -> 'Series':
return Series(*(tuple(self.parsers) + (other,)))
def __add__(self, other: Parser) -> 'Series':
other_parsers = cast('Series', other).parsers if isinstance(other, Series) else (other,)
return Series(*(self.parsers + other_parsers))
def __radd__(self, other: 'Series') -> 'Series':
return Series(other, *self.parsers)
def __radd__(self, other: Parser) -> 'Series':
other_parsers = cast('Series', other).parsers if isinstance(other, Series) else (other,)
return Series(*(other_parsers + self.parsers))
# def __iadd__(self, other):
# if isinstance(other, Series):
# self.parsers = self.parsers + other.parsers
# else:
# self.parsers = self.parsers + (other,)
# return self
def __iadd__(self, other):
other_parsers = cast('Series', other).parsers if isinstance(other, Series) else (other,)
self.parsers += other_parsers
return self
class Alternative(NaryOperator):
......@@ -917,18 +932,21 @@ class Alternative(NaryOperator):
return Node(self, node), text_
return None, text
def __or__(self, other):
return Alternative(*(self.parsers + (other,)))
def __or__(self, other: Parser) -> 'Alternative':
other_parsers = cast('Alternative', other).parsers \
if isinstance(other, Alternative) else (other,)
return Alternative(*(self.parsers + other_parsers))
def __ror__(self, other):
return Alternative(other, *self.parsers)
def __ror__(self, other: Parser) -> 'Alternative':
other_parsers = cast('Alternative', other).parsers \
if isinstance(other, Alternative) else (other,)
return Alternative(*(other_parsers + self.parsers))
# def __ior__(self, other):
# if isinstance(other, Series):
# self.parsers = self.parsers + other.parsers
# else:
# self.parsers = self.parsers + (other,)
# return self
def __ior__(self, other):
other_parsers = cast('Alternative', other.parsers) \
if isinstance(other, Alternative) else (other,)
self.parsers += other_parsers
return self
########################################################################
......@@ -979,7 +997,8 @@ class NegativeLookahead(Lookahead):
def iter_right_branch(node) -> Iterator[Node]:
"""Iterates over the right branch of `node` starting with node itself.
"""
Iterates over the right branch of `node` starting with node itself.
Iteration is stopped if either there are no child nodes any more or
if the parser of a node is a Lookahead parser. (Reason is: Since
lookahead nodes do not advance the parser, it does not make sense
......@@ -1076,6 +1095,10 @@ class Retrieve(Parser):
def __call__(self, text: str) -> Tuple[Node, str]:
return self.call(text) # allow call method to be called from subclass circumventing the parser guard
def __repr__(self):
filter = None if self.filter == last_value else self.filter
return repr_call(self.__init__, (self.symbol, filter, self.name))
def call(self, text: str) -> Tuple[Node, str]:
try:
stack = self.grammar.variables__[self.symbol.name]
......@@ -1124,15 +1147,18 @@ class Forward(Parser):
def __call__(self, text: str) -> Tuple[Node, str]:
return self.parser(text)
def __str__(self):
def __repr__(self):
if self.cycle_reached:
return "..."
else:
self.cycle_reached = True
s = str(self.parser)
s = repr(self.parser)
self.cycle_reached = False
return s
def __str__(self):
return "Forward->" + str(self.parser)
def set(self, parser: Parser):
# assert isinstance(parser, Parser)
# self.name = parser.name # redundant, see Grammar-constructor
......
DHParser/syntaxtree.py
View file @ aa2c5763
......@@ -32,7 +32,7 @@ except ImportError:
from .typing34 import AbstractSet, Any, ByteString, Callable, cast, Container, Dict, \
Iterator, List, NamedTuple, Sequence, Union, Text, Tuple
from DHParser.toolkit import log_dir, expand_table, line_col, smart_list
from DHParser.toolkit import log_dir, repr_call, expand_table, line_col, smart_list
__all__ = ['WHITESPACE_PTYPE',
......@@ -50,6 +50,8 @@ __all__ = ['WHITESPACE_PTYPE',
'reduce_single_child',
'reduce_children',
'replace_parser',
'collapse',
'map_content',
'is_whitespace',
'is_empty',
'is_expendable',
......@@ -81,6 +83,9 @@ class ParserBase:
self.name = name # type: str
self._ptype = ':' + self.__class__.__name__ # type: str
def __repr__(self):
return repr_call(self.__init__, (self.name, ))
def __str__(self):
return self.name or self.ptype
......@@ -105,8 +110,8 @@ class MockParser(ParserBase):
self.name = name
self._ptype = ptype or ':' + self.__class__.__name__
def __str__(self):
return self.name or self.ptype
def __repr__(self):
return repr_call(self.__init__, (self.name, self.ptype))
class ZombieParser(MockParser):
......@@ -127,6 +132,9 @@ class ZombieParser(MockParser):
assert self.__class__ == ZombieParser, "No derivatives, please!"
self.__class__.alive = True
def __repr__(self):
return "ZOMBIE_PARSER"
def __copy__(self):
return self
......
DHParser/toolkit.py
View file @ aa2c5763
......@@ -39,9 +39,9 @@ try:
except ImportError:
import re
try:
from typing import List, Tuple
from typing import Any, List, Tuple
except ImportError:
from .typing34 import List, Tuple
from .typing34 import Any, List, Tuple
__all__ = ['logging',
......@@ -50,6 +50,7 @@ __all__ = ['logging',
'logfile_basename',
# 'supress_warnings',
# 'warnings',
'repr_call',
'line_col',
'error_messages',
'compact_sexpr',
......@@ -150,6 +151,30 @@ def is_logging() -> bool:
# return True
def repr_call(f, parameter_list) -> str:
"""Turns a list of items into a string resembling the parameter
list of a function call by omitting default values at the end:
>>> def(a, b=1):
print(a, b)
>>> repr_call(f, (5,1))
'f(5)'
>>> repr_call(f, (5,2))
'f(5, 2)'
"""
i = 0
defaults = f.__defaults__ if f.__defaults__ is not None else []
for parameter, default in zip(reversed(parameter_list), reversed(defaults)):
if parameter != default:
break
i -= 1
if i < 0:
parameter_list = parameter_list[:i]
name = f.__self__.__class__.__name__ if f.__name__ == '__init__' else f.__name__
return "%s(%s)" % (name, ", ".join(repr(item) for item in parameter_list))
def line_col(text: str, pos: int) -> Tuple[int, int]:
"""Returns the position within a text as (line, column)-tuple.
"""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment