Mercurial > cpython-lru_cache-weakref
annotate Parser/node.c @ 73323:dad02a080bbc
Improve byte-compilation in packaging to be independent of -O or -B.
The code I fixed to comply with PEP 3147 still had one bug: When run
under python -O, some paths for pyc files would be pyo, because I called
imp.cache_from_source without explicit debug_override argument in some
places, and under -O that would return .pyo (this is well explained in
the imp docs). Now all code (util.byte_compile, build_py, install_lib)
can create .pyo files according to options given by users,
without interference from the calling Python’s own optimize mode.
On a related topic, I also removed the code that prevented byte
compilation under python -B. The rationale is that packaging gives
control over the creation of pyc files to the user with its own explicit
option, and the behavior should not be changed if the calling Python
happens to run with -B for whatever reason. I will argue that this is a
bug fix and ask to be allowed to backport this change to distutils.
Finally, I moved one nugget of information about the --compile and
--optimize options from the source into the doc. It clears up a
misunderstanding that I (and maybe other people) had.
| author | Éric Araujo <merwok@netwok.org> |
|---|---|
| date | Thu, 03 Nov 2011 05:08:28 +0100 |
| parents | f197407bdba2 |
| children | aceb975c4832 |
| rev | line source |
|---|---|
|
14391
1fd64b3af760
Move down the INT_MAX logic, because HAVE_LIMITS_H was always undefined
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents:
14375
diff
changeset
|
1 /* Parse tree node implementation */ |
|
1fd64b3af760
Move down the INT_MAX logic, because HAVE_LIMITS_H was always undefined
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents:
14375
diff
changeset
|
2 |
|
14871
fb6b51033c3b
More limits.h stuff in node.c.
Tim Peters <tim.peters@gmail.com>
parents:
14391
diff
changeset
|
3 #include "Python.h" |
|
14391
1fd64b3af760
Move down the INT_MAX logic, because HAVE_LIMITS_H was always undefined
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents:
14375
diff
changeset
|
4 #include "node.h" |
|
1fd64b3af760
Move down the INT_MAX logic, because HAVE_LIMITS_H was always undefined
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents:
14375
diff
changeset
|
5 #include "errcode.h" |
| 145 | 6 |
| 6 | 7 node * |
| 13659 | 8 PyNode_New(int type) |
| 6 | 9 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
10 node *n = (node *) PyObject_MALLOC(1 * sizeof(node)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
11 if (n == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
12 return NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
13 n->n_type = type; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
14 n->n_str = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
15 n->n_lineno = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
16 n->n_nchildren = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
17 n->n_child = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
18 return n; |
| 6 | 19 } |
| 20 | |
|
24141
40bda3e090f6
PyNode_AddChild() and fancy_roundup(): Be paranoid about int overflow.
Tim Peters <tim.peters@gmail.com>
parents:
24128
diff
changeset
|
21 /* See comments at XXXROUNDUP below. Returns -1 on overflow. */ |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
22 static int |
|
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
23 fancy_roundup(int n) |
|
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
24 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
25 /* Round up to the closest power of 2 >= n. */ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
26 int result = 256; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
27 assert(n > 128); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
28 while (result < n) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
29 result <<= 1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
30 if (result <= 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
31 return -1; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
32 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
33 return result; |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
34 } |
|
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
35 |
|
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
36 /* A gimmick to make massive numbers of reallocs quicker. The result is |
|
24241
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
37 * a number >= the input. In PyNode_AddChild, it's used like so, when |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
38 * we're about to add child number current_size + 1: |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
39 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
40 * if XXXROUNDUP(current_size) < XXXROUNDUP(current_size + 1): |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
41 * allocate space for XXXROUNDUP(current_size + 1) total children |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
42 * else: |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
43 * we already have enough space |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
44 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
45 * Since a node starts out empty, we must have |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
46 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
47 * XXXROUNDUP(0) < XXXROUNDUP(1) |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
48 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
49 * so that we allocate space for the first child. One-child nodes are very |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
50 * common (presumably that would change if we used a more abstract form |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
51 * of syntax tree), so to avoid wasting memory it's desirable that |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
52 * XXXROUNDUP(1) == 1. That in turn forces XXXROUNDUP(0) == 0. |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
53 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
54 * Else for 2 <= n <= 128, we round up to the closest multiple of 4. Why 4? |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
55 * Rounding up to a multiple of an exact power of 2 is very efficient, and |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
56 * most nodes with more than one child have <= 4 kids. |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
57 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
58 * Else we call fancy_roundup() to grow proportionately to n. We've got an |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
59 * extreme case then (like test_longexp.py), and on many platforms doing |
|
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
60 * anything less than proportional growth leads to exorbitant runtime |
|
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
61 * (e.g., MacPython), or extreme fragmentation of user address space (e.g., |
|
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
62 * Win98). |
|
24241
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
63 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
64 * In a run of compileall across the 2.3a0 Lib directory, Andrew MacIntyre |
|
37879
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36786
diff
changeset
|
65 * reported that, with this scheme, 89% of PyObject_REALLOC calls in |
|
24241
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
66 * PyNode_AddChild passed 1 for the size, and 9% passed 4. So this usually |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
67 * wastes very little memory, but is very effective at sidestepping |
|
38673
a19c20c5e5c7
Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
68 * platform-realloc disasters on vulnerable platforms. |
|
24241
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
69 * |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
70 * Note that this would be straightforward if a node stored its current |
|
fc27ffe2036a
XXXROUNDUP(): Turns out this fixed Andrew MacIntyre's memory-mgmt
Tim Peters <tim.peters@gmail.com>
parents:
24141
diff
changeset
|
71 * capacity. The code is tricky to avoid that. |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
72 */ |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
73 #define XXXROUNDUP(n) ((n) <= 1 ? (n) : \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
74 (n) <= 128 ? (((n) + 3) & ~3) : \ |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
75 fancy_roundup(n)) |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
76 |
| 6 | 77 |
|
12970
63436719d12e
Add new parser error code, E_OVERFLOW. This error is returned when
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
5379
diff
changeset
|
78 int |
|
36786
57322cb2ca11
Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents:
24529
diff
changeset
|
79 PyNode_AddChild(register node *n1, int type, char *str, int lineno, int col_offset) |
| 6 | 80 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
81 const int nch = n1->n_nchildren; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
82 int current_capacity; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
83 int required_capacity; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
84 node *n; |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
85 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
86 if (nch == INT_MAX || nch < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
87 return E_OVERFLOW; |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
88 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
89 current_capacity = XXXROUNDUP(nch); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
90 required_capacity = XXXROUNDUP(nch + 1); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
91 if (current_capacity < 0 || required_capacity < 0) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
92 return E_OVERFLOW; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
93 if (current_capacity < required_capacity) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
94 if (required_capacity > PY_SIZE_MAX / sizeof(node)) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
95 return E_NOMEM; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
96 } |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
97 n = n1->n_child; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
98 n = (node *) PyObject_REALLOC(n, |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
99 required_capacity * sizeof(node)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
100 if (n == NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
101 return E_NOMEM; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
102 n1->n_child = n; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
103 } |
|
24128
76e9a14fb7c5
PyNode_AddChild(): Do aggressive over-allocation when the number of
Tim Peters <tim.peters@gmail.com>
parents:
14871
diff
changeset
|
104 |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
105 n = &n1->n_child[n1->n_nchildren++]; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
106 n->n_type = type; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
107 n->n_str = str; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
108 n->n_lineno = lineno; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
109 n->n_col_offset = col_offset; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
110 n->n_nchildren = 0; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
111 n->n_child = NULL; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
112 return 0; |
| 6 | 113 } |
|
76
ede86799705b
Add function to free an entire parse tree.
Guido van Rossum <guido@python.org>
parents:
6
diff
changeset
|
114 |
| 86 | 115 /* Forward */ |
|
13447
a89f7f268de4
Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.
Tim Peters <tim.peters@gmail.com>
parents:
13256
diff
changeset
|
116 static void freechildren(node *); |
| 86 | 117 |
| 118 | |
| 119 void | |
| 13659 | 120 PyNode_Free(node *n) |
| 86 | 121 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
122 if (n != NULL) { |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
123 freechildren(n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
124 PyObject_FREE(n); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
125 } |
| 86 | 126 } |
| 127 | |
|
76
ede86799705b
Add function to free an entire parse tree.
Guido van Rossum <guido@python.org>
parents:
6
diff
changeset
|
128 static void |
| 13659 | 129 freechildren(node *n) |
|
76
ede86799705b
Add function to free an entire parse tree.
Guido van Rossum <guido@python.org>
parents:
6
diff
changeset
|
130 { |
|
61467
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
131 int i; |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
132 for (i = NCH(n); --i >= 0; ) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
133 freechildren(CHILD(n, i)); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
134 if (n->n_child != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
135 PyObject_FREE(n->n_child); |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
136 if (STR(n) != NULL) |
|
f197407bdba2
Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
48330
diff
changeset
|
137 PyObject_FREE(STR(n)); |
|
76
ede86799705b
Add function to free an entire parse tree.
Guido van Rossum <guido@python.org>
parents:
6
diff
changeset
|
138 } |
