[pypy-commit] pypy default: don't store line and column on Nonterminal, introduce a special one-child
cfbolz
pypy.commits at gmail.com
Tue Apr 19 03:45:33 EDT 2016
Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch:
Changeset: r83759:e35996d1c1b6
Date: 2016-04-19 10:43 +0300
http://bitbucket.org/pypy/pypy/changeset/e35996d1c1b6/
Log: don't store line and column on Nonterminal, introduce a special one-
child Nonterminal1 for all the intermediate nodes that doesn not
need a list
diff --git a/pypy/interpreter/pyparser/parser.py b/pypy/interpreter/pyparser/parser.py
--- a/pypy/interpreter/pyparser/parser.py
+++ b/pypy/interpreter/pyparser/parser.py
@@ -44,12 +44,10 @@
class Node(object):
- __slots__ = "type lineno column".split()
+ __slots__ = ("type", )
- def __init__(self, type, lineno, column):
+ def __init__(self, type):
self.type = type
- self.lineno = lineno
- self.column = column
def __eq__(self, other):
raise NotImplementedError("abstract base class")
@@ -70,17 +68,19 @@
raise NotImplementedError("abstract base class")
def get_lineno(self):
- return self.lineno
+ raise NotImplementedError("abstract base class")
def get_column(self):
- return self.column
+ raise NotImplementedError("abstract base class")
class Terminal(Node):
- __slots__ = ("value", )
+ __slots__ = ("value", "lineno", "column")
def __init__(self, type, value, lineno, column):
- Node.__init__(self, type, lineno, column)
+ Node.__init__(self, type)
self.value = value
+ self.lineno = lineno
+ self.column = column
def __repr__(self):
return "Terminal(type=%s, value=%r)" % (self.type, self.value)
@@ -94,22 +94,43 @@
def get_value(self):
return self.value
+ def get_lineno(self):
+ return self.lineno
+
+ def get_column(self):
+ return self.column
+
class AbstractNonterminal(Node):
- pass
+ __slots__ = ()
+
+ def get_lineno(self):
+ return self.get_child(0).get_lineno()
+
+ def get_column(self):
+ return self.get_child(0).get_column()
+
+ def __eq__(self, other):
+ # For tests.
+ # grumble, annoying
+ if not isinstance(other, AbstractNonterminal):
+ return False
+ if self.type != other.type:
+ return False
+ if self.num_children() != other.num_children():
+ return False
+ for i in range(self.num_children()):
+ if self.get_child(i) != other.get_child(i):
+ return False
+ return True
+
class Nonterminal(AbstractNonterminal):
__slots__ = ("_children", )
- def __init__(self, type, children, lineno, column):
- Node.__init__(self, type, lineno, column)
+ def __init__(self, type, children):
+ Node.__init__(self, type)
self._children = children
- def __eq__(self, other):
- # For tests.
- return (type(self) == type(other) and
- self.type == other.type and
- self._children == other._children)
-
def __repr__(self):
return "Nonterminal(type=%s, children=%r)" % (self.type, self._children)
@@ -121,9 +142,28 @@
def append_child(self, child):
self._children.append(child)
- if not self._children:
- assert self.lineno == child.lineno
- assert self.column == child.column
+
+
+class Nonterminal1(AbstractNonterminal):
+ __slots__ = ("_child", )
+ def __init__(self, type, child):
+ Node.__init__(self, type)
+ self._child = child
+
+ def __repr__(self):
+ return "Nonterminal(type=%s, children=[%r])" % (self.type, self._child)
+
+ def get_child(self, i):
+ assert i == 0 or i == -1
+ return self._child
+
+ def num_children(self):
+ return 1
+
+ def append_child(self, child):
+ assert 0, "should be unreachable"
+
+
class ParseError(Exception):
@@ -156,7 +196,7 @@
if start == -1:
start = self.grammar.start
self.root = None
- current_node = Nonterminal(start, [], 0, 0)
+ current_node = Nonterminal(start, [])
self.stack = []
self.stack.append((self.grammar.dfas[start - 256], 0, current_node))
@@ -230,7 +270,7 @@
def push(self, next_dfa, next_state, node_type, lineno, column):
"""Push a terminal and adjust the current state."""
dfa, state, node = self.stack[-1]
- new_node = Nonterminal(node_type, [], lineno, column)
+ new_node = Nonterminal(node_type, [])
self.stack[-1] = (dfa, next_state, node)
self.stack.append((next_dfa, 0, new_node))
@@ -238,6 +278,10 @@
"""Pop an entry off the stack and make its node a child of the last."""
dfa, state, node = self.stack.pop()
if self.stack:
+ # we are now done with node, so we can store it more efficiently if
+ # it has just one child
+ if node.num_children() == 1:
+ node = Nonterminal1(node.type, node.get_child(0))
self.stack[-1][2].append_child(node)
else:
self.root = node
diff --git a/pypy/interpreter/pyparser/test/test_parser.py b/pypy/interpreter/pyparser/test/test_parser.py
--- a/pypy/interpreter/pyparser/test/test_parser.py
+++ b/pypy/interpreter/pyparser/test/test_parser.py
@@ -56,7 +56,7 @@
else:
tp = gram.symbol_ids[data[0]]
children = []
- n = parser.Nonterminal(tp, children, 0, 0)
+ n = parser.Nonterminal(tp, children)
new_indent = count_indent(line)
if new_indent >= last_indent:
if new_indent == last_indent and node_stack:
diff --git a/pypy/module/parser/pyparser.py b/pypy/module/parser/pyparser.py
--- a/pypy/module/parser/pyparser.py
+++ b/pypy/module/parser/pyparser.py
@@ -15,21 +15,21 @@
@specialize.arg(3)
def _build_app_tree(self, space, node, seq_maker, with_lineno, with_column):
- if node.children is not None:
- seq_w = [None]*(len(node.children) + 1)
+ if node.num_children():
+ seq_w = [None]*(node.num_children() + 1)
seq_w[0] = space.wrap(node.type)
- for i in range(1, len(node.children) + 1):
- seq_w[i] = self._build_app_tree(space, node.children[i - 1],
+ for i in range(1, node.num_children() + 1):
+ seq_w[i] = self._build_app_tree(space, node.get_child(i - 1),
seq_maker, with_lineno,
with_column)
else:
seq_w = [None]*(2 + with_lineno + with_column)
seq_w[0] = space.wrap(node.type)
- seq_w[1] = space.wrap(node.value)
+ seq_w[1] = space.wrap(node.get_value())
if with_lineno:
- seq_w[2] = space.wrap(node.lineno)
+ seq_w[2] = space.wrap(node.get_lineno())
if with_column:
- seq_w[3] = space.wrap(node.column)
+ seq_w[3] = space.wrap(node.get_column())
return seq_maker(seq_w)
def descr_issuite(self, space):
More information about the pypy-commit
mailing list