Skip to content
Snippets Groups Projects
Commit 22d6c923 authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Optimized find_next() some more. 

Rev: src/iterators.cmod:1.13
parent e0d19571
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 169 additions and 139 deletions
src/iterators.cmod
+ 169
− 139
View file @ 22d6c923
......@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
RCSID("$Id: iterators.cmod,v 1.12 2001/06/16 13:51:15 per Exp $");
RCSID("$Id: iterators.cmod,v 1.13 2001/06/17 15:59:05 grubba Exp $");
#include "main.h"
#include "object.h"
#include "mapping.h"
......@@ -632,7 +632,7 @@ PIKECLASS string_split_iterator
CVAR int flags;
CVAR struct svalue feed;
#define SIMPLE_SKIP_CASE(THIS, SHIFT, OFF) case SHIFT: \
#define SIMPLE_SKIP(THIS, SHIFT, OFF) \
do { \
PIKE_CONCAT(p_wchar, SHIFT) *s = \
PIKE_CONCAT(STR,SHIFT)(THIS->buffer); \
......@@ -640,10 +640,14 @@ PIKECLASS string_split_iterator
s[OFF] == THIS->split_set[0]) { \
OFF++; \
} \
} while(0); \
} while(0)
#define SIMPLE_SKIP_CASE(THIS, SHIFT, OFF) \
case SHIFT: \
SIMPLE_SKIP(THIS, SHIFT, OFF); \
break
#define COMPLEX_SKIP_CASE(THIS, SHIFT, OFF) case SHIFT: \
#define COMPLEX_SKIP(THIS, SHIFT, OFF) \
do { \
PIKE_CONCAT(p_wchar, SHIFT) *s = \
PIKE_CONCAT(STR,SHIFT)(THIS->buffer); \
......@@ -659,10 +663,14 @@ PIKECLASS string_split_iterator
PIKE_CONCAT(continue_skip,SHIFT): \
OFF++; \
} \
} while(0); \
} while(0)
#define COMPLEX_SKIP_CASE(THIS, SHIFT, OFF) \
case SHIFT: \
COMPLEX_SKIP(THIS, SHIFT, OFF); \
break
#define SIMPLE_SCAN_CASE(THIS, SHIFT, OFF) case SHIFT: \
#define SIMPLE_SCAN(THIS, SHIFT, OFF) \
do { \
PIKE_CONCAT(p_wchar, SHIFT) *s = \
PIKE_CONCAT(STR,SHIFT)(THIS->buffer); \
......@@ -670,10 +678,14 @@ PIKECLASS string_split_iterator
s[OFF] != THIS->split_set[0]) { \
OFF++; \
} \
} while(0); \
} while(0)
#define SIMPLE_SCAN_CASE(THIS, SHIFT, OFF) \
case SHIFT: \
SIMPLE_SCAN(THIS, SHIFT, OFF); \
break
#define COMPLEX_SCAN_CASE(THIS, SHIFT, OFF) case SHIFT: \
#define COMPLEX_SCAN(THIS, SHIFT, OFF) \
do { \
PIKE_CONCAT(p_wchar, SHIFT) *s = \
PIKE_CONCAT(STR,SHIFT)(THIS->buffer); \
......@@ -688,10 +700,14 @@ PIKECLASS string_split_iterator
OFF++; \
} \
PIKE_CONCAT(break_scan, SHIFT): ;/* gcc complains without ;*/ \
} while(0); \
} while(0)
#define COMPLEX_SCAN_CASE(THIS, SHIFT, OFF) \
case SHIFT: \
COMPLEX_SCAN(THIS, SHIFT, OFF); \
break
#define SIMPLE_SCAN_CASE_PUSH(THIS, SHIFT, OFF) case SHIFT: \
#define SIMPLE_SCAN_PUSH(THIS, SHIFT, OFF) \
do { \
PIKE_CONCAT(p_wchar, SHIFT) *s = \
PIKE_CONCAT(STR,SHIFT)(THIS->buffer); \
......@@ -701,10 +717,14 @@ PIKECLASS string_split_iterator
} \
push_string(PIKE_CONCAT(make_shared_binary_string, SHIFT) \
(s+offset, OFF-offset)); \
} while(0); \
} while(0)
#define SIMPLE_SCAN_CASE_PUSH(THIS, SHIFT, OFF) \
case SHIFT: \
SIMPLE_SCAN_PUSH(THIS, SHIFT, OFF); \
break
#define COMPLEX_SCAN_CASE_PUSH(THIS, SHIFT, OFF) case SHIFT: \
#define COMPLEX_SCAN_PUSH(THIS, SHIFT, OFF) \
do { \
PIKE_CONCAT(p_wchar, SHIFT) *s = \
PIKE_CONCAT(STR,SHIFT)(THIS->buffer); \
......@@ -721,7 +741,96 @@ PIKECLASS string_split_iterator
PIKE_CONCAT(break_scan, SHIFT): \
push_string(PIKE_CONCAT(make_shared_binary_string, SHIFT) \
(s+offset, OFF-offset)); \
} while(0); \
} while(0)
#define COMPLEX_SCAN_CASE_PUSH(THIS, SHIFT, OFF) \
case SHIFT: \
COMPLEX_SCAN_PUSH(THIS, SHIFT, OFF); \
break
#define NEW_SKIP_CASE(SHIFT, FLAGS) \
case SHIFT: \
if (FLAGS) { \
/* Skip empty */ \
if (ssi->split_set_size == 1) { \
SIMPLE_SKIP(ssi, SHIFT, offset); \
} else { \
COMPLEX_SKIP(ssi, SHIFT, offset); \
} \
} \
if (offset >= ssi->buffer->len) { \
free_string(ssi->buffer); \
ssi->buffer = NULL; \
ssi->offset = 0; \
offset = 0; \
if (ssi->feed.type == T_INT) { \
if (!(FLAGS)) { \
MAKE_CONSTANT_SHARED_STRING(ssi->current, ""); \
ssi->index++; \
} \
return; \
} else { \
/* Attempt to fill the buffer with some more. */ \
apply_svalue(&ssi->feed, 0); \
if ((Pike_sp[-1].type == T_STRING) && \
(Pike_sp[-1].u.string->len)) { \
ssi->buffer = Pike_sp[-1].u.string; \
Pike_sp--; \
goto reskip_empty; \
} \
free_svalue(&ssi->feed); \
ssi->feed.type = T_INT; \
ssi->feed.u.integer = 0; \
pop_stack(); \
if (!(FLAGS)) { \
MAKE_CONSTANT_SHARED_STRING(ssi->current, ""); \
ssi->index++; \
} \
return; \
} \
} \
ssi->index++; \
end = offset; \
goto PIKE_CONCAT(scan_more_,SHIFT)
#define NEW_SCAN_MORE_CASE(SHIFT) \
case SHIFT: \
PIKE_CONCAT(scan_more_,SHIFT): \
if (ssi->split_set_size == 1) { \
SIMPLE_SCAN_PUSH(ssi, SHIFT, end); \
} else { \
COMPLEX_SCAN_PUSH(ssi, SHIFT, end); \
} \
if ((end == ssi->buffer->len) && \
(ssi->feed.type != T_INT)) { \
apply_svalue(&ssi->feed, 0); \
if ((Pike_sp[-1].type == T_STRING) && \
(Pike_sp[-1].u.string->len)) { \
f_add(2); \
if (Pike_sp[-1].type != T_STRING) { \
Pike_error("Bad result from concatenation!\n"); \
} \
free_string(ssi->buffer); \
ssi->buffer = Pike_sp[-1].u.string; \
Pike_sp--; \
end -= offset; \
offset = 0; \
goto scan_more; \
} \
pop_stack(); /* Pop the end of stream marker. */ \
\
/* Make sure we don't call feed() any more. */ \
free_svalue(&ssi->feed); \
ssi->feed.type = T_INT; \
ssi->feed.u.integer = 0; \
} \
ssi->offset = end+1; \
ssi->current = Pike_sp[-1].u.string; \
Pike_sp--; \
if (ssi->offset > ssi->buffer->len) { \
free_string(ssi->buffer); \
ssi->buffer = 0; \
} \
break
static void find_next(struct string_split_iterator_struct *ssi)
......@@ -736,102 +845,23 @@ PIKECLASS string_split_iterator
return;
}
reskip_empty:
if (ssi->flags) {
/* Skip empty */
if (ssi->split_set_size == 1) {
switch(ssi->buffer->size_shift) {
SIMPLE_SKIP_CASE(ssi, 0, offset);
SIMPLE_SKIP_CASE(ssi, 1, offset);
SIMPLE_SKIP_CASE(ssi, 2, offset);
NEW_SKIP_CASE(0, ssi->flags);
NEW_SKIP_CASE(1, ssi->flags);
NEW_SKIP_CASE(2, ssi->flags);
default:
fatal("Unsupported size shift!\n");
}
} else {
switch(ssi->buffer->size_shift) {
COMPLEX_SKIP_CASE(ssi, 0, offset);
COMPLEX_SKIP_CASE(ssi, 1, offset);
COMPLEX_SKIP_CASE(ssi, 2, offset);
default:
fatal("Unsupported size shift!\n");
}
}
}
if (offset >= ssi->buffer->len) {
if (ssi->feed.type == T_INT) {
if (!ssi->flags) {
MAKE_CONSTANT_SHARED_STRING(ssi->current, "");
ssi->index++;
}
free_string(ssi->buffer);
ssi->buffer = NULL;
ssi->offset = 0;
return;
} else {
/* Attempt to fill the buffer with some more. */
apply_svalue(&ssi->feed, 0);
if ((Pike_sp[-1].type == T_STRING) && (Pike_sp[-1].u.string->len)) {
ssi->buffer = Pike_sp[-1].u.string;
ssi->offset = 0;
offset = 0;
Pike_sp--;
goto reskip_empty;
}
free_svalue(&ssi->feed);
ssi->feed.type = T_INT;
ssi->feed.u.integer = 0;
pop_stack();
}
}
ssi->index++;
end = offset;
scan_more:
if (ssi->split_set_size == 1) {
switch(ssi->buffer->size_shift) {
SIMPLE_SCAN_CASE_PUSH(ssi, 0, end);
SIMPLE_SCAN_CASE_PUSH(ssi, 1, end);
SIMPLE_SCAN_CASE_PUSH(ssi, 2, end);
default:
fatal("Unsupported size shift!\n");
}
} else {
switch(ssi->buffer->size_shift) {
COMPLEX_SCAN_CASE_PUSH(ssi, 0, end);
COMPLEX_SCAN_CASE_PUSH(ssi, 1, end);
COMPLEX_SCAN_CASE_PUSH(ssi, 2, end);
switch(ssi->buffer->size_shift)
{
NEW_SCAN_MORE_CASE(0);
NEW_SCAN_MORE_CASE(1);
NEW_SCAN_MORE_CASE(2);
default:
fatal("Unsupported size shift!\n");
}
}
if ((end == ssi->buffer->len) && (ssi->feed.type != T_INT)) {
apply_svalue(&ssi->feed, 0);
if ((Pike_sp[-1].type == T_STRING) &&
(Pike_sp[-1].u.string->len)) {
f_add(2);
if (Pike_sp[-1].type != T_STRING) {
Pike_error("Bad result from string concatenation!\n");
}
free_string(ssi->buffer);
ssi->buffer = Pike_sp[-1].u.string;
Pike_sp--;
end -= offset;
offset = 0;
goto scan_more;
}
pop_stack(); /* Pop the end of stream marker. */
/* Make sure we don't call feed() any more. */
free_svalue(&ssi->feed);
ssi->feed.type = T_INT;
ssi->feed.u.integer = 0;
}
ssi->offset = end+1;
ssi->current = Pike_sp[-1].u.string;
Pike_sp--;
if (ssi->offset > ssi->buffer->len) {
free_string(ssi->buffer);
ssi->buffer = 0;
}
}
PIKEFUN string value()
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment