Skip to content

Commit a0c965e

Browse files
WillAydjreback
authored andcommitted
Remove usage of register keyword in Extension Modules (#26264)
1 parent 8ac3123 commit a0c965e

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

pandas/_libs/src/parser/tokenizer.c

+24-24
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void coliter_setup(coliter_t *self, parser_t *parser, int i, int start) {
4545
self->line_start = parser->line_start + start;
4646
}
4747

48-
coliter_t *coliter_new(register parser_t *self, int i) {
48+
coliter_t *coliter_new(parser_t *self, int i) {
4949
// column i, starting at 0
5050
coliter_t *iter = (coliter_t *)malloc(sizeof(coliter_t));
5151

@@ -97,7 +97,7 @@ static void *grow_buffer(void *buffer, int64_t length, int64_t *capacity,
9797
return newbuffer;
9898
}
9999

100-
void parser_set_default_options(register parser_t *self) {
100+
void parser_set_default_options(parser_t *self) {
101101
self->decimal = '.';
102102
self->sci = 'E';
103103

@@ -131,11 +131,11 @@ void parser_set_default_options(register parser_t *self) {
131131
self->skip_footer = 0;
132132
}
133133

134-
int get_parser_memory_footprint(register parser_t *self) { return 0; }
134+
int get_parser_memory_footprint(parser_t *self) { return 0; }
135135

136136
parser_t *parser_new() { return (parser_t *)calloc(1, sizeof(parser_t)); }
137137

138-
int parser_clear_data_buffers(register parser_t *self) {
138+
int parser_clear_data_buffers(parser_t *self) {
139139
free_if_not_null((void *)&self->stream);
140140
free_if_not_null((void *)&self->words);
141141
free_if_not_null((void *)&self->word_starts);
@@ -144,7 +144,7 @@ int parser_clear_data_buffers(register parser_t *self) {
144144
return 0;
145145
}
146146

147-
int parser_cleanup(register parser_t *self) {
147+
int parser_cleanup(parser_t *self) {
148148
int status = 0;
149149

150150
// XXX where to put this
@@ -170,7 +170,7 @@ int parser_cleanup(register parser_t *self) {
170170
return status;
171171
}
172172

173-
int parser_init(register parser_t *self) {
173+
int parser_init(parser_t *self) {
174174
int64_t sz;
175175

176176
/*
@@ -240,16 +240,16 @@ int parser_init(register parser_t *self) {
240240
return 0;
241241
}
242242

243-
void parser_free(register parser_t *self) {
243+
void parser_free(parser_t *self) {
244244
// opposite of parser_init
245245
parser_cleanup(self);
246246
}
247247

248-
void parser_del(register parser_t *self) {
248+
void parser_del(parser_t *self) {
249249
free(self);
250250
}
251251

252-
static int make_stream_space(register parser_t *self, size_t nbytes) {
252+
static int make_stream_space(parser_t *self, size_t nbytes) {
253253
int64_t i, cap, length;
254254
int status;
255255
void *orig_ptr, *newptr;
@@ -363,7 +363,7 @@ static int make_stream_space(register parser_t *self, size_t nbytes) {
363363
return 0;
364364
}
365365

366-
static int push_char(register parser_t *self, char c) {
366+
static int push_char(parser_t *self, char c) {
367367
TRACE(("push_char: self->stream[%zu] = %x, stream_cap=%zu\n",
368368
self->stream_len + 1, c, self->stream_cap))
369369
if (self->stream_len >= self->stream_cap) {
@@ -381,7 +381,7 @@ static int push_char(register parser_t *self, char c) {
381381
return 0;
382382
}
383383

384-
int PANDAS_INLINE end_field(register parser_t *self) {
384+
int PANDAS_INLINE end_field(parser_t *self) {
385385
// XXX cruft
386386
if (self->words_len >= self->words_cap) {
387387
TRACE(
@@ -419,7 +419,7 @@ int PANDAS_INLINE end_field(register parser_t *self) {
419419
return 0;
420420
}
421421

422-
static void append_warning(register parser_t *self, const char *msg) {
422+
static void append_warning(parser_t *self, const char *msg) {
423423
int64_t ex_length;
424424
int64_t length = strlen(msg);
425425
void *newptr;
@@ -437,7 +437,7 @@ static void append_warning(register parser_t *self, const char *msg) {
437437
}
438438
}
439439

440-
static int end_line(register parser_t *self) {
440+
static int end_line(parser_t *self) {
441441
char *msg;
442442
int64_t fields;
443443
int ex_fields = self->expected_fields;
@@ -556,7 +556,7 @@ static int end_line(register parser_t *self) {
556556
return 0;
557557
}
558558

559-
int parser_add_skiprow(register parser_t *self, int64_t row) {
559+
int parser_add_skiprow(parser_t *self, int64_t row) {
560560
khiter_t k;
561561
kh_int64_t *set;
562562
int ret = 0;
@@ -573,7 +573,7 @@ int parser_add_skiprow(register parser_t *self, int64_t row) {
573573
return 0;
574574
}
575575

576-
int parser_set_skipfirstnrows(register parser_t *self, int64_t nrows) {
576+
int parser_set_skipfirstnrows(parser_t *self, int64_t nrows) {
577577
// self->file_lines is zero based so subtract 1 from nrows
578578
if (nrows > 0) {
579579
self->skip_first_N_rows = nrows - 1;
@@ -582,7 +582,7 @@ int parser_set_skipfirstnrows(register parser_t *self, int64_t nrows) {
582582
return 0;
583583
}
584584

585-
static int parser_buffer_bytes(register parser_t *self, size_t nbytes) {
585+
static int parser_buffer_bytes(parser_t *self, size_t nbytes) {
586586
int status;
587587
size_t bytes_read;
588588

@@ -708,7 +708,7 @@ static int parser_buffer_bytes(register parser_t *self, size_t nbytes) {
708708
self->datapos += 3; \
709709
}
710710

711-
int skip_this_line(register parser_t *self, int64_t rownum) {
711+
int skip_this_line(parser_t *self, int64_t rownum) {
712712
int should_skip;
713713
PyObject *result;
714714
PyGILState_STATE state;
@@ -737,7 +737,7 @@ int skip_this_line(register parser_t *self, int64_t rownum) {
737737
}
738738
}
739739

740-
int tokenize_bytes(register parser_t *self,
740+
int tokenize_bytes(parser_t *self,
741741
size_t line_limit, int64_t start_lines) {
742742
int64_t i, slen;
743743
int should_skip;
@@ -1159,7 +1159,7 @@ int tokenize_bytes(register parser_t *self,
11591159
return 0;
11601160
}
11611161

1162-
static int parser_handle_eof(register parser_t *self) {
1162+
static int parser_handle_eof(parser_t *self) {
11631163
int64_t bufsize = 100;
11641164

11651165
TRACE(
@@ -1204,7 +1204,7 @@ static int parser_handle_eof(register parser_t *self) {
12041204
return 0;
12051205
}
12061206

1207-
int parser_consume_rows(register parser_t *self, size_t nrows) {
1207+
int parser_consume_rows(parser_t *self, size_t nrows) {
12081208
int64_t i, offset, word_deletions, char_count;
12091209

12101210
if (nrows > self->lines) {
@@ -1260,7 +1260,7 @@ static size_t _next_pow2(size_t sz) {
12601260
return result;
12611261
}
12621262

1263-
int parser_trim_buffers(register parser_t *self) {
1263+
int parser_trim_buffers(parser_t *self) {
12641264
/*
12651265
Free memory
12661266
*/
@@ -1363,7 +1363,7 @@ int parser_trim_buffers(register parser_t *self) {
13631363
all : tokenize all the data vs. certain number of rows
13641364
*/
13651365

1366-
int _tokenize_helper(register parser_t *self, size_t nrows, int all) {
1366+
int _tokenize_helper(parser_t *self, size_t nrows, int all) {
13671367
int status = 0;
13681368
int64_t start_lines = self->lines;
13691369

@@ -1412,12 +1412,12 @@ int _tokenize_helper(register parser_t *self, size_t nrows, int all) {
14121412
return status;
14131413
}
14141414

1415-
int tokenize_nrows(register parser_t *self, size_t nrows) {
1415+
int tokenize_nrows(parser_t *self, size_t nrows) {
14161416
int status = _tokenize_helper(self, nrows, 0);
14171417
return status;
14181418
}
14191419

1420-
int tokenize_all_rows(register parser_t *self) {
1420+
int tokenize_all_rows(parser_t *self) {
14211421
int status = _tokenize_helper(self, -1, 1);
14221422
return status;
14231423
}

pandas/_libs/src/parser/tokenizer.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ typedef struct coliter_t {
212212
} coliter_t;
213213

214214
void coliter_setup(coliter_t *self, parser_t *parser, int i, int start);
215-
coliter_t *coliter_new(register parser_t *self, int i);
215+
coliter_t *coliter_new(parser_t *self, int i);
216216

217217
#define COLITER_NEXT(iter, word) \
218218
do { \
@@ -222,25 +222,25 @@ coliter_t *coliter_new(register parser_t *self, int i);
222222

223223
parser_t *parser_new(void);
224224

225-
int parser_init(register parser_t *self);
225+
int parser_init(parser_t *self);
226226

227-
int parser_consume_rows(register parser_t *self, size_t nrows);
227+
int parser_consume_rows(parser_t *self, size_t nrows);
228228

229-
int parser_trim_buffers(register parser_t *self);
229+
int parser_trim_buffers(parser_t *self);
230230

231-
int parser_add_skiprow(register parser_t *self, int64_t row);
231+
int parser_add_skiprow(parser_t *self, int64_t row);
232232

233-
int parser_set_skipfirstnrows(register parser_t *self, int64_t nrows);
233+
int parser_set_skipfirstnrows(parser_t *self, int64_t nrows);
234234

235-
void parser_free(register parser_t *self);
235+
void parser_free(parser_t *self);
236236

237-
void parser_del(register parser_t *self);
237+
void parser_del(parser_t *self);
238238

239-
void parser_set_default_options(register parser_t *self);
239+
void parser_set_default_options(parser_t *self);
240240

241-
int tokenize_nrows(register parser_t *self, size_t nrows);
241+
int tokenize_nrows(parser_t *self, size_t nrows);
242242

243-
int tokenize_all_rows(register parser_t *self);
243+
int tokenize_all_rows(parser_t *self);
244244

245245
// Have parsed / type-converted a chunk of data
246246
// and want to free memory from the token stream

0 commit comments

Comments
 (0)