Skip to content

Commit 3661d27

Browse files
lysnikolaoulysnikolaou
committed
Renames to remove smelly symbols
1 parent 39257a0 commit 3661d27

File tree

11 files changed

+133
-133
lines changed

11 files changed

+133
-133
lines changed

‎Parser/lexer/buffer.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* Traverse and remember all f-string buffers, in order to be able to restore
77
them after reallocating tok->buf */
88
void
9-
remember_fstring_buffers(struct tok_state *tok)
9+
_PyLexer_remember_fstring_buffers(struct tok_state *tok)
1010
{
1111
int index;
1212
tokenizer_mode *mode;
@@ -20,7 +20,7 @@ remember_fstring_buffers(struct tok_state *tok)
2020

2121
/* Traverse and restore all f-string buffers after reallocating tok->buf */
2222
void
23-
restore_fstring_buffers(struct tok_state *tok)
23+
_PyLexer_restore_fstring_buffers(struct tok_state *tok)
2424
{
2525
int index;
2626
tokenizer_mode *mode;
@@ -47,7 +47,7 @@ restore_fstring_buffers(struct tok_state *tok)
4747
reached): see tok_nextc and its calls to tok_reserve_buf.
4848
*/
4949
int
50-
tok_reserve_buf(struct tok_state *tok, Py_ssize_t size)
50+
_PyLexer_tok_reserve_buf(struct tok_state *tok, Py_ssize_t size)
5151
{
5252
Py_ssize_t cur = tok->cur - tok->buf;
5353
Py_ssize_t oldsize = tok->inp - tok->buf;
@@ -57,7 +57,7 @@ tok_reserve_buf(struct tok_state *tok, Py_ssize_t size)
5757
Py_ssize_t start = tok->start == NULL ? -1 : tok->start - tok->buf;
5858
Py_ssize_t line_start = tok->start == NULL ? -1 : tok->line_start - tok->buf;
5959
Py_ssize_t multi_line_start = tok->multi_line_start - tok->buf;
60-
remember_fstring_buffers(tok);
60+
_PyLexer_remember_fstring_buffers(tok);
6161
newbuf = (char *)PyMem_Realloc(newbuf, newsize);
6262
if (newbuf == NULL) {
6363
tok->done = E_NOMEM;
@@ -70,7 +70,7 @@ tok_reserve_buf(struct tok_state *tok, Py_ssize_t size)
7070
tok->start = start < 0 ? NULL : tok->buf + start;
7171
tok->line_start = line_start < 0 ? NULL : tok->buf + line_start;
7272
tok->multi_line_start = multi_line_start < 0 ? NULL : tok->buf + multi_line_start;
73-
restore_fstring_buffers(tok);
73+
_PyLexer_restore_fstring_buffers(tok);
7474
}
7575
return 1;
7676
}

‎Parser/lexer/buffer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "pyport.h"
55

6-
void remember_fstring_buffers(struct tok_state *tok);
7-
void restore_fstring_buffers(struct tok_state *tok);
8-
int tok_reserve_buf(struct tok_state *tok, Py_ssize_t size);
6+
void _PyLexer_remember_fstring_buffers(struct tok_state *tok);
7+
void _PyLexer_restore_fstring_buffers(struct tok_state *tok);
8+
int _PyLexer_tok_reserve_buf(struct tok_state *tok, Py_ssize_t size);
99

1010
#endif

‎Parser/lexer/lexer.c

+39-39
Large diffs are not rendered by default.

‎Parser/lexer/lexer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "state.h"
55

6-
int update_fstring_expr(struct tok_state *tok, char cur);
6+
int _PyLexer_update_fstring_expr(struct tok_state *tok, char cur);
77

88
int _PyTokenizer_Get(struct tok_state *, struct token *);
99

‎Parser/lexer/state.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/* Create and initialize a new tok_state structure */
1212
struct tok_state *
13-
tok_new(void)
13+
_PyTokenizer_tok_new(void)
1414
{
1515
struct tok_state *tok = (struct tok_state *)PyMem_Malloc(
1616
sizeof(struct tok_state));
@@ -113,7 +113,7 @@ _PyToken_Init(struct token *token) {
113113
}
114114

115115
int
116-
type_comment_token_setup(struct tok_state *tok, struct token *token, int type, int col_offset,
116+
_PyLexer_type_comment_token_setup(struct tok_state *tok, struct token *token, int type, int col_offset,
117117
int end_col_offset, const char *start, const char *end)
118118
{
119119
token->level = tok->level;
@@ -126,7 +126,7 @@ type_comment_token_setup(struct tok_state *tok, struct token *token, int type, i
126126
}
127127

128128
int
129-
token_setup(struct tok_state *tok, struct token *token, int type, const char *start, const char *end)
129+
_PyLexer_token_setup(struct tok_state *tok, struct token *token, int type, const char *start, const char *end)
130130
{
131131
assert((start == NULL && end == NULL) || (start != NULL && end != NULL));
132132
token->level = tok->level;

‎Parser/lexer/state.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ struct tok_state {
128128
#endif
129129
};
130130

131-
int type_comment_token_setup(struct tok_state *tok, struct token *token, int type, int col_offset,
131+
int _PyLexer_type_comment_token_setup(struct tok_state *tok, struct token *token, int type, int col_offset,
132132
int end_col_offset, const char *start, const char *end);
133-
int token_setup(struct tok_state *tok, struct token *token, int type, const char *start, const char *end);
133+
int _PyLexer_token_setup(struct tok_state *tok, struct token *token, int type, const char *start, const char *end);
134134

135-
struct tok_state *tok_new(void);
135+
struct tok_state *_PyTokenizer_tok_new(void);
136136
void _PyTokenizer_Free(struct tok_state *);
137137
void _PyToken_Free(struct token *);
138138
void _PyToken_Init(struct token *);

‎Parser/tokenizer/file_tokenizer.c

+21-21
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static int
5656
tok_readline_raw(struct tok_state *tok)
5757
{
5858
do {
59-
if (!tok_reserve_buf(tok, BUFSIZ)) {
59+
if (!_PyLexer_tok_reserve_buf(tok, BUFSIZ)) {
6060
return 0;
6161
}
6262
int n_chars = (int)(tok->end - tok->inp);
@@ -86,7 +86,7 @@ tok_readline_recode(struct tok_state *tok) {
8686
if (line == NULL) {
8787
line = PyObject_CallNoArgs(tok->decoding_readline);
8888
if (line == NULL) {
89-
error_ret(tok);
89+
_PyTokenizer_error_ret(tok);
9090
goto error;
9191
}
9292
}
@@ -95,14 +95,14 @@ tok_readline_recode(struct tok_state *tok) {
9595
}
9696
buf = PyUnicode_AsUTF8AndSize(line, &buflen);
9797
if (buf == NULL) {
98-
error_ret(tok);
98+
_PyTokenizer_error_ret(tok);
9999
goto error;
100100
}
101101
// Make room for the null terminator *and* potentially
102102
// an extra newline character that we may need to artificially
103103
// add.
104104
size_t buffer_size = buflen + 2;
105-
if (!tok_reserve_buf(tok, buffer_size)) {
105+
if (!_PyLexer_tok_reserve_buf(tok, buffer_size)) {
106106
goto error;
107107
}
108108
memcpy(tok->inp, buf, buflen);
@@ -132,7 +132,7 @@ static void fp_ungetc(int c, struct tok_state *tok) {
132132
/* Set the readline function for TOK to a StreamReader's
133133
readline function. The StreamReader is named ENC.
134134
135-
This function is called from check_bom and check_coding_spec.
135+
This function is called from _PyTokenizer_check_bom and _PyTokenizer_check_coding_spec.
136136
137137
ENC is usually identical to the future value of tok->encoding,
138138
except for the (currently unsupported) case of UTF-16.
@@ -195,7 +195,7 @@ tok_underflow_interactive(struct tok_state *tok) {
195195
}
196196
char *newtok = PyOS_Readline(tok->fp ? tok->fp : stdin, stdout, tok->prompt);
197197
if (newtok != NULL) {
198-
char *translated = translate_newlines(newtok, 0, 0, tok);
198+
char *translated = _PyTokenizer_translate_newlines(newtok, 0, 0, tok);
199199
PyMem_Free(newtok);
200200
if (translated == NULL) {
201201
return 0;
@@ -206,7 +206,7 @@ tok_underflow_interactive(struct tok_state *tok) {
206206
/* Recode to UTF-8 */
207207
Py_ssize_t buflen;
208208
const char* buf;
209-
PyObject *u = translate_into_utf8(newtok, tok->encoding);
209+
PyObject *u = _PyTokenizer_translate_into_utf8(newtok, tok->encoding);
210210
PyMem_Free(newtok);
211211
if (u == NULL) {
212212
tok->done = E_DECODE;
@@ -240,10 +240,10 @@ tok_underflow_interactive(struct tok_state *tok) {
240240
}
241241
else if (tok->start != NULL) {
242242
Py_ssize_t cur_multi_line_start = tok->multi_line_start - tok->buf;
243-
remember_fstring_buffers(tok);
243+
_PyLexer_remember_fstring_buffers(tok);
244244
size_t size = strlen(newtok);
245245
ADVANCE_LINENO();
246-
if (!tok_reserve_buf(tok, size + 1)) {
246+
if (!_PyLexer_tok_reserve_buf(tok, size + 1)) {
247247
PyMem_Free(tok->buf);
248248
tok->buf = NULL;
249249
PyMem_Free(newtok);
@@ -253,18 +253,18 @@ tok_underflow_interactive(struct tok_state *tok) {
253253
PyMem_Free(newtok);
254254
tok->inp += size;
255255
tok->multi_line_start = tok->buf + cur_multi_line_start;
256-
restore_fstring_buffers(tok);
256+
_PyLexer_restore_fstring_buffers(tok);
257257
}
258258
else {
259-
remember_fstring_buffers(tok);
259+
_PyLexer_remember_fstring_buffers(tok);
260260
ADVANCE_LINENO();
261261
PyMem_Free(tok->buf);
262262
tok->buf = newtok;
263263
tok->cur = tok->buf;
264264
tok->line_start = tok->buf;
265265
tok->inp = strchr(tok->buf, '\0');
266266
tok->end = tok->inp + 1;
267-
restore_fstring_buffers(tok);
267+
_PyLexer_restore_fstring_buffers(tok);
268268
}
269269
if (tok->done != E_OK) {
270270
if (tok->prompt != NULL) {
@@ -273,7 +273,7 @@ tok_underflow_interactive(struct tok_state *tok) {
273273
return 0;
274274
}
275275

276-
if (tok->tok_mode_stack_index && !update_fstring_expr(tok, 0)) {
276+
if (tok->tok_mode_stack_index && !_PyLexer_update_fstring_expr(tok, 0)) {
277277
return 0;
278278
}
279279
return 1;
@@ -288,8 +288,8 @@ tok_underflow_file(struct tok_state *tok) {
288288
/* We have not yet determined the encoding.
289289
If an encoding is found, use the file-pointer
290290
reader functions from now on. */
291-
if (!check_bom(fp_getc, fp_ungetc, fp_setreadl, tok)) {
292-
error_ret(tok);
291+
if (!_PyTokenizer_check_bom(fp_getc, fp_ungetc, fp_setreadl, tok)) {
292+
_PyTokenizer_error_ret(tok);
293293
return 0;
294294
}
295295
assert(tok->decoding_state != STATE_INIT);
@@ -320,7 +320,7 @@ tok_underflow_file(struct tok_state *tok) {
320320
tok->implicit_newline = 1;
321321
}
322322

323-
if (tok->tok_mode_stack_index && !update_fstring_expr(tok, 0)) {
323+
if (tok->tok_mode_stack_index && !_PyLexer_update_fstring_expr(tok, 0)) {
324324
return 0;
325325
}
326326

@@ -329,16 +329,16 @@ tok_underflow_file(struct tok_state *tok) {
329329
if (tok->lineno > 2) {
330330
tok->decoding_state = STATE_NORMAL;
331331
}
332-
else if (!check_coding_spec(tok->cur, strlen(tok->cur),
332+
else if (!_PyTokenizer_check_coding_spec(tok->cur, strlen(tok->cur),
333333
tok, fp_setreadl))
334334
{
335335
return 0;
336336
}
337337
}
338338
/* The default encoding is UTF-8, so make sure we don't have any
339339
non-UTF-8 sequences in it. */
340-
if (!tok->encoding && !ensure_utf8(tok->cur, tok)) {
341-
error_ret(tok);
340+
if (!tok->encoding && !_PyTokenizer_ensure_utf8(tok->cur, tok)) {
341+
_PyTokenizer_error_ret(tok);
342342
return 0;
343343
}
344344
assert(tok->done == E_OK);
@@ -350,7 +350,7 @@ struct tok_state *
350350
_PyTokenizer_FromFile(FILE *fp, const char* enc,
351351
const char *ps1, const char *ps2)
352352
{
353-
struct tok_state *tok = tok_new();
353+
struct tok_state *tok = _PyTokenizer_tok_new();
354354
if (tok == NULL)
355355
return NULL;
356356
if ((tok->buf = (char *)PyMem_Malloc(BUFSIZ)) == NULL) {
@@ -370,7 +370,7 @@ _PyTokenizer_FromFile(FILE *fp, const char* enc,
370370
if (enc != NULL) {
371371
/* Must copy encoding declaration since it
372372
gets copied into the parse tree. */
373-
tok->encoding = new_string(enc, strlen(enc), tok);
373+
tok->encoding = _PyTokenizer_new_string(enc, strlen(enc), tok);
374374
if (!tok->encoding) {
375375
_PyTokenizer_Free(tok);
376376
return NULL;

0 commit comments

Comments
 (0)