@@ -45,7 +45,7 @@ void coliter_setup(coliter_t *self, parser_t *parser, int i, int start) {
45
45
self -> line_start = parser -> line_start + start ;
46
46
}
47
47
48
- coliter_t * coliter_new (register parser_t * self , int i ) {
48
+ coliter_t * coliter_new (parser_t * self , int i ) {
49
49
// column i, starting at 0
50
50
coliter_t * iter = (coliter_t * )malloc (sizeof (coliter_t ));
51
51
@@ -97,7 +97,7 @@ static void *grow_buffer(void *buffer, int64_t length, int64_t *capacity,
97
97
return newbuffer ;
98
98
}
99
99
100
- void parser_set_default_options (register parser_t * self ) {
100
+ void parser_set_default_options (parser_t * self ) {
101
101
self -> decimal = '.' ;
102
102
self -> sci = 'E' ;
103
103
@@ -131,11 +131,11 @@ void parser_set_default_options(register parser_t *self) {
131
131
self -> skip_footer = 0 ;
132
132
}
133
133
134
- int get_parser_memory_footprint (register parser_t * self ) { return 0 ; }
134
+ int get_parser_memory_footprint (parser_t * self ) { return 0 ; }
135
135
136
136
parser_t * parser_new () { return (parser_t * )calloc (1 , sizeof (parser_t )); }
137
137
138
- int parser_clear_data_buffers (register parser_t * self ) {
138
+ int parser_clear_data_buffers (parser_t * self ) {
139
139
free_if_not_null ((void * )& self -> stream );
140
140
free_if_not_null ((void * )& self -> words );
141
141
free_if_not_null ((void * )& self -> word_starts );
@@ -144,7 +144,7 @@ int parser_clear_data_buffers(register parser_t *self) {
144
144
return 0 ;
145
145
}
146
146
147
- int parser_cleanup (register parser_t * self ) {
147
+ int parser_cleanup (parser_t * self ) {
148
148
int status = 0 ;
149
149
150
150
// XXX where to put this
@@ -170,7 +170,7 @@ int parser_cleanup(register parser_t *self) {
170
170
return status ;
171
171
}
172
172
173
- int parser_init (register parser_t * self ) {
173
+ int parser_init (parser_t * self ) {
174
174
int64_t sz ;
175
175
176
176
/*
@@ -240,16 +240,16 @@ int parser_init(register parser_t *self) {
240
240
return 0 ;
241
241
}
242
242
243
- void parser_free (register parser_t * self ) {
243
+ void parser_free (parser_t * self ) {
244
244
// opposite of parser_init
245
245
parser_cleanup (self );
246
246
}
247
247
248
- void parser_del (register parser_t * self ) {
248
+ void parser_del (parser_t * self ) {
249
249
free (self );
250
250
}
251
251
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 ) {
253
253
int64_t i , cap , length ;
254
254
int status ;
255
255
void * orig_ptr , * newptr ;
@@ -363,7 +363,7 @@ static int make_stream_space(register parser_t *self, size_t nbytes) {
363
363
return 0 ;
364
364
}
365
365
366
- static int push_char (register parser_t * self , char c ) {
366
+ static int push_char (parser_t * self , char c ) {
367
367
TRACE (("push_char: self->stream[%zu] = %x, stream_cap=%zu\n" ,
368
368
self -> stream_len + 1 , c , self -> stream_cap ))
369
369
if (self -> stream_len >= self -> stream_cap ) {
@@ -381,7 +381,7 @@ static int push_char(register parser_t *self, char c) {
381
381
return 0 ;
382
382
}
383
383
384
- int PANDAS_INLINE end_field (register parser_t * self ) {
384
+ int PANDAS_INLINE end_field (parser_t * self ) {
385
385
// XXX cruft
386
386
if (self -> words_len >= self -> words_cap ) {
387
387
TRACE (
@@ -419,7 +419,7 @@ int PANDAS_INLINE end_field(register parser_t *self) {
419
419
return 0 ;
420
420
}
421
421
422
- static void append_warning (register parser_t * self , const char * msg ) {
422
+ static void append_warning (parser_t * self , const char * msg ) {
423
423
int64_t ex_length ;
424
424
int64_t length = strlen (msg );
425
425
void * newptr ;
@@ -437,7 +437,7 @@ static void append_warning(register parser_t *self, const char *msg) {
437
437
}
438
438
}
439
439
440
- static int end_line (register parser_t * self ) {
440
+ static int end_line (parser_t * self ) {
441
441
char * msg ;
442
442
int64_t fields ;
443
443
int ex_fields = self -> expected_fields ;
@@ -556,7 +556,7 @@ static int end_line(register parser_t *self) {
556
556
return 0 ;
557
557
}
558
558
559
- int parser_add_skiprow (register parser_t * self , int64_t row ) {
559
+ int parser_add_skiprow (parser_t * self , int64_t row ) {
560
560
khiter_t k ;
561
561
kh_int64_t * set ;
562
562
int ret = 0 ;
@@ -573,7 +573,7 @@ int parser_add_skiprow(register parser_t *self, int64_t row) {
573
573
return 0 ;
574
574
}
575
575
576
- int parser_set_skipfirstnrows (register parser_t * self , int64_t nrows ) {
576
+ int parser_set_skipfirstnrows (parser_t * self , int64_t nrows ) {
577
577
// self->file_lines is zero based so subtract 1 from nrows
578
578
if (nrows > 0 ) {
579
579
self -> skip_first_N_rows = nrows - 1 ;
@@ -582,7 +582,7 @@ int parser_set_skipfirstnrows(register parser_t *self, int64_t nrows) {
582
582
return 0 ;
583
583
}
584
584
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 ) {
586
586
int status ;
587
587
size_t bytes_read ;
588
588
@@ -708,7 +708,7 @@ static int parser_buffer_bytes(register parser_t *self, size_t nbytes) {
708
708
self->datapos += 3; \
709
709
}
710
710
711
- int skip_this_line (register parser_t * self , int64_t rownum ) {
711
+ int skip_this_line (parser_t * self , int64_t rownum ) {
712
712
int should_skip ;
713
713
PyObject * result ;
714
714
PyGILState_STATE state ;
@@ -737,7 +737,7 @@ int skip_this_line(register parser_t *self, int64_t rownum) {
737
737
}
738
738
}
739
739
740
- int tokenize_bytes (register parser_t * self ,
740
+ int tokenize_bytes (parser_t * self ,
741
741
size_t line_limit , int64_t start_lines ) {
742
742
int64_t i , slen ;
743
743
int should_skip ;
@@ -1159,7 +1159,7 @@ int tokenize_bytes(register parser_t *self,
1159
1159
return 0 ;
1160
1160
}
1161
1161
1162
- static int parser_handle_eof (register parser_t * self ) {
1162
+ static int parser_handle_eof (parser_t * self ) {
1163
1163
int64_t bufsize = 100 ;
1164
1164
1165
1165
TRACE (
@@ -1204,7 +1204,7 @@ static int parser_handle_eof(register parser_t *self) {
1204
1204
return 0 ;
1205
1205
}
1206
1206
1207
- int parser_consume_rows (register parser_t * self , size_t nrows ) {
1207
+ int parser_consume_rows (parser_t * self , size_t nrows ) {
1208
1208
int64_t i , offset , word_deletions , char_count ;
1209
1209
1210
1210
if (nrows > self -> lines ) {
@@ -1260,7 +1260,7 @@ static size_t _next_pow2(size_t sz) {
1260
1260
return result ;
1261
1261
}
1262
1262
1263
- int parser_trim_buffers (register parser_t * self ) {
1263
+ int parser_trim_buffers (parser_t * self ) {
1264
1264
/*
1265
1265
Free memory
1266
1266
*/
@@ -1363,7 +1363,7 @@ int parser_trim_buffers(register parser_t *self) {
1363
1363
all : tokenize all the data vs. certain number of rows
1364
1364
*/
1365
1365
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 ) {
1367
1367
int status = 0 ;
1368
1368
int64_t start_lines = self -> lines ;
1369
1369
@@ -1412,12 +1412,12 @@ int _tokenize_helper(register parser_t *self, size_t nrows, int all) {
1412
1412
return status ;
1413
1413
}
1414
1414
1415
- int tokenize_nrows (register parser_t * self , size_t nrows ) {
1415
+ int tokenize_nrows (parser_t * self , size_t nrows ) {
1416
1416
int status = _tokenize_helper (self , nrows , 0 );
1417
1417
return status ;
1418
1418
}
1419
1419
1420
- int tokenize_all_rows (register parser_t * self ) {
1420
+ int tokenize_all_rows (parser_t * self ) {
1421
1421
int status = _tokenize_helper (self , -1 , 1 );
1422
1422
return status ;
1423
1423
}
0 commit comments