Mercurial > hgrepos > Python > libs > ConfigMix

annotate configmix/_speedups.c @ 738:20e3c2d956d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More tests for nested filters
author Franz Glasner <fzglas.hg@dom66.de>
date Sun, 29 Oct 2023 11:36:25 +0100
parents c17a4e30ebbf
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1 /* -*- coding: utf-8 -*- */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
2 /*
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
3 * Speedups for configmix.
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
4 *
593
f454889e41fa Adjust copyright year (the end) to 2022
Franz Glasner <fzglas.hg@dom66.de>
parents: 566
diff changeset
5 * :Copyright: (c) 2021-2022, Franz Glasner. All rights reserved.
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
6 * :License: BSD-3-Clause. See LICENSE.txt for details.
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
7 */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
8
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
9 #define PY_SSIZE_T_CLEAN
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
10 #include "Python.h"
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
11
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
12 #include "_py_helper.h"
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
13
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
14
609
9ad860d6ddc9 Change the external visible (and ELF-interposable) variable "_id" to "_configmix_speedups_id".
Franz Glasner <fzglas.hg@dom66.de>
parents: 605
diff changeset
15 const char _configmix_speedups_id[] = "@(#)configmix._speedups $Header$";
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
16 static const char release[] = "|VCSRevision|";
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
17 static const char date[] = "|VCSJustDate|";
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
18
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
19
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
20 /*
612
f797f798edfb Wording in comment
Franz Glasner <fzglas.hg@dom66.de>
parents: 611
diff changeset
21 * Module state holds some pre-created objects
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
22 */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
23 struct speedups_state {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
24 PyObject *DOT;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
25 PyObject *QUOTE;
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
26 PyObject *NS_SEPARATOR;
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
27 PyObject *FILTER_SEPARATOR;
707
10fbc23b4dba Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 705
diff changeset
28 PyObject *FILTER_SEPARATOR_2;
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
29 PyObject *EMPTY_FILTER;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
30 PyObject *NONE_FILTER;
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
31 PyObject *EMPTY_STR;
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
32 PyObject *QUOTE_MAP;
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
33 PyObject *MISSING;
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
34 PyObject *MARKER;
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
35 PyObject *STARTTOK;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
36 PyObject *ENDTOK;
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
37 PyObject *ENDTOK_FILTER;
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
38 PyObject *REF_NAMESPACE;
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
39 PyObject *DEL_VALUE;
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
40 };
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
41
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
42
614
7e480a32d9d5 Prototype declaration with paremeter names
Franz Glasner <fzglas.hg@dom66.de>
parents: 612
diff changeset
43 static PyObject * _fast_getvar_s(PyObject *config, PyObject *varname, PyObject *default_, struct speedups_state *sstate, int *cacheable);
704
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
44 static PyObject * _fast_interpolate_variables(PyObject *self, PyObject *config, PyObject *s, PyObject *cache);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
45
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
46
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
47 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
48 int
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
49 _hex2ucs4(PyObject *s, Py_ssize_t end, Py_UCS4 *result)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
50 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
51 Py_ssize_t i;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
52 Py_UCS4 c;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
53 Py_UCS4 r = 0;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
54
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
55 for (i=1; i < end; i++) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
56 r *= 16;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
57 c = PyUnicode_ReadChar(s, i);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
58 if ((c >= 48) && (c <= 57)) { /* 0 - 9 */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
59 r += (c - 48);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
60 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
61 else {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
62 if ((c >= 97) && (c <= 102)) { /* a - f */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
63 r += (c - 87);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
64 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
65 else {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
66 if ((c >= 65) && (c <= 70)) { /* A - F */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
67 r += (c - 55);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
68 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
69 else {
630
33264c660fca Exception formatting: more into into some exception error messages
Franz Glasner <fzglas.hg@dom66.de>
parents: 627
diff changeset
70 PyErr_Format(PyExc_ValueError, "invalid base-16 literal: %c", (int)c);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
71 return -1;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
72 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
73 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
74 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
75 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
76 *result = r;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
77 return 0; /* success */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
78 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
79
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
80
656
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
81 static
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
82 int
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
83 _dec2num(PyObject *s, Py_ssize_t start, Py_ssize_t end, Py_ssize_t *result)
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
84 {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
85 Py_ssize_t i;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
86 Py_UCS4 c;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
87 Py_ssize_t r = 0;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
88 int sign = 0;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
89
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
90 for (i=start; i<=end; i++) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
91 /* Overflow error check */
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
92 if (r > 3275) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
93 PyErr_SetString(PyExc_OverflowError, "index too large");
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
94 return -1;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
95 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
96 r *= 10;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
97 c = PyUnicode_ReadChar(s, i);
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
98 if ((c >= 48) && (c <= 57)) { /* 0 - 9 */
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
99 r += (c - 48);
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
100 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
101 else {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
102 if (i == start) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
103 /* check for number sign (but only at the first index) */
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
104 if (c == 0x2d) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
105 sign = -1;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
106 continue;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
107 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
108 else {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
109 if (c == 0x2b) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
110 sign = 1;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
111 continue;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
112 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
113 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
114 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
115 PyErr_Format(PyExc_ValueError, "invalid base-10 literal: %c", (int)c);
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
116 return -1;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
117 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
118 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
119 if (sign >= 0) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
120 *result = r;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
121 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
122 else {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
123 *result = -r;
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
124 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
125 return 0; /* success */
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
126 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
127
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
128
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
129 #if defined(Py_LIMITED_API)
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
130
549
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
131 static
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
132 void
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
133 _raise_utf8_encode_error(PyObject *s,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
134 Py_ssize_t start, Py_ssize_t end,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
135 const char *reason)
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
136 {
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
137 /*
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
138 * See also: https://docs.python.org/3/c-api/exceptions.html#unicode-exception-objects
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
139 */
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
140 PyObject *errobj = PyObject_CallFunction(
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
141 PyExc_UnicodeEncodeError,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
142 "sOnns",
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
143 "utf-8",
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
144 s,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
145 start,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
146 end,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
147 reason);
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
148
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
149 if (errobj == NULL) {
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
150 /* cannot do anything here */
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
151 return;
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
152 }
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
153 /* Make PyExc_UnicodeEncodeError owned because PyErr_Restore steals */
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
154 //Py_INCREF(PyExc_UnicodeEncodeError);
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
155 //PyErr_Restore(PyExc_UnicodeEncodeError, errobj, NULL);
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
156
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
157 PyErr_SetObject(PyExc_UnicodeEncodeError, errobj);
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
158 Py_DECREF(errobj);
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
159 }
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
160
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
161
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
162 /*
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
163 * Copyright 2001-2004 Unicode, Inc.
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
164 *
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
165 * Disclaimer
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
166 *
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
167 * This source code is provided as is by Unicode, Inc. No claims are
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
168 * made as to fitness for any particular purpose. No warranties of any
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
169 * kind are expressed or implied. The recipient agrees to determine
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
170 * applicability of information provided. If this file has been
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
171 * purchased on magnetic or optical media from Unicode, Inc., the
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
172 * sole remedy for any claim will be exchange of defective media
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
173 * within 90 days of receipt.
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
174 *
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
175 * Limitations on Rights to Redistribute This Code
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
176 *
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
177 * Unicode, Inc. hereby grants the right to freely use the information
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
178 * supplied in this file in the creation of products supporting the
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
179 * Unicode Standard, and to make copies of this file in any form
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
180 * for internal or external distribution as long as this notice
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
181 * remains attached.
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
182 */
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
183
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
184 #define UNI_MAX_LEGAL_UTF32 (Py_UCS4)0x0010FFFF
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
185 #define UNI_SUR_HIGH_START (Py_UCS4)0xD800
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
186 #define UNI_SUR_HIGH_END (Py_UCS4)0xDBFF
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
187 #define UNI_SUR_LOW_START (Py_UCS4)0xDC00
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
188 #define UNI_SUR_LOW_END (Py_UCS4)0xDFFF
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
189
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
190
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
191 /*
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
192 * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
193 * into the first byte, depending on how many bytes follow. There are
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
194 * as many entries in this table as there are UTF-8 sequence types.
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
195 * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
196 * for *legal* UTF-8 will be 4 or fewer bytes total.
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
197 */
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
198 static const unsigned char firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
199
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
200
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
201 static
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
202 Py_ssize_t
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
203 _convert_ucs4_to_utf8(
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
204 Py_UCS4 ch,
564
44e18fbf7741 Refactor: signature of _convert_ucs4_to_utf8(): change order of args
Franz Glasner <fzglas.hg@dom66.de>
parents: 562
diff changeset
205 unsigned char *targetStart, unsigned char *targetEnd,
44e18fbf7741 Refactor: signature of _convert_ucs4_to_utf8(): change order of args
Franz Glasner <fzglas.hg@dom66.de>
parents: 562
diff changeset
206 int strict,
549
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
207 PyObject *ch_obj, /* for error messages: the string where ch comes from */
564
44e18fbf7741 Refactor: signature of _convert_ucs4_to_utf8(): change order of args
Franz Glasner <fzglas.hg@dom66.de>
parents: 562
diff changeset
208 Py_ssize_t ch_obj_end /* effective length of ch_obj (error reporting) */
44e18fbf7741 Refactor: signature of _convert_ucs4_to_utf8(): change order of args
Franz Glasner <fzglas.hg@dom66.de>
parents: 562
diff changeset
209 )
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
210 {
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
211 const Py_UCS4 byteMask = 0xBF;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
212 const Py_UCS4 byteMark = 0x80;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
213
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
214 Py_ssize_t bytesToWrite = 0;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
215 unsigned char *target = targetStart;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
216
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
217 if (strict) {
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
218 /* UTF-16 surrogate values are illegal */
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
219 if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
549
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
220 _raise_utf8_encode_error(
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
221 ch_obj,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
222 1, ch_obj_end,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
223 "surrogate values are illegal in UCS4");
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
224 return -1;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
225 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
226 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
227 /*
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
228 * Figure out how many bytes the result will require. Turn any
556
3d5ef056134c Comment
Franz Glasner <fzglas.hg@dom66.de>
parents: 555
diff changeset
229 * illegally large UTF32 things (> Plane 17) into errors (exceptions).
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
230 */
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
231 if (ch < (Py_UCS4)0x80) {
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
232 bytesToWrite = 1;
565
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
233 }
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
234 else if (ch < (Py_UCS4)0x800) {
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
235 bytesToWrite = 2;
565
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
236 }
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
237 else if (ch < (Py_UCS4)0x10000) {
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
238 bytesToWrite = 3;
565
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
239 }
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
240 else if (ch <= UNI_MAX_LEGAL_UTF32) {
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
241 bytesToWrite = 4;
565
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
242 }
Franz Glasner <fzglas.hg@dom66.de>
parents: 564
diff changeset
243 else {
549
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
244 _raise_utf8_encode_error(
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
245 ch_obj,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
246 1, ch_obj_end,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
247 "max Unicode codepoint value exceeded");
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
248 return -1;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
249 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
250
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
251 target += bytesToWrite;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
252 if (target > targetEnd) {
549
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
253 _raise_utf8_encode_error(
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
254 ch_obj,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
255 1, ch_obj_end,
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
256 "temporary target buffer exhausted");
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
257 return -1;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
258 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
259 switch (bytesToWrite) { /* note: everything falls through. */
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
260 case 4: *--target = (unsigned char)((ch | byteMark) & byteMask); ch >>= 6;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
261 case 3: *--target = (unsigned char)((ch | byteMark) & byteMask); ch >>= 6;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
262 case 2: *--target = (unsigned char)((ch | byteMark) & byteMask); ch >>= 6;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
263 case 1: *--target = (unsigned char) (ch | firstByteMark[bytesToWrite]);
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
264 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
265 return bytesToWrite;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
266 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
267
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
268
549
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
269 /*
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
270 * End of Copyright 2001-2004 Unicode, Inc.
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
271 */
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
272
84657447ab39 FIX: Properly raise a UnicodeEncodeError from C
Franz Glasner <fzglas.hg@dom66.de>
parents: 547
diff changeset
273
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
274 static
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
275 PyObject *
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
276 _hex2string(PyObject *s, Py_ssize_t end)
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
277 {
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
278 Py_UCS4 c;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
279 unsigned char buf[6];
555
b7434a34a1f4 - FIX: Memory-leak with the "filters" local variable
Franz Glasner <fzglas.hg@dom66.de>
parents: 554
diff changeset
280 Py_ssize_t bytes_written;
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
281 PyObject *u;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
282
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
283 if (_hex2ucs4(s, end, &c) != 0)
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
284 return NULL;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
285
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
286 /* Replace the combination PyUniode_New/PyUnicode_WriteChar */
564
44e18fbf7741 Refactor: signature of _convert_ucs4_to_utf8(): change order of args
Franz Glasner <fzglas.hg@dom66.de>
parents: 562
diff changeset
287 bytes_written = _convert_ucs4_to_utf8(c, buf, &(buf[6]), 1, s, end+1);
555
b7434a34a1f4 - FIX: Memory-leak with the "filters" local variable
Franz Glasner <fzglas.hg@dom66.de>
parents: 554
diff changeset
288 if (bytes_written < 0) {
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
289 return NULL;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
290 }
555
b7434a34a1f4 - FIX: Memory-leak with the "filters" local variable
Franz Glasner <fzglas.hg@dom66.de>
parents: 554
diff changeset
291 u = PyUnicode_FromStringAndSize((const char *)buf, bytes_written);
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
292 if (u == NULL) {
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
293 return NULL;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
294 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
295 return u;
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
296 }
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
297
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
298 #else
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
299
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
300 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
301 PyObject *
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
302 _hex2string(PyObject *s, Py_ssize_t end)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
303 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
304 Py_UCS4 c;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
305 PyObject *u = NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
306
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
307 if (_hex2ucs4(s, end, &c) != 0)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
308 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
309 u = PyUnicode_New(1, c); /* ARGH: not in the stable API */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
310 if (u == NULL)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
311 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
312 if (PyUnicode_WriteChar(u, 0, c) != 0) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
313 Py_DECREF(u);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
314 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
315 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
316 return u;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
317 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
318
545
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
319 #endif /* Py_LIMITED_API */
6501fe0e116c Build the speedup C-extension against the stable API.
Franz Glasner <fzglas.hg@dom66.de>
parents: 544
diff changeset
320
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
321
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
322 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
323 PyObject *
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
324 _fast_unquote(PyObject *s, Py_ssize_t s_len, PyObject *self, struct speedups_state *sstate)
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
325 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
326 Py_ssize_t find;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
327 Py_ssize_t parts_len;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
328 PyObject *res;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
329 PyObject *res_parts = NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
330 PyObject *parts = NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
331 PyObject *o;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
332 PyObject *pb;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
333 Py_ssize_t pb_len;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
334 Py_ssize_t i;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
335 Py_UCS4 c;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
336
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
337 if (s_len < 0) {
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
338 s_len = PyUnicode_GetLength(s);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
339 if (s_len < 0) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
340 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
341 }
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
342 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
343 if (s_len == 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
344 return Py_NewRef(s);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
345 }
656
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
346 if (s_len > 2) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
347 /* Check for ~NNN~ syntax */
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
348 c = PyUnicode_ReadChar(s, 0);
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
349 if (c == 0x7e) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
350 c = PyUnicode_ReadChar(s, s_len - 1);
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
351 if (c == 0x7e) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
352 if (_dec2num(s, 1, s_len - 2, &i) == 0) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
353 return PyLong_FromSsize_t(i);
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
354 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
355 PyErr_Clear();
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
356 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
357 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
358 }
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
359 find = PyUnicode_FindChar(s, '%', 0, s_len, 1);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
360 if (find == -2) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
361 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
362 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
363 if (find == -1) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
364 return Py_NewRef(s);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
365 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
366
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
367 if (sstate == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
368 sstate = PyModule_GetState(self);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
369 if (sstate == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
370 PyErr_SetString(PyExc_RuntimeError, "no module state available");
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
371 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
372 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
373 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
374 parts = PyUnicode_Split(s, sstate->QUOTE, -1);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
375 if (parts == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
376 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
377 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
378 parts_len = PyList_Size(parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
379 if (parts_len < 0) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
380 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
381 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
382 res_parts = PyTuple_New((parts_len-1)*2 + 1);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
383 if (res_parts == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
384 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
385 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
386
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
387 o = PyList_GetItem(parts, 0); /* borrowed */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
388 if (o == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
389 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
390 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
391 /*
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
392 * The first item may be also the empty string if `s' starts with
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
393 * a quoted character.
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
394 */
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
395 PyTuple_SetItem(res_parts, 0, Py_NewRef(o));
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
396
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
397 for (i=1; i<parts_len; i++) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
398 pb = PyList_GetItem(parts, i); /* borrowed */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
399 pb_len = PyUnicode_GetLength(pb);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
400 if (pb_len < 1) {
630
33264c660fca Exception formatting: more into into some exception error messages
Franz Glasner <fzglas.hg@dom66.de>
parents: 627
diff changeset
401 PyErr_Format(PyExc_ValueError, "quote syntax: length too small: %U", pb);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
402 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
403 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
404 c = PyUnicode_ReadChar(pb, 0);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
405 switch (c) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
406 case 0x55: /* U */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
407 if (pb_len < 9) {
630
33264c660fca Exception formatting: more into into some exception error messages
Franz Glasner <fzglas.hg@dom66.de>
parents: 627
diff changeset
408 PyErr_Format(PyExc_ValueError, "quote syntax: length too small: %U", pb);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
409 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
410 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
411 o = _hex2string(pb, 9);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
412 if (o == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
413 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
414 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
415 PyTuple_SetItem(res_parts, (i-1)*2 + 1, o); /* steals */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
416 o = PyUnicode_Substring(pb, 9, pb_len);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
417 if (o == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
418 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
419 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
420 PyTuple_SetItem(res_parts, i*2, o); /* steals */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
421 break;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
422 case 0x75: /* u */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
423 if (pb_len < 5) {
630
33264c660fca Exception formatting: more into into some exception error messages
Franz Glasner <fzglas.hg@dom66.de>
parents: 627
diff changeset
424 PyErr_Format(PyExc_ValueError, "quote syntax: length too small: %U", pb);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
425 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
426 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
427 o = _hex2string(pb, 5);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
428 if (o == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
429 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
430 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
431 PyTuple_SetItem(res_parts, (i-1)*2 + 1, o); /* steals */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
432 o = PyUnicode_Substring(pb, 5, pb_len);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
433 if (o == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
434 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
435 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
436 PyTuple_SetItem(res_parts, i*2, o); /* steals */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
437 break;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
438 case 0x78: /* x */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
439 if (pb_len < 3) {
630
33264c660fca Exception formatting: more into into some exception error messages
Franz Glasner <fzglas.hg@dom66.de>
parents: 627
diff changeset
440 PyErr_Format(PyExc_ValueError, "quote syntax: length too small: %U", pb);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
441 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
442 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
443 o = _hex2string(pb, 3);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
444 if (o == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
445 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
446 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
447 PyTuple_SetItem(res_parts, (i-1)*2 + 1, o); /* steals */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
448 o = PyUnicode_Substring(pb, 3, pb_len);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
449 if (o == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
450 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
451 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
452 PyTuple_SetItem(res_parts, i*2, o); /* steals */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
453 break;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
454
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
455 default:
630
33264c660fca Exception formatting: more into into some exception error messages
Franz Glasner <fzglas.hg@dom66.de>
parents: 627
diff changeset
456 PyErr_Format(PyExc_ValueError, "quote syntax: length too small: %U", pb);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
457 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
458 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
459 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
460
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
461 res = PyUnicode_Join(sstate->EMPTY_STR, res_parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
462 if (res == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
463 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
464 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
465 Py_DECREF(parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
466 Py_DECREF(res_parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
467 return res;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
468
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
469 error:
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
470 Py_XDECREF(res_parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
471 Py_XDECREF(parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
472 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
473 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
474
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
475
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
476 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
477 PyObject *
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
478 fast_unquote(PyObject *self, PyObject *s)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
479 {
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
480 return _fast_unquote(s, -1, self, NULL);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
481 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
482
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
483
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
484 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
485 PyObject *
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
486 fast_quote(PyObject *self, PyObject *s)
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
487 {
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
488 Py_ssize_t s_len;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
489 Py_ssize_t i;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
490 Py_UCS4 c;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
491 int need_quoting;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
492 struct speedups_state *sstate;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
493
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
494 s_len = PyUnicode_GetLength(s);
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
495 if (s_len < 0) {
656
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
496 if (PyObject_IsInstance(s, (PyObject *)&PyLong_Type)) {
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
497 PyErr_Clear();
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
498 return PyUnicode_FromFormat("~%S~", s);
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
499 }
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
500 PyErr_SetString(PyExc_TypeError, "given object has no len()");
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
501 return NULL;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
502 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
503 if (s_len == 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
504 return Py_NewRef(s);
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
505 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
506 need_quoting = 0;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
507 for (i=0; i<s_len; i++) {
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
508 c = PyUnicode_ReadChar(s, i); /* type already checked */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
509 switch (c) {
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
510 case 0x25:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
511 case 0x2e:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
512 case 0x3a:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
513 case 0x23:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
514 case 0x7c:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
515 case 0x22:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
516 case 0x27:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
517 case 0x7b:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
518 case 0x7d:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
519 case 0x5b:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
520 case 0x5d:
656
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
521 case 0x7e:
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
522 need_quoting = 1;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
523 i = s_len; /* break the for-loop */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
524 break;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
525 default:
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
526 /* VOID */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
527 ;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
528 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
529 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
530 if (!need_quoting) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
531 return Py_NewRef(s);
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
532 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
533 sstate = PyModule_GetState(self);
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
534 if (sstate == NULL) {
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
535 PyErr_SetString(PyExc_RuntimeError, "no module state available");
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
536 return NULL;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
537 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
538 return PyUnicode_Translate(s, sstate->QUOTE_MAP, "strict");
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
539 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
540
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
541
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
542 static
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
543 PyObject *
602
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
544 _fast_pathstr2path(PyObject *varname, PyObject *self, struct speedups_state *sstate)
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
545 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
546 Py_ssize_t varname_len;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
547 PyObject *parts = NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
548 Py_ssize_t parts_len;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
549 PyObject *res = NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
550 Py_ssize_t i;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
551 PyObject *o;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
552 PyObject *u;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
553
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
554 varname_len = PyUnicode_GetLength(varname);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
555 if (varname_len < 0) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
556 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
557 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
558 if (varname_len == 0) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
559 return PyTuple_New(0);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
560 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
561
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
562 if (sstate == NULL) {
602
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
563 sstate = PyModule_GetState(self);
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
564 if (sstate == NULL) {
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
565 PyErr_SetString(PyExc_RuntimeError, "no module state available");
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
566 return NULL;
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
567 }
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
568 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
569 parts = PyUnicode_Split(varname, sstate->DOT, -1);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
570 if (parts == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
571 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
572 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
573 parts_len = PyList_Size(parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
574 if (parts_len < 0) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
575 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
576 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
577 res = PyTuple_New(parts_len);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
578 if (res == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
579 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
580 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
581 for (i=0; i < parts_len; i++) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
582 o = PyList_GetItem(parts, i); /* borrowed */
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
583 u = _fast_unquote(o, -1, NULL, sstate);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
584 if (u == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
585 goto error;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
586 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
587 PyTuple_SetItem(res, i, u); /* steals */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
588 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
589
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
590 Py_DECREF(parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
591 return res;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
592
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
593 error:
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
594 Py_XDECREF(parts);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
595 Py_XDECREF(res);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
596 return NULL;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
597 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
598
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
599
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
600 static
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
601 PyObject *
602
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
602 fast_pathstr2path(PyObject *self, PyObject *varname)
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
603 {
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
604 return _fast_pathstr2path(varname, self, NULL);
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
605 }
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
606
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
607
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
608 static
a2fff0d93d83 Split up fast_pathstr2path into internal implementation and a simple wrapper
Franz Glasner <fzglas.hg@dom66.de>
parents: 601
diff changeset
609 PyObject *
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
610 _fast_split_filters(PyObject *varname, PyObject *self, Py_ssize_t direction, struct speedups_state *sstate)
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
611 {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
612 Py_ssize_t varname_len;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
613 Py_ssize_t sep;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
614 PyObject *res = NULL;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
615 PyObject *filters = NULL;
710
ff0de14493f1 Test that "," is preferred over "|"
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 708
diff changeset
616 Py_ssize_t filters_len;
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
617 PyObject *name = NULL;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
618 PyObject *tmp;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
619
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
620 varname_len = PyUnicode_GetLength(varname);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
621 if (varname_len < 0) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
622 return NULL;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
623 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
624 if (varname_len == 0) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
625 sep = -1;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
626 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
627 else {
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
628 sep = PyUnicode_FindChar(varname, '|', 0, varname_len, (int)direction);
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
629 if (sep == -2) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
630 return NULL;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
631 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
632 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
633 if (sep == -1) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
634 res = PyTuple_New(2);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
635 if (res == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
636 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
637 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
638 PyTuple_SetItem(res, 0, Py_NewRef(varname)); /* steals */
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
639 filters = PyList_New(0);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
640 if (filters == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
641 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
642 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
643 PyTuple_SetItem(res, 1, filters); /* steals */
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
644 return res;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
645 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
646 name = PyUnicode_Substring(varname, 0, sep);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
647 if (name == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
648 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
649 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
650
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
651 filters = PyUnicode_Substring(varname, sep+1, varname_len);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
652 if (filters == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
653 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
654 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
655 tmp = PyObject_CallMethod(filters, "strip", NULL);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
656 if (tmp == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
657 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
658 }
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
659 py_transfer_owned(&filters, &tmp);
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
660
710
ff0de14493f1 Test that "," is preferred over "|"
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 708
diff changeset
661 filters_len = PyUnicode_GetLength(filters);
ff0de14493f1 Test that "," is preferred over "|"
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 708
diff changeset
662 if (filters_len < 0) {
ff0de14493f1 Test that "," is preferred over "|"
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 708
diff changeset
663 goto error;
ff0de14493f1 Test that "," is preferred over "|"
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 708
diff changeset
664 }
ff0de14493f1 Test that "," is preferred over "|"
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 708
diff changeset
665 if (filters_len == 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
666 py_clear_ref(&filters);
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
667
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
668 res = PyTuple_New(2);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
669 if (res == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
670 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
671 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
672 PyTuple_SetItem(res, 0, name); /* steals */
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
673 name = NULL; /* no ownership any more */
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
674 filters = PyList_New(0);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
675 if (filters == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
676 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
677 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
678 PyTuple_SetItem(res, 1, filters); /* steals */
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
679 filters = NULL;
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
680 return res;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
681 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
682
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
683 if (sstate == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
684 sstate = PyModule_GetState(self);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
685 if (sstate == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
686 PyErr_SetString(PyExc_RuntimeError, "no module state available");
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
687 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
688 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
689 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
690
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
691 if (direction == 1) {
710
ff0de14493f1 Test that "," is preferred over "|"
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 708
diff changeset
692 if (PyUnicode_FindChar(filters, ',', 0, filters_len, 1) >= 0) {
708
e692216f8756 Allow also "," characters to act as a separator within a filter-chain.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 707
diff changeset
693 tmp = PyUnicode_Split(filters, sstate->FILTER_SEPARATOR_2, -1);
e692216f8756 Allow also "," characters to act as a separator within a filter-chain.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 707
diff changeset
694 }
e692216f8756 Allow also "," characters to act as a separator within a filter-chain.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 707
diff changeset
695 else {
e692216f8756 Allow also "," characters to act as a separator within a filter-chain.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 707
diff changeset
696 tmp = PyUnicode_Split(filters, sstate->FILTER_SEPARATOR, -1);
e692216f8756 Allow also "," characters to act as a separator within a filter-chain.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 707
diff changeset
697 }
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
698 }
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
699 else {
707
10fbc23b4dba Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 705
diff changeset
700 tmp = PyUnicode_Split(filters, sstate->FILTER_SEPARATOR_2, -1);
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
701 }
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
702 if (tmp == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
703 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
704 }
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
705 py_transfer_owned(&filters, &tmp);
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
706
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
707 res = PyTuple_New(2);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
708 if (res == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
709 goto error;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
710 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
711 PyTuple_SetItem(res, 0, name); /* steals -- ownership changed */
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
712 PyTuple_SetItem(res, 1, filters); /* steals -- ownership changed */
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
713 return res;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
714
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
715 error:
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
716 Py_XDECREF(res);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
717 Py_XDECREF(filters);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
718 Py_XDECREF(name);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
719 return NULL;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
720 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
721
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
722
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
723 static
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
724 PyObject *
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
725 fast_split_filters(PyObject *self, PyObject *args)
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
726 {
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
727 PyObject *varname;
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
728 PyObject *direction_obj;
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
729 Py_ssize_t direction;
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
730
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
731 if (!PyArg_UnpackTuple(args, "fast_split_filters", 2, 2, &varname, &direction_obj)) {
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
732 return NULL;
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
733 }
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
734 direction = PyNumber_AsSsize_t(direction_obj, PyExc_OverflowError);
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
735 if (direction == -1) {
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
736 if (PyErr_Occurred()) {
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
737 return NULL;
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
738 }
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
739 }
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
740 if ((direction == 1) || (direction == -1)) {
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
741 return _fast_split_filters(varname, self, direction, NULL);
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
742 }
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
743 else {
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
744 PyErr_SetString(PyExc_ValueError, "`direction' must be -1 or +1");
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
745 return NULL;
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
746 }
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
747 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
748
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
749
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
750 static
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
751 PyObject *
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
752 _fast_split_ns(PyObject *varname, PyObject *self, struct speedups_state *sstate)
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
753 {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
754 PyObject *res = NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
755 Py_ssize_t ns_idx;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
756 Py_ssize_t varname_len;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
757 PyObject *o1;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
758 PyObject *o2;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
759
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
760 varname_len = PyUnicode_GetLength(varname);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
761 if (varname_len < 0) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
762 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
763 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
764 ns_idx = PyUnicode_FindChar(varname, ':', 0, varname_len, 1);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
765 if (ns_idx == -2) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
766 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
767 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
768 if (ns_idx == -1) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
769 res = PyTuple_New(2);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
770 if (res == NULL) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
771 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
772 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
773 PyTuple_SetItem(res, 0, Py_NewRef(Py_None)); /* steals */
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
774 PyTuple_SetItem(res, 1, Py_NewRef(varname)); /* steals */
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
775 return res;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
776 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
777
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
778 res = PyTuple_New(2);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
779 if (res == NULL) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
780 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
781 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
782 o1 = PyUnicode_Substring(varname, 0, ns_idx);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
783 if (o1 == NULL) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
784 Py_DECREF(res);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
785 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
786 }
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
787 o2 = _fast_unquote(o1, ns_idx, self, sstate);
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
788 if (o2 == NULL) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
789 Py_DECREF(o1);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
790 Py_DECREF(res);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
791 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
792 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
793 Py_DECREF(o1);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
794 PyTuple_SetItem(res, 0, o2); /* steals */
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
795 o1 = PyUnicode_Substring(varname, ns_idx+1, varname_len);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
796 if (o1 == NULL) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
797 Py_DECREF(res);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
798 return NULL;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
799 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
800 PyTuple_SetItem(res, 1, o1); /* steals */
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
801 return res;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
802 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
803
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
804
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
805 static
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
806 PyObject *
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
807 fast_split_ns(PyObject *self, PyObject *varname)
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
808 {
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
809 return _fast_split_ns(varname, self, NULL);
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
810 }
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
811
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
812
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
813 static
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
814 PyObject *
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
815 fast_interpolate_variables_old(PyObject *self, PyObject *args)
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
816 {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
817 PyObject *config;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
818 PyObject *s;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
819 PyObject *cache;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
820
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
821 int cmp;
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
822 Py_ssize_t s_len;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
823 Py_ssize_t idx;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
824 Py_ssize_t i, j;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
825 PyObject *parts = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
826 Py_ssize_t parts_len;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
827 PyObject *res_parts = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
828 PyObject *res = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
829 PyObject *tmp;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
830 PyObject *pb;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
831 Py_ssize_t pb_len;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
832 PyObject *varname = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
833 PyObject *varvalue = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
834 PyObject *filters = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
835 int cacheable;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
836 int use_cache = 1;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
837 int first_part_is_empty;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
838 PyObject *err_type;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
839 PyObject *err_value;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
840 PyObject *err_tb;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
841 struct speedups_state *sstate;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
842
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
843 if (!PyArg_UnpackTuple(args, "s", 3, 3, &config, &s, &cache)) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
844 return NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
845 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
846 s_len = PyUnicode_GetLength(s); /* also an implicit type check */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
847 if (s_len < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
848 return NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
849 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
850 if (s_len < 4) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
851 PyErr_Clear();
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
852 return Py_NewRef(s);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
853 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
854 sstate = PyModule_GetState(self);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
855 if (sstate == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
856 PyErr_SetString(PyExc_RuntimeError, "no module state available");
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
857 return NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
858 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
859
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
860 cmp = PyUnicode_Compare(s, sstate->DEL_VALUE);
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
861 if ((cmp < 0) && PyErr_Occurred()) {
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
862 return NULL;
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
863 }
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
864 if (cmp == 0) {
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
865 return Py_NewRef(s);
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
866 }
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
867
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
868 idx = PyUnicode_Find(s, sstate->STARTTOK, 0, s_len, 1);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
869 if (idx < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
870 PyErr_Clear();
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
871 return Py_NewRef(s);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
872 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
873
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
874 res = PyDict_GetItem(cache, s); /* borrowed */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
875 if (res != NULL) {
618
8dc514bd3d5e Use py_object_is when comparing to MISSING
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 614
diff changeset
876 if (py_object_is(res, sstate->MISSING)) {
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
877 return PyErr_Format(
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
878 PyExc_KeyError,
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
879 "Cannot interpolate variables in string %R (cached)",
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
880 s);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
881 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
882 else {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
883 return Py_NewRef(res);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
884 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
885 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
886
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
887 parts = PyUnicode_Split(s, sstate->STARTTOK, -1);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
888 if (parts == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
889 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
890 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
891 parts_len = PyList_Size(parts);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
892 if (parts_len < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
893 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
894 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
895 res_parts = PyList_New(1);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
896 if (res_parts == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
897 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
898 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
899
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
900 tmp = PyList_GetItem(parts, 0); /* borrowed */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
901 if (tmp == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
902 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
903 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
904 /*
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
905 * The first item may be also the empty string if `s' starts with
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
906 * an interpolation token.
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
907 */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
908 first_part_is_empty = PyObject_Not(tmp);
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
909 /* steals -- cannot fail here -- NOTE: tmp is currently borrowed */
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
910 PyList_SetItem(res_parts, 0, Py_NewRef(tmp));
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
911 tmp = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
912
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
913 for (i=1; i<parts_len; i++) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
914 pb = PyList_GetItem(parts, i); /* borrowed */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
915 pb_len = PyUnicode_GetLength(pb);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
916 if (pb_len < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
917 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
918 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
919 idx = PyUnicode_Find(pb, sstate->ENDTOK, 0, pb_len, 1);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
920 if (idx < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
921 /*
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
922 * Behave similar to the pure-Python version: copy the complete
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
923 * rest as-is. Also include the start tokens!
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
924 */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
925 if (PyList_Append(res_parts, sstate->STARTTOK) < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
926 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
927 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
928 if (PyList_Append(res_parts, pb) < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
929 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
930 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
931 for (j=i+1; j<parts_len; j++) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
932 if (PyList_Append(res_parts, sstate->STARTTOK) < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
933 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
934 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
935 pb = PyList_GetItem(parts, j); /* borrowed */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
936 if (PyList_Append(res_parts, pb) < 0) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
937 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
938 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
939 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
940 break; /* the for-loop */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
941 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
942
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
943 varname = PyUnicode_Substring(pb, 0, idx);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
944 if (varname == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
945 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
946 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
947
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
948 tmp = _fast_split_filters(varname, NULL, 1, sstate);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
949 if (tmp == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
950 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
951 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
952 if (PyTuple_Size(tmp) != 2) {
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
953 py_clear_ref(&tmp);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
954 PyErr_SetString(PyExc_TypeError, "tuple of size 2 expected");
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
955 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
956 }
562
f75c5b13a1d7 FIX: Memory-leak
Franz Glasner <fzglas.hg@dom66.de>
parents: 561
diff changeset
957 py_clear_ref(&varname);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
958 /* Unpack the result tuple */
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
959 /* borrowed -- cannot fail -- need ownership */
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
960 varname = Py_NewRef(PyTuple_GetItem(tmp, 0));
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
961 /* borrowed -- cannot fail -- want ownership */
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
962 filters = Py_NewRef(PyTuple_GetItem(tmp, 1));
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
963 py_clear_ref(&tmp);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
964
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
965 varvalue = _fast_getvar_s(config, varname, NULL, sstate, &cacheable);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
966 if (varvalue == NULL) {
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
967 if (PyErr_ExceptionMatches(PyExc_KeyError)) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
968 cacheable = 1;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
969 if (PySequence_Contains(filters, sstate->NONE_FILTER) == 1) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
970 PyErr_Clear();
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
971 varvalue = Py_NewRef(Py_None);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
972 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
973 else {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
974 if (PySequence_Contains(filters, sstate->EMPTY_FILTER) == 1) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
975 PyErr_Clear();
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
976 varvalue = Py_NewRef(sstate->EMPTY_STR);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
977 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
978 else {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
979 PyErr_Fetch(&err_type, &err_value, &err_tb);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
980 /* this does NOT steal */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
981 PyDict_SetItem(cache, s, sstate->MISSING);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
982 PyErr_Restore(err_type, err_value, err_tb);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
983 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
984 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
985 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
986 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
987 else {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
988 /* other exception/error than KeyError */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
989 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
990 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
991 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
992
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
993 if (!cacheable) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
994 use_cache = 0;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
995 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
996
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
997 py_clear_ref(&varname);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
998
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
999 tmp = PyObject_CallMethod(
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1000 config, "_apply_filters", "OO", filters, varvalue);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1001 if (tmp == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1002 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1003 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1004 py_clear_ref(&varvalue);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1005
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1006 py_clear_ref(&filters);
555
b7434a34a1f4 - FIX: Memory-leak with the "filters" local variable
Franz Glasner <fzglas.hg@dom66.de>
parents: 554
diff changeset
1007
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1008 /*
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1009 * Dont apply and type conversions to the variable value if
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1010 * the whole `s` is just one expansion
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1011 */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1012 if (first_part_is_empty && (i == 1) && (pb_len == s_len - 2) && (idx == pb_len - 2)) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1013 res = varvalue; varvalue = NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1014 goto success; /* break out early */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1015 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1016 if (py_object_isnot(varvalue, Py_None)) {
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1017 tmp = PyObject_Str(varvalue);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1018 if (tmp == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1019 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1020 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1021 if (PyList_Append(res_parts, tmp) < 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1022 py_clear_ref(&tmp);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1023 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1024 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1025 py_clear_ref(&tmp);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1026 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1027 py_clear_ref(&varvalue);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1028 /* append the rest of the string */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1029 tmp = PyUnicode_Substring(pb, idx+2, pb_len);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1030 if (tmp == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1031 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1032 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1033 if (PyList_Append(res_parts, tmp) < 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1034 py_clear_ref(&tmp);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1035 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1036 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1037 py_clear_ref(&tmp);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1038 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1039
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1040 res = PyUnicode_Join(sstate->EMPTY_STR, res_parts);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1041 if (res == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1042 goto error;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1043 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1044
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1045 success:
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1046 Py_DECREF(parts);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1047 Py_DECREF(res_parts);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1048
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1049 if (use_cache) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1050 PyDict_SetItem(cache, s, res);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1051 PyErr_Clear(); /* clear any possible cache-related error */
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1052 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1053 return res;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1054
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1055 error:
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1056 Py_XDECREF(varname);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1057 Py_XDECREF(varvalue);
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1058 Py_XDECREF(filters);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1059 Py_XDECREF(parts);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1060 Py_XDECREF(res_parts);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1061 Py_XDECREF(res);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1062 return NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1063 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1064
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1065
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1066 static
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1067 PyObject *
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1068 fast_interpolate_variables(PyObject *self, PyObject *args)
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1069 {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1070 PyObject *config;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1071 PyObject *s;
566
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1072 PyObject *cache = NULL;
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1073
704
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1074 if (!PyArg_UnpackTuple(args, "s", 2, 3, &config, &s, &cache)) {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1075 return NULL;
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1076 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1077 return _fast_interpolate_variables(self, config, s, cache);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1078 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1079
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1080
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1081 static
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1082 PyObject *
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1083 _fast_interpolate_variables(PyObject *self, PyObject *config, PyObject *s, PyObject *cache)
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1084 {
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1085 int cmp;
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1086 Py_ssize_t s_len;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1087 Py_ssize_t start, rest, end;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1088 PyObject *tmp;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1089 PyObject *result = NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1090 PyObject *varname = NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1091 PyObject *varvalue = NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1092 PyObject *filters = NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1093 PyObject *err_type;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1094 PyObject *err_value;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1095 PyObject *err_tb;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1096 int use_cache, cacheable;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1097 struct speedups_state *sstate;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1098
566
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1099 /* Disable caching if the cache param is given as None */
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1100 if ((cache != NULL) && py_object_is(cache, Py_None)) {
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1101 cache = NULL;
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1102 }
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1103 s_len = PyUnicode_GetLength(s); /* also an implicit type check */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1104 if (s_len < 0) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1105 return NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1106 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1107 if (s_len < 4) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1108 return Py_NewRef(s);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1109 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1110
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1111 sstate = PyModule_GetState(self);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1112 if (sstate == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1113 PyErr_SetString(PyExc_RuntimeError, "no module state available");
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1114 return NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1115 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1116
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1117 cmp = PyUnicode_Compare(s, sstate->DEL_VALUE);
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1118 if ((cmp < 0) && PyErr_Occurred()) {
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1119 return NULL;
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1120 }
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1121 if (cmp == 0) {
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1122 return Py_NewRef(s);
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1123 }
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1124
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1125 start = PyUnicode_Find(s, sstate->STARTTOK, 0, s_len, 1);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1126 if (start == -2) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1127 return NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1128 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1129 if (start == -1) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1130 return Py_NewRef(s);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1131 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1132
566
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1133 if (cache != NULL) {
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1134 result = PyDict_GetItem(cache, s); /* borrowed */
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1135 if (result != NULL) {
618
8dc514bd3d5e Use py_object_is when comparing to MISSING
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 614
diff changeset
1136 if (py_object_is(result, sstate->MISSING)) {
566
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1137 return PyErr_Format(
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1138 PyExc_KeyError,
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1139 "Cannot interpolate variables in string %R (cached)",
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1140 s);
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1141 }
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1142 else {
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1143 return Py_NewRef(result);
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1144 }
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1145 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1146 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1147
704
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1148 /* Check for {{| ... |}} */
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1149 if ((s_len >= 6)
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1150 && (start == 0)
704
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1151 && (PyUnicode_ReadChar(s, 2) == 0x7c /* `|' */)) {
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1152 end = PyUnicode_Find(s, sstate->ENDTOK_FILTER, start+3, s_len, 1);
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1153 if (end == -2) {
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1154 return NULL;
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1155 }
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1156 if (end != (s_len - 3)) {
723
c17a4e30ebbf Docs for nested filters
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 710
diff changeset
1157 PyErr_SetString(PyExc_ValueError, "`{{|' nested filter interpolation must end with `|}}'");
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1158 return NULL;
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1159 }
704
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1160 /*
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1161 * Handle {{| ... |filters, ... |}} :
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1162 * split and recurse and apply filters
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1163 */
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1164 tmp = PyUnicode_Substring(s, 3, s_len-3);
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1165 if (tmp == NULL) {
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1166 return NULL;
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1167 }
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
1168 filters = _fast_split_filters(tmp, NULL, -1, sstate);
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1169 if (filters == NULL) {
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1170 py_clear_ref(&tmp);
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1171 return NULL;
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1172 }
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1173 if (PyTuple_Size(filters) != 2) {
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1174 py_clear_ref(&tmp);
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1175 PyErr_SetString(PyExc_TypeError, "tuple of size 2 expected");
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1176 goto error;
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1177 }
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1178 py_transfer_owned(&tmp, &filters);
704
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1179 /* Unpack the result tuple */
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1180 /* borrowed -- cannot fail -- need ownership */
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1181 varname = Py_NewRef(PyTuple_GetItem(tmp, 0));
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1182 /* borrowed -- cannot fail -- need ownership */
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1183 filters = Py_NewRef(PyTuple_GetItem(tmp, 1));
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1184 py_clear_ref(&tmp);
704
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1185
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1186 varvalue = _fast_interpolate_variables(self, config, varname, cache);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1187 if (varvalue == NULL) {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1188 if (PyErr_ExceptionMatches(PyExc_KeyError)) {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1189 if (PySequence_Contains(filters, sstate->NONE_FILTER) == 1) {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1190 PyErr_Clear();
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1191 varvalue = Py_NewRef(Py_None);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1192 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1193 else {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1194 if (PySequence_Contains(filters, sstate->EMPTY_FILTER) == 1) {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1195 PyErr_Clear();
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1196 varvalue = Py_NewRef(sstate->EMPTY_STR);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1197 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1198 else {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1199 goto error;
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1200 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1201 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1202 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1203 else {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1204 /* other exception/error than KeyError */
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1205 goto error;
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1206 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1207 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1208 py_clear_ref(&varname);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1209 result = PyObject_CallMethod(
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1210 config, "_apply_filters", "OO", filters, varvalue);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1211 if (result == NULL) {
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1212 goto error;
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1213 }
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1214 py_clear_ref(&varvalue);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1215 py_clear_ref(&filters);
457ef358c1a0 filter-only expansions also implemented in the C extension.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 703
diff changeset
1216 return result;
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1217 }
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1218
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1219 result = PyList_New(0);
627
e3a23e9242a0 NULL instead of 0
Franz Glasner <fzglas.hg@dom66.de>
parents: 622
diff changeset
1220 if (result == NULL) {
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1221 return NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1222 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1223
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1224 rest = 0;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1225 use_cache = 1;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1226
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1227 while (start != -1) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1228 if (rest < start) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1229 tmp = PyUnicode_Substring(s, rest, start);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1230 if (tmp == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1231 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1232 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1233 if (PyList_Append(result, tmp) < 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1234 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1235 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1236 }
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1237 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1238 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1239 end = PyUnicode_Find(s, sstate->ENDTOK, start+2, s_len, 1);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1240 if (end == -2) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1241 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1242 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1243 if (end == -1) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1244 rest = start;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1245 break;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1246 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1247
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1248 varname = PyUnicode_Substring(s, start+2, end); /* 2 == len(STARTTOK) */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1249 if (varname == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1250 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1251 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1252
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
1253 tmp = _fast_split_filters(varname, NULL, 1, sstate);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1254 if (tmp == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1255 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1256 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1257 if (PyTuple_Size(tmp) != 2) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1258 PyErr_SetString(PyExc_TypeError, "tuple of size 2 expected");
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1259 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1260 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1261 }
562
f75c5b13a1d7 FIX: Memory-leak
Franz Glasner <fzglas.hg@dom66.de>
parents: 561
diff changeset
1262 py_clear_ref(&varname);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1263 /* Unpack the result tuple */
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1264 /* borrowed -- cannot fail -- need ownership */
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1265 varname = Py_NewRef(PyTuple_GetItem(tmp, 0));
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1266 /* borrowed -- cannot fail -- need ownership */
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1267 filters = Py_NewRef(PyTuple_GetItem(tmp, 1));
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1268 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1269
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1270 varvalue = _fast_getvar_s(config, varname, NULL, sstate, &cacheable);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1271
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1272 if (varvalue == NULL) {
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1273 if (PyErr_ExceptionMatches(PyExc_KeyError)) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1274 cacheable = 1;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1275 if (PySequence_Contains(filters, sstate->NONE_FILTER) == 1) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1276 PyErr_Clear();
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1277 varvalue = Py_NewRef(Py_None);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1278 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1279 else {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1280 if (PySequence_Contains(filters, sstate->EMPTY_FILTER) == 1) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1281 PyErr_Clear();
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1282 varvalue = Py_NewRef(sstate->EMPTY_STR);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1283 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1284 else {
566
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1285 if (cache != NULL) {
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1286 PyErr_Fetch(&err_type, &err_value, &err_tb);
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1287 /* this does NOT steal */
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1288 PyDict_SetItem(cache, s, sstate->MISSING);
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1289 PyErr_Restore(err_type, err_value, err_tb);
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1290 }
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1291 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1292 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1293 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1294 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1295 else {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1296 /* other exception/error than KeyError */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1297 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1298 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1299 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1300
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1301 if (!cacheable) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1302 use_cache = 0;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1303 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1304
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1305 py_clear_ref(&varname);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1306
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1307 tmp = PyObject_CallMethod(
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1308 config, "_apply_filters", "OO", filters, varvalue);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1309 if (tmp == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1310 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1311 }
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1312 py_transfer_owned(&varvalue, &tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1313
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1314 py_clear_ref(&filters);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1315
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1316 rest = end + 2; /* 2 == len(ENDTOK) */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1317
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1318 /*
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1319 * Dont apply and type conversions to the variable value if
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1320 * the whole `s` is just one expansion
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1321 */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1322 if ((start == 0) && (rest == s_len)) {
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1323 py_transfer_owned(&result, &varvalue);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1324 goto success; /* break out early */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1325 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1326
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1327 /* Handle None like the empty string */
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1328 if (py_object_isnot(varvalue, Py_None)) {
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1329 tmp = PyObject_Str(varvalue);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1330 if (tmp == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1331 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1332 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1333 if (PyList_Append(result, tmp) < 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1334 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1335 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1336 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1337 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1338 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1339
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1340 /* don't re-evaluate because `self.getvar_s()` expands already */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1341 start = PyUnicode_Find(s, sstate->STARTTOK, rest, s_len, 1);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1342 if (start == -2) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1343 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1344 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1345 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1346
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1347 if (rest < s_len) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1348 tmp = PyUnicode_Substring(s, rest, s_len);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1349 if (tmp == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1350 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1351 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1352 if (PyList_Append(result, tmp) < 0) {
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1353 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1354 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1355 }
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1356 py_clear_ref(&tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1357 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1358
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1359 tmp = PyUnicode_Join(sstate->EMPTY_STR, result);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1360 if (tmp == NULL) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1361 goto error;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1362 }
560
81238ea2dbe3 Implement and use more helper functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 559
diff changeset
1363 py_transfer_owned(&result, &tmp);
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1364
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1365 success:
566
dc2e2384c8c7 fast_interpolate_variables(): allow omission of the cache variable.
Franz Glasner <fzglas.hg@dom66.de>
parents: 565
diff changeset
1366 if (use_cache && (cache != NULL)) {
558
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1367 if (PyDict_SetItem(cache, s, result) < 0) {
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1368 PyErr_Clear(); /* clear any cache-related error */
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1369 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1370 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1371 return result;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1372
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1373 error:
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1374 Py_XDECREF(varname);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1375 Py_XDECREF(varvalue);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1376 Py_XDECREF(filters);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1377 Py_XDECREF(result);
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1378 return NULL;
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1379 }
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1380
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1381
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1382 static
7a3c311991d7 An alternate C-implementation of fast_interpolate_variables() that uses the algorithm of the pure-Python implementation
Franz Glasner <fzglas.hg@dom66.de>
parents: 557
diff changeset
1383 PyObject *
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1384 _fast_getvarl(PyObject *config, PyObject *path, PyObject *namespace, PyObject *default_, struct speedups_state *sstate)
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1385 {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1386 PyObject *varvalue;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1387 PyObject *lookupfn = NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1388
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1389 if ((namespace == NULL) || PyObject_Not(namespace)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1390 lookupfn = PyObject_GetAttrString(config, "_lookupvar");
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1391 if (lookupfn == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1392 goto error;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1393 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1394 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1395 else {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1396 int ns_equals_ref = PyUnicode_Compare(namespace, sstate->REF_NAMESPACE);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1397 if ((ns_equals_ref < 0) && PyErr_Occurred()) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1398 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1399 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1400 if (ns_equals_ref == 0) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1401 lookupfn = PyObject_GetAttrString(config, "_lookupref");
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1402 if (lookupfn == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1403 goto error;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1404 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1405 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1406 else {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1407 /* lookup_varns */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1408 /* this is borrowed */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1409 PyObject *cfg_vars_mod = PyImport_AddModule("configmix.variables");
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1410 if (cfg_vars_mod == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1411 goto error;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1412 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1413 lookupfn = PyObject_CallMethod(cfg_vars_mod, "lookup_varns", "O", namespace);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1414 if (lookupfn == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1415 goto handle_possible_keyerror;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1416 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1417 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1418 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1419 varvalue = PyObject_CallObject(lookupfn, path);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1420 if (varvalue == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1421 goto handle_possible_keyerror;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1422 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1423 Py_DECREF(lookupfn);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1424 return varvalue;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1425
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1426 handle_possible_keyerror:
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1427 if (PyErr_ExceptionMatches(PyExc_KeyError)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1428 if ((default_ == NULL) || py_object_is(default_, sstate->MARKER)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1429 PyErr_Format(PyExc_KeyError, "Variable %R not found", path);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1430 /* fall through */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1431 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1432 else {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1433 PyErr_Clear();
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1434 Py_XDECREF(lookupfn);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1435 return Py_NewRef(default_);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1436 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1437 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1438 /* fall through */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1439 error:
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1440 Py_XDECREF(lookupfn);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1441 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1442 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1443
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1444
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1445 static
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1446 PyObject *
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1447 fast_getvarl(PyObject *self, PyObject *args, PyObject *kwds)
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1448 {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1449 static char *kwlist[] = {"config", "path", "namespace", "default", NULL};
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1450 PyObject *path;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1451 PyObject *config;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1452 PyObject *namespace = NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1453 PyObject *default_ = NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1454
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1455 struct speedups_state *sstate;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1456
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1457 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!|$OO", kwlist, &config, &PyTuple_Type, &path, &namespace, &default_)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1458
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1459 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1460 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1461 sstate = PyModule_GetState(self);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1462 if (sstate == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1463 PyErr_SetString(PyExc_RuntimeError, "no module state available");
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1464 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1465 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1466 return _fast_getvarl(config, path, namespace, default_, sstate);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1467 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1468
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1469
610
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1470 static
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1471 PyObject *
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1472 fast_getvarl_s(PyObject *self, PyObject *args, PyObject *kwds)
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1473 {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1474 static char *kwlist[] = {"config", "path", "namespace", "default", NULL};
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1475
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1476 PyObject *config;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1477 PyObject *path;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1478 PyObject *namespace = NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1479 PyObject *default_ = NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1480
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1481 PyObject *res = NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1482 PyObject *tmp;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1483
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1484 struct speedups_state *sstate;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1485
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1486 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!|$OO", kwlist, &config, &PyTuple_Type, &path, &namespace, &default_)) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1487
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1488 return NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1489 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1490 sstate = PyModule_GetState(self);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1491 if (sstate == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1492 PyErr_SetString(PyExc_RuntimeError, "no module state available");
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1493 return NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1494 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1495
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1496 tmp = _fast_getvarl(config, path, namespace, NULL, sstate);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1497 if (tmp == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1498 goto handle_possible_keyerror;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1499 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1500 res = PyObject_CallMethod(config, "substitute_variables_in_obj", "O", tmp);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1501 if (res == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1502 py_clear_ref(&tmp);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1503 goto handle_possible_keyerror;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1504 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1505 py_clear_ref(&tmp);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1506 return res;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1507
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1508 handle_possible_keyerror:
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1509 if (PyErr_ExceptionMatches(PyExc_KeyError)) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1510 if ((default_ == NULL) || py_object_is(default_, sstate->MARKER)) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1511 /* fall through */
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1512 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1513 else {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1514 PyErr_Clear();
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1515 return Py_NewRef(default_);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1516 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1517 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1518 /* fall through */
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1519
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1520 error:
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1521 return NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1522 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1523
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1524
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1525 /**
605
776dc94b4ef7 Comment
Franz Glasner <fzglas.hg@dom66.de>
parents: 603
diff changeset
1526 * Combination of py_getvar_s and _py_getvar_s_with_cache_info
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1527 */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1528 static
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1529 PyObject *
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1530 _fast_getvar_s(PyObject *config, PyObject *varname, PyObject *default_, struct speedups_state *sstate, int *cacheable)
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1531 {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1532 PyObject *varname_b; /* always borrowed */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1533 PyObject *namespace_b; /* always borrowed */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1534 PyObject *splitted = NULL;
610
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1535 PyObject *res;
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1536 PyObject *tmp1;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1537 PyObject *tmp2;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1538
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1539 splitted = _fast_split_ns(varname, NULL, sstate);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1540 if (splitted == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1541 goto error;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1542 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1543 namespace_b = PyTuple_GetItem(splitted, 0); /* borrowed */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1544 varname_b = PyTuple_GetItem(splitted, 1); /* borrowed */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1545
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1546 if (PyObject_Not(namespace_b)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1547 tmp1 = _fast_pathstr2path(varname_b, NULL, sstate);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1548 if (tmp1 == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1549 goto error;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1550 }
622
8d2d5d54ff3c FIX: Handle KeyErrors in fast_getvar_s() properly within its function frame
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 618
diff changeset
1551 tmp2 = _fast_getvarl(config, tmp1, NULL, NULL, sstate);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1552 if (tmp2 == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1553 py_clear_ref(&tmp1);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1554 goto handle_possible_keyerror;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1555 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1556 py_clear_ref(&tmp1);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1557 res = PyObject_CallMethod(config, "substitute_variables_in_obj", "O", tmp2);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1558 if (res == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1559 py_clear_ref(&tmp2);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1560 goto handle_possible_keyerror;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1561 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1562 py_clear_ref(&tmp2);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1563 /* no namespace -> cacheable */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1564 *cacheable = 1;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1565 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1566 else {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1567 tmp1 = PyTuple_New(1);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1568 if (tmp1 == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1569 goto error;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1570 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1571 PyTuple_SetItem(tmp1, 0, Py_NewRef(varname_b));
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1572 tmp2 = _fast_getvarl(config, tmp1, namespace_b, NULL, sstate);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1573 if (tmp2 == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1574 py_clear_ref(&tmp1);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1575 goto handle_possible_keyerror;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1576 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1577 py_clear_ref(&tmp1);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1578 res = PyObject_CallMethod(config, "substitute_variables_in_obj", "O", tmp2);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1579 if (res == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1580 py_clear_ref(&tmp2);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1581 goto handle_possible_keyerror;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1582 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1583 py_clear_ref(&tmp2);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1584 /* results from namespaced lookups are currently not cacheable */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1585 *cacheable = 0;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1586 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1587
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1588 /* free splitted last because of using borrowed refs from it */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1589 Py_DECREF(splitted);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1590 return res;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1591
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1592 handle_possible_keyerror:
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1593 if (PyErr_ExceptionMatches(PyExc_KeyError)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1594 if ((default_ == NULL) || py_object_is(default_, sstate->MARKER)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1595 /* fall through */
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1596 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1597 else {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1598 PyErr_Clear();
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1599 Py_XDECREF(splitted);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1600 return Py_NewRef(default_);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1601 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1602 }
610
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1603 /* fall through */
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1604
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1605 error:
610
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1606 Py_XDECREF(splitted);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1607 return NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1608 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1609
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1610
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1611 static
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1612 PyObject *
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1613 fast_getvar(PyObject *self, PyObject *args)
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1614 {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1615 PyObject *config;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1616 PyObject *varname;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1617 PyObject *default_;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1618
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1619 PyObject *varname_b; /* always borrowed */
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1620 PyObject *namespace_b; /* always borrowed */
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1621 PyObject *splitted = NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1622 PyObject *res;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1623 PyObject *tmp1;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1624 struct speedups_state *sstate;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1625
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1626 if (!PyArg_UnpackTuple(args, "config", 3, 3, &config, &varname, &default_)) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1627 return NULL;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1628 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1629
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1630 sstate = PyModule_GetState(self);
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1631 if (sstate == NULL) {
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1632 PyErr_SetString(PyExc_RuntimeError, "no module state available");
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1633 return NULL;
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1634 }
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1635
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1636 splitted = _fast_split_ns(varname, NULL, sstate);
610
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1637 if (splitted == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1638 goto error;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1639 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1640 namespace_b = PyTuple_GetItem(splitted, 0); /* borrowed */
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1641 varname_b = PyTuple_GetItem(splitted, 1); /* borrowed */
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1642
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1643 if (PyObject_Not(namespace_b)) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1644 tmp1 = _fast_pathstr2path(varname_b, NULL, sstate);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1645 if (tmp1 == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1646 goto error;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1647 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1648 res = _fast_getvarl(config, tmp1, NULL, default_, sstate);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1649 if (res == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1650 py_clear_ref(&tmp1);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1651 goto error;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1652 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1653 py_clear_ref(&tmp1);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1654 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1655 else {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1656 tmp1 = PyTuple_New(1);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1657 if (tmp1 == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1658 goto error;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1659 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1660 PyTuple_SetItem(tmp1, 0, Py_NewRef(varname_b));
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1661 res = _fast_getvarl(config, tmp1, namespace_b, default_, sstate);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1662 if (res == NULL) {tmp1 = _fast_pathstr2path(varname_b, NULL, sstate);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1663 if (tmp1 == NULL) {
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1664 goto error;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1665 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1666 py_clear_ref(&tmp1);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1667 goto error;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1668 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1669 py_clear_ref(&tmp1);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1670 }
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1671 Py_DECREF(splitted);
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1672 return res;
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1673
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1674 error:
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1675 Py_XDECREF(splitted);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1676 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1677 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1678
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1679
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1680 static
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1681 PyObject *
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1682 fast_getvar_s(PyObject *self, PyObject *args)
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1683 {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1684 PyObject *config;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1685 PyObject *varname;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1686 PyObject *default_;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1687 int cacheable;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1688 struct speedups_state *sstate;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1689
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1690 if (!PyArg_UnpackTuple(args, "config", 3, 3, &config, &varname, &default_)) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1691 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1692 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1693
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1694 sstate = PyModule_GetState(self);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1695 if (sstate == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1696 PyErr_SetString(PyExc_RuntimeError, "no module state available");
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1697 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1698 }
611
db5a20f18030 Provide an internal version of fast_split_ns() to use an already module state available
Franz Glasner <fzglas.hg@dom66.de>
parents: 610
diff changeset
1699 return _fast_getvar_s(config, varname, default_, sstate, &cacheable);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1700 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1701
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1702
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1703 static
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1704 PyObject *
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1705 sync_MISSING(PyObject *self, PyObject *missing)
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1706 {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1707 struct speedups_state *sstate;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1708
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1709 sstate = PyModule_GetState(self);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1710 if (sstate == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1711 PyErr_SetString(PyExc_RuntimeError, "no module state available");
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1712 return NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1713 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1714 if (sstate->MISSING != NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1715 PyErr_SetString(PyExc_RuntimeError, "_MISSING already set");
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1716 return NULL;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1717 }
559
bb160a1e67d7 A simple helper include file with some conveniente functions.
Franz Glasner <fzglas.hg@dom66.de>
parents: 558
diff changeset
1718 sstate->MISSING = Py_NewRef(missing);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1719 Py_RETURN_NONE;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1720 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1721
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1722
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1723 static
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1724 PyObject *
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1725 sync_MARKER(PyObject *self, PyObject *marker)
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1726 {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1727 struct speedups_state *sstate;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1728
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1729 sstate = PyModule_GetState(self);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1730 if (sstate == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1731 PyErr_SetString(PyExc_RuntimeError, "no module state available");
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1732 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1733 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1734 if (sstate->MARKER != NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1735 PyErr_SetString(PyExc_RuntimeError, "_MARKER already set");
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1736 return NULL;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1737 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1738 sstate->MARKER = Py_NewRef(marker);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1739 Py_RETURN_NONE;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1740 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1741
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1742
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1743 static struct PyMethodDef speedups_methods[] = {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1744 {"fast_unquote", fast_unquote, METH_O, PyDoc_STR("C-implementation of configmix.unquote")},
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1745 {"fast_quote", fast_quote, METH_O, PyDoc_STR("C-implementation of configmix.quote")},
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1746 {"fast_pathstr2path", fast_pathstr2path, METH_O, PyDoc_STR("C-implementation of configmix.pathstr2path")},
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
1747 {"_fast_split_filters", fast_split_filters, METH_VARARGS, PyDoc_STR("C-implementation of configmix.config._split_filters")},
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1748 {"_fast_split_ns", fast_split_ns, METH_O, PyDoc_STR("C-implementation of configmix.config._split_ns")},
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1749 {"_fast_interpolate_variables", fast_interpolate_variables, METH_VARARGS, PyDoc_STR("C-implementation of configmix.config.Configuration.interpolate_variables")},
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1750 {"_fast_getvarl", (PyCFunction)fast_getvarl, METH_VARARGS | METH_KEYWORDS, PyDoc_STR("C-Implementation of configmix.config.Configuration.getvarl")},
610
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1751 {"_fast_getvarl_s", (PyCFunction)fast_getvarl_s, METH_VARARGS | METH_KEYWORDS, PyDoc_STR("C-Implementation of configmix.config.Configuration.getvarl_s")},
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1752 {"_fast_getvar", fast_getvar, METH_VARARGS, PyDoc_STR("C-Implementation of configmix.config.Configuration.getvar")},
764d4185c76a C-implementations of Configuration.getvarl_s() and Configuration.getvar()
Franz Glasner <fzglas.hg@dom66.de>
parents: 609
diff changeset
1753 {"_fast_getvar_s", fast_getvar_s, METH_VARARGS, PyDoc_STR("C-Implementation of configmix.config.Configuration.getvar_s")},
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1754 {"_sync_MISSING", sync_MISSING, METH_O, PyDoc_STR("Internal function to easily sync the _MISSING object with configmix.config")},
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1755 {"_sync_MARKER", sync_MARKER, METH_O, PyDoc_STR("Internal function to easily sync the _MARKER object with configmix.config")},
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1756 {NULL, NULL, 0, NULL}
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1757 };
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1758
547
1cbe8b0f2b78 Put the value of Py_LIMITED_API into the module dict when the C-extension is compiled against the stable API
Franz Glasner <fzglas.hg@dom66.de>
parents: 545
diff changeset
1759 #define STRINGIFY(s) #s
1cbe8b0f2b78 Put the value of Py_LIMITED_API into the module dict when the C-extension is compiled against the stable API
Franz Glasner <fzglas.hg@dom66.de>
parents: 545
diff changeset
1760 #define XSTRINGIFY(s) STRINGIFY(s)
1cbe8b0f2b78 Put the value of Py_LIMITED_API into the module dict when the C-extension is compiled against the stable API
Franz Glasner <fzglas.hg@dom66.de>
parents: 545
diff changeset
1761
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1762
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1763 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1764 int
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1765 speedups_exec(PyObject *module)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1766 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1767 struct speedups_state *sstate = PyModule_GetState(module);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1768
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1769 if (sstate == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1770 PyErr_SetString(PyExc_ImportError, "no module state available yet");
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1771 return -1;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1772 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1773
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1774 PyModule_AddStringConstant(module, "__release__", release);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1775 PyModule_AddStringConstant(module, "__date__", date);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1776 PyModule_AddStringConstant(module, "__author__", "Franz Glasner");
547
1cbe8b0f2b78 Put the value of Py_LIMITED_API into the module dict when the C-extension is compiled against the stable API
Franz Glasner <fzglas.hg@dom66.de>
parents: 545
diff changeset
1777 #if defined(Py_LIMITED_API)
1cbe8b0f2b78 Put the value of Py_LIMITED_API into the module dict when the C-extension is compiled against the stable API
Franz Glasner <fzglas.hg@dom66.de>
parents: 545
diff changeset
1778 PyModule_AddStringConstant(module, "Py_LIMITED_API", XSTRINGIFY(Py_LIMITED_API));
1cbe8b0f2b78 Put the value of Py_LIMITED_API into the module dict when the C-extension is compiled against the stable API
Franz Glasner <fzglas.hg@dom66.de>
parents: 545
diff changeset
1779 #endif
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1780
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1781 sstate->DOT = PyUnicode_FromStringAndSize(".", 1);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1782 if (sstate->DOT == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1783 return -1;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1784 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1785 PyUnicode_InternInPlace(&(sstate->DOT));
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1786
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1787 sstate->QUOTE = PyUnicode_FromStringAndSize("%", 1);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1788 if (sstate->QUOTE == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1789 return -1;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1790 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1791 PyUnicode_InternInPlace(&(sstate->QUOTE));
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1792
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1793 sstate->NS_SEPARATOR = PyUnicode_FromStringAndSize(":", 1);
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1794 if (sstate->NS_SEPARATOR == NULL) {
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1795 return -1;
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1796 }
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1797 PyUnicode_InternInPlace(&(sstate->NS_SEPARATOR));
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1798
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1799 sstate->FILTER_SEPARATOR = PyUnicode_FromStringAndSize("|", 1);
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1800 if (sstate->FILTER_SEPARATOR == NULL) {
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1801 return -1;
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1802 }
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1803 PyUnicode_InternInPlace(&(sstate->FILTER_SEPARATOR));
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1804
707
10fbc23b4dba Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 705
diff changeset
1805 sstate->FILTER_SEPARATOR_2 = PyUnicode_FromStringAndSize(",", 1);
10fbc23b4dba Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 705
diff changeset
1806 if (sstate->FILTER_SEPARATOR_2 == NULL) {
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
1807 return -1;
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
1808 }
707
10fbc23b4dba Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 705
diff changeset
1809 PyUnicode_InternInPlace(&(sstate->FILTER_SEPARATOR_2));
705
0485a033c95d FIX: Parsing a filter chain for the new filter-only expansions: parse them backwards and use "," as filter-chain separator here.
Franz Glasner <fzglas.hg@dom66.de>
parents: 704
diff changeset
1810
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1811 sstate->EMPTY_FILTER = PyUnicode_FromStringAndSize("Empty", 5);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1812 if (sstate->EMPTY_FILTER == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1813 return -1;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1814 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1815 PyUnicode_InternInPlace(&(sstate->EMPTY_FILTER));
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1816
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1817 sstate->NONE_FILTER = PyUnicode_FromStringAndSize("None", 4);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1818 if (sstate->NONE_FILTER == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1819 return -1;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1820 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1821 PyUnicode_InternInPlace(&(sstate->NONE_FILTER));
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1822
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1823 sstate->EMPTY_STR = PyUnicode_FromStringAndSize("", 0);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1824 if (sstate->EMPTY_STR == NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1825 return -1;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1826 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1827 PyUnicode_InternInPlace(&(sstate->EMPTY_STR));
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1828
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1829 sstate->QUOTE_MAP = Py_BuildValue(
656
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
1830 "{IsIsIsIsIsIsIsIsIsIsIsIs}",
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1831 0x25, "%x25", /* QUOTE: % */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1832 0x2e, "%x2e", /* DOT: . */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1833 0x3a, "%x3a", /* NS_SEPARATOR: : */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1834 0x23, "%x23", /* COMMENT/anchor: # */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1835 0x7c, "%x7c", /* FILTER_SEPARATOR: | */
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1836 0x22, "%x22",
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1837 0x27, "%x27",
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1838 0x7b, "%x7b",
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1839 0x7d, "%x7d",
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1840 0x5b, "%x5b",
656
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
1841 0x5d, "%x5d",
2b1c7a68f913 Enable indexed access to lists in the configuration using an access path string representation like "~NNN~"
Franz Glasner <fzglas.hg@dom66.de>
parents: 639
diff changeset
1842 0x7e, "%x7e"); /* tilde ~ */
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1843 if (sstate->QUOTE_MAP == NULL) {
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1844 return -1;
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1845 }
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1846
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1847 sstate->STARTTOK = PyUnicode_FromStringAndSize("{{", 2);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1848 if (sstate->STARTTOK == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1849 return -1;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1850 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1851 PyUnicode_InternInPlace(&(sstate->STARTTOK));
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1852
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1853 sstate->ENDTOK = PyUnicode_FromStringAndSize("}}", 2);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1854 if (sstate->ENDTOK == NULL) {
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1855 return -1;
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1856 }
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1857 PyUnicode_InternInPlace(&(sstate->ENDTOK));
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1858
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1859 sstate->ENDTOK_FILTER = PyUnicode_FromStringAndSize("|}}", 3);
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1860 if (sstate->ENDTOK_FILTER == NULL) {
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1861 return -1;
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1862 }
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1863 PyUnicode_InternInPlace(&(sstate->ENDTOK_FILTER));
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1864
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1865 sstate->REF_NAMESPACE = PyUnicode_FromStringAndSize("ref", 3);
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1866 if (sstate->REF_NAMESPACE == NULL) {
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1867 return -1;
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1868 }
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1869 PyUnicode_InternInPlace(&(sstate->REF_NAMESPACE));
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1870
639
999cfca55d25 FIX: {{::DEL::}} has 11 chars instead of 3
Franz Glasner <fzglas.hg@dom66.de>
parents: 637
diff changeset
1871 sstate->DEL_VALUE = PyUnicode_FromStringAndSize("{{::DEL::}}", 11);
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1872 if (sstate->DEL_VALUE == NULL) {
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1873 return -1;
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1874 }
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1875 PyUnicode_InternInPlace(&(sstate->DEL_VALUE));
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1876
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1877 return 0;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1878 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1879
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1880
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1881 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1882 int
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1883 speeeupds_traverse(PyObject *module, visitproc visit, void *arg)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1884 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1885 struct speedups_state *sstate = PyModule_GetState(module);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1886
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1887 if (sstate != NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1888 Py_VISIT(sstate->DOT);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1889 Py_VISIT(sstate->QUOTE);
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1890 Py_VISIT(sstate->NS_SEPARATOR);
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1891 Py_VISIT(sstate->FILTER_SEPARATOR);
707
10fbc23b4dba Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 705
diff changeset
1892 Py_VISIT(sstate->FILTER_SEPARATOR_2);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1893 Py_VISIT(sstate->EMPTY_FILTER);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1894 Py_VISIT(sstate->NONE_FILTER);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1895 Py_VISIT(sstate->EMPTY_STR);
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1896 Py_VISIT(sstate->QUOTE_MAP);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1897 Py_VISIT(sstate->MISSING);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1898 Py_VISIT(sstate->MARKER);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1899 Py_VISIT(sstate->STARTTOK);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1900 Py_VISIT(sstate->ENDTOK);
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1901 Py_VISIT(sstate->ENDTOK_FILTER);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1902 Py_VISIT(sstate->REF_NAMESPACE);
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1903 Py_VISIT(sstate->DEL_VALUE);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1904 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1905 return 0;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1906 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1907
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1908
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1909 static
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1910 int
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1911 speedups_clear(PyObject *module)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1912 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1913 struct speedups_state *sstate = PyModule_GetState(module);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1914
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1915 if (sstate != NULL) {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1916 Py_CLEAR(sstate->DOT);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1917 Py_CLEAR(sstate->QUOTE);
543
491413368c7c Added also a fast C-implementation of configmix.config._split_ns
Franz Glasner <fzglas.hg@dom66.de>
parents: 542
diff changeset
1918 Py_CLEAR(sstate->NS_SEPARATOR);
552
39e5d07d8dbc Provide a C implementation of configmix.config._split_filters.
Franz Glasner <fzglas.hg@dom66.de>
parents: 550
diff changeset
1919 Py_CLEAR(sstate->FILTER_SEPARATOR);
707
10fbc23b4dba Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 705
diff changeset
1920 Py_CLEAR(sstate->FILTER_SEPARATOR_2);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1921 Py_CLEAR(sstate->EMPTY_FILTER);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1922 Py_CLEAR(sstate->NONE_FILTER);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1923 Py_CLEAR(sstate->EMPTY_STR);
550
79db28e879f8 Provide a C-implementation of configmix.config.quote() also: fast_quote
Franz Glasner <fzglas.hg@dom66.de>
parents: 549
diff changeset
1924 Py_CLEAR(sstate->QUOTE_MAP);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1925 Py_CLEAR(sstate->MISSING);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1926 Py_CLEAR(sstate->MARKER);
554
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1927 Py_CLEAR(sstate->STARTTOK);
36d7aa000435 Implement a C-version of Configuration.interpolate_variables
Franz Glasner <fzglas.hg@dom66.de>
parents: 553
diff changeset
1928 Py_CLEAR(sstate->ENDTOK);
703
193a616e0b3c Begin implementation of filter-only expansions (recursive with respect to expansion)
Franz Glasner <fzglas.hg@dom66.de>
parents: 656
diff changeset
1929 Py_CLEAR(sstate->ENDTOK_FILTER);
603
e55a42144ba9 C-implementations for Configuration.getvarl() and Configuration.getvar_s()
Franz Glasner <fzglas.hg@dom66.de>
parents: 602
diff changeset
1930 Py_CLEAR(sstate->REF_NAMESPACE);
637
4499e9b4855d The ``{{::DEL::}}`` is not subject to interpolation any more.
Franz Glasner <f.glasner@feldmann-mg.com>
parents: 630
diff changeset
1931 Py_CLEAR(sstate->DEL_VALUE);
542
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1932 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1933 return 0;
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1934 }
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1935
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1936
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1937 static struct PyModuleDef_Slot speedups_slots[] = {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1938 {Py_mod_exec, speedups_exec},
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1939 {0, NULL}
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1940 };
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1941
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1942
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1943 static struct PyModuleDef speedups_def = {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1944 PyModuleDef_HEAD_INIT, /* m_base */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1945 "_speedups", /* m_name (relative) */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1946 PyDoc_STR("Speedups for configmix"), /* m_doc */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1947 sizeof(struct speedups_state), /* m_size */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1948 speedups_methods, /* m_methods */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1949 speedups_slots, /* m_slots */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1950 speeeupds_traverse, /* m_traverse */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1951 speedups_clear, /* m_clear */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1952 NULL /* m_free */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1953 };
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1954
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1955
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1956 PyMODINIT_FUNC
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1957 PyInit__speedups(void)
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1958 {
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1959 /*
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1960 * Use multi-phase extension module initialization (PEP 489).
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1961 * This is Python 3.5+.
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1962 */
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1963 return PyModuleDef_Init(&speedups_def);
f71d34dda19f Add an optional C-implementation for configmix.config.unquote and configmix.config.pathstr2path.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1964 }