##// END OF EJS Templates
diffhelpers: use Py_ssize_t in testhunk()...
Adrian Buehlmann -
r16695:0a0933d3 default
parent child Browse files
Show More
@@ -1,197 +1,197
1 /*
1 /*
2 * diffhelpers.c - helper routines for mpatch
2 * diffhelpers.c - helper routines for mpatch
3 *
3 *
4 * Copyright 2007 Chris Mason <chris.mason@oracle.com>
4 * Copyright 2007 Chris Mason <chris.mason@oracle.com>
5 *
5 *
6 * This software may be used and distributed according to the terms
6 * This software may be used and distributed according to the terms
7 * of the GNU General Public License v2, incorporated herein by reference.
7 * of the GNU General Public License v2, incorporated herein by reference.
8 */
8 */
9
9
10 #include <Python.h>
10 #include <Python.h>
11 #include <stdlib.h>
11 #include <stdlib.h>
12 #include <string.h>
12 #include <string.h>
13
13
14 #include "util.h"
14 #include "util.h"
15
15
16 static char diffhelpers_doc[] = "Efficient diff parsing";
16 static char diffhelpers_doc[] = "Efficient diff parsing";
17 static PyObject *diffhelpers_Error;
17 static PyObject *diffhelpers_Error;
18
18
19
19
20 /* fixup the last lines of a and b when the patch has no newline at eof */
20 /* fixup the last lines of a and b when the patch has no newline at eof */
21 static void _fix_newline(PyObject *hunk, PyObject *a, PyObject *b)
21 static void _fix_newline(PyObject *hunk, PyObject *a, PyObject *b)
22 {
22 {
23 Py_ssize_t hunksz = PyList_Size(hunk);
23 Py_ssize_t hunksz = PyList_Size(hunk);
24 PyObject *s = PyList_GET_ITEM(hunk, hunksz-1);
24 PyObject *s = PyList_GET_ITEM(hunk, hunksz-1);
25 char *l = PyBytes_AsString(s);
25 char *l = PyBytes_AsString(s);
26 Py_ssize_t alen = PyList_Size(a);
26 Py_ssize_t alen = PyList_Size(a);
27 Py_ssize_t blen = PyList_Size(b);
27 Py_ssize_t blen = PyList_Size(b);
28 char c = l[0];
28 char c = l[0];
29 PyObject *hline;
29 PyObject *hline;
30 Py_ssize_t sz = PyBytes_GET_SIZE(s);
30 Py_ssize_t sz = PyBytes_GET_SIZE(s);
31
31
32 if (sz > 1 && l[sz-2] == '\r')
32 if (sz > 1 && l[sz-2] == '\r')
33 /* tolerate CRLF in last line */
33 /* tolerate CRLF in last line */
34 sz -= 1;
34 sz -= 1;
35
35
36 hline = PyBytes_FromStringAndSize(l, sz-1);
36 hline = PyBytes_FromStringAndSize(l, sz-1);
37
37
38 if (c == ' ' || c == '+') {
38 if (c == ' ' || c == '+') {
39 PyObject *rline = PyBytes_FromStringAndSize(l + 1, sz - 2);
39 PyObject *rline = PyBytes_FromStringAndSize(l + 1, sz - 2);
40 PyList_SetItem(b, blen-1, rline);
40 PyList_SetItem(b, blen-1, rline);
41 }
41 }
42 if (c == ' ' || c == '-') {
42 if (c == ' ' || c == '-') {
43 Py_INCREF(hline);
43 Py_INCREF(hline);
44 PyList_SetItem(a, alen-1, hline);
44 PyList_SetItem(a, alen-1, hline);
45 }
45 }
46 PyList_SetItem(hunk, hunksz-1, hline);
46 PyList_SetItem(hunk, hunksz-1, hline);
47 }
47 }
48
48
49 /* python callable form of _fix_newline */
49 /* python callable form of _fix_newline */
50 static PyObject *
50 static PyObject *
51 fix_newline(PyObject *self, PyObject *args)
51 fix_newline(PyObject *self, PyObject *args)
52 {
52 {
53 PyObject *hunk, *a, *b;
53 PyObject *hunk, *a, *b;
54 if (!PyArg_ParseTuple(args, "OOO", &hunk, &a, &b))
54 if (!PyArg_ParseTuple(args, "OOO", &hunk, &a, &b))
55 return NULL;
55 return NULL;
56 _fix_newline(hunk, a, b);
56 _fix_newline(hunk, a, b);
57 return Py_BuildValue("l", 0);
57 return Py_BuildValue("l", 0);
58 }
58 }
59
59
60 #if (PY_VERSION_HEX < 0x02050000)
60 #if (PY_VERSION_HEX < 0x02050000)
61 static const char *addlines_format = "OOiiOO";
61 static const char *addlines_format = "OOiiOO";
62 #else
62 #else
63 static const char *addlines_format = "OOnnOO";
63 static const char *addlines_format = "OOnnOO";
64 #endif
64 #endif
65
65
66 /*
66 /*
67 * read lines from fp into the hunk. The hunk is parsed into two arrays
67 * read lines from fp into the hunk. The hunk is parsed into two arrays
68 * a and b. a gets the old state of the text, b gets the new state
68 * a and b. a gets the old state of the text, b gets the new state
69 * The control char from the hunk is saved when inserting into a, but not b
69 * The control char from the hunk is saved when inserting into a, but not b
70 * (for performance while deleting files)
70 * (for performance while deleting files)
71 */
71 */
72 static PyObject *
72 static PyObject *
73 addlines(PyObject *self, PyObject *args)
73 addlines(PyObject *self, PyObject *args)
74 {
74 {
75
75
76 PyObject *fp, *hunk, *a, *b, *x;
76 PyObject *fp, *hunk, *a, *b, *x;
77 Py_ssize_t i;
77 Py_ssize_t i;
78 Py_ssize_t lena, lenb;
78 Py_ssize_t lena, lenb;
79 Py_ssize_t num;
79 Py_ssize_t num;
80 Py_ssize_t todoa, todob;
80 Py_ssize_t todoa, todob;
81 char *s, c;
81 char *s, c;
82 PyObject *l;
82 PyObject *l;
83 if (!PyArg_ParseTuple(args, addlines_format,
83 if (!PyArg_ParseTuple(args, addlines_format,
84 &fp, &hunk, &lena, &lenb, &a, &b))
84 &fp, &hunk, &lena, &lenb, &a, &b))
85 return NULL;
85 return NULL;
86
86
87 while (1) {
87 while (1) {
88 todoa = lena - PyList_Size(a);
88 todoa = lena - PyList_Size(a);
89 todob = lenb - PyList_Size(b);
89 todob = lenb - PyList_Size(b);
90 num = todoa > todob ? todoa : todob;
90 num = todoa > todob ? todoa : todob;
91 if (num == 0)
91 if (num == 0)
92 break;
92 break;
93 for (i = 0; i < num; i++) {
93 for (i = 0; i < num; i++) {
94 x = PyFile_GetLine(fp, 0);
94 x = PyFile_GetLine(fp, 0);
95 s = PyBytes_AsString(x);
95 s = PyBytes_AsString(x);
96 c = *s;
96 c = *s;
97 if (strcmp(s, "\\ No newline at end of file\n") == 0) {
97 if (strcmp(s, "\\ No newline at end of file\n") == 0) {
98 _fix_newline(hunk, a, b);
98 _fix_newline(hunk, a, b);
99 continue;
99 continue;
100 }
100 }
101 if (c == '\n') {
101 if (c == '\n') {
102 /* Some patches may be missing the control char
102 /* Some patches may be missing the control char
103 * on empty lines. Supply a leading space. */
103 * on empty lines. Supply a leading space. */
104 Py_DECREF(x);
104 Py_DECREF(x);
105 x = PyBytes_FromString(" \n");
105 x = PyBytes_FromString(" \n");
106 }
106 }
107 PyList_Append(hunk, x);
107 PyList_Append(hunk, x);
108 if (c == '+') {
108 if (c == '+') {
109 l = PyBytes_FromString(s + 1);
109 l = PyBytes_FromString(s + 1);
110 PyList_Append(b, l);
110 PyList_Append(b, l);
111 Py_DECREF(l);
111 Py_DECREF(l);
112 } else if (c == '-') {
112 } else if (c == '-') {
113 PyList_Append(a, x);
113 PyList_Append(a, x);
114 } else {
114 } else {
115 l = PyBytes_FromString(s + 1);
115 l = PyBytes_FromString(s + 1);
116 PyList_Append(b, l);
116 PyList_Append(b, l);
117 Py_DECREF(l);
117 Py_DECREF(l);
118 PyList_Append(a, x);
118 PyList_Append(a, x);
119 }
119 }
120 Py_DECREF(x);
120 Py_DECREF(x);
121 }
121 }
122 }
122 }
123 return Py_BuildValue("l", 0);
123 return Py_BuildValue("l", 0);
124 }
124 }
125
125
126 /*
126 /*
127 * compare the lines in a with the lines in b. a is assumed to have
127 * compare the lines in a with the lines in b. a is assumed to have
128 * a control char at the start of each line, this char is ignored in the
128 * a control char at the start of each line, this char is ignored in the
129 * compare
129 * compare
130 */
130 */
131 static PyObject *
131 static PyObject *
132 testhunk(PyObject *self, PyObject *args)
132 testhunk(PyObject *self, PyObject *args)
133 {
133 {
134
134
135 PyObject *a, *b;
135 PyObject *a, *b;
136 long bstart;
136 long bstart;
137 int alen, blen;
137 Py_ssize_t alen, blen;
138 int i;
138 Py_ssize_t i;
139 char *sa, *sb;
139 char *sa, *sb;
140
140
141 if (!PyArg_ParseTuple(args, "OOl", &a, &b, &bstart))
141 if (!PyArg_ParseTuple(args, "OOl", &a, &b, &bstart))
142 return NULL;
142 return NULL;
143 alen = PyList_Size(a);
143 alen = PyList_Size(a);
144 blen = PyList_Size(b);
144 blen = PyList_Size(b);
145 if (alen > blen - bstart || bstart < 0) {
145 if (alen > blen - bstart || bstart < 0) {
146 return Py_BuildValue("l", -1);
146 return Py_BuildValue("l", -1);
147 }
147 }
148 for (i = 0; i < alen; i++) {
148 for (i = 0; i < alen; i++) {
149 sa = PyBytes_AsString(PyList_GET_ITEM(a, i));
149 sa = PyBytes_AsString(PyList_GET_ITEM(a, i));
150 sb = PyBytes_AsString(PyList_GET_ITEM(b, i + bstart));
150 sb = PyBytes_AsString(PyList_GET_ITEM(b, i + bstart));
151 if (strcmp(sa + 1, sb) != 0)
151 if (strcmp(sa + 1, sb) != 0)
152 return Py_BuildValue("l", -1);
152 return Py_BuildValue("l", -1);
153 }
153 }
154 return Py_BuildValue("l", 0);
154 return Py_BuildValue("l", 0);
155 }
155 }
156
156
157 static PyMethodDef methods[] = {
157 static PyMethodDef methods[] = {
158 {"addlines", addlines, METH_VARARGS, "add lines to a hunk\n"},
158 {"addlines", addlines, METH_VARARGS, "add lines to a hunk\n"},
159 {"fix_newline", fix_newline, METH_VARARGS, "fixup newline counters\n"},
159 {"fix_newline", fix_newline, METH_VARARGS, "fixup newline counters\n"},
160 {"testhunk", testhunk, METH_VARARGS, "test lines in a hunk\n"},
160 {"testhunk", testhunk, METH_VARARGS, "test lines in a hunk\n"},
161 {NULL, NULL}
161 {NULL, NULL}
162 };
162 };
163
163
164 #ifdef IS_PY3K
164 #ifdef IS_PY3K
165 static struct PyModuleDef diffhelpers_module = {
165 static struct PyModuleDef diffhelpers_module = {
166 PyModuleDef_HEAD_INIT,
166 PyModuleDef_HEAD_INIT,
167 "diffhelpers",
167 "diffhelpers",
168 diffhelpers_doc,
168 diffhelpers_doc,
169 -1,
169 -1,
170 methods
170 methods
171 };
171 };
172
172
173 PyMODINIT_FUNC PyInit_diffhelpers(void)
173 PyMODINIT_FUNC PyInit_diffhelpers(void)
174 {
174 {
175 PyObject *m;
175 PyObject *m;
176
176
177 m = PyModule_Create(&diffhelpers_module);
177 m = PyModule_Create(&diffhelpers_module);
178 if (m == NULL)
178 if (m == NULL)
179 return NULL;
179 return NULL;
180
180
181 diffhelpers_Error = PyErr_NewException("diffhelpers.diffhelpersError",
181 diffhelpers_Error = PyErr_NewException("diffhelpers.diffhelpersError",
182 NULL, NULL);
182 NULL, NULL);
183 Py_INCREF(diffhelpers_Error);
183 Py_INCREF(diffhelpers_Error);
184 PyModule_AddObject(m, "diffhelpersError", diffhelpers_Error);
184 PyModule_AddObject(m, "diffhelpersError", diffhelpers_Error);
185
185
186 return m;
186 return m;
187 }
187 }
188 #else
188 #else
189 PyMODINIT_FUNC
189 PyMODINIT_FUNC
190 initdiffhelpers(void)
190 initdiffhelpers(void)
191 {
191 {
192 Py_InitModule3("diffhelpers", methods, diffhelpers_doc);
192 Py_InitModule3("diffhelpers", methods, diffhelpers_doc);
193 diffhelpers_Error = PyErr_NewException("diffhelpers.diffhelpersError",
193 diffhelpers_Error = PyErr_NewException("diffhelpers.diffhelpersError",
194 NULL, NULL);
194 NULL, NULL);
195 }
195 }
196 #endif
196 #endif
197
197
General Comments 0
You need to be logged in to leave comments. Login now