f_number_unsigned_t slash_first = 0;
f_number_unsigned_t slash_last = 0;
f_number_unsigned_t before_list_open = position_previous;
+ f_number_unsigned_t close_location = 0;
- // 0x0 = false, 0x1 = true, 0x2 = false, but there is a delimited comment, comment_delimit is set.
- uint8_t graph_first = 0x1;
- uint8_t is_open = F_false;
- uint8_t is_object = F_false;
+ // 0x0 = is false for all, 0x1 = is first graph, 0x2 = is delimited comment, 0x4 = is open, 0x8 = is object, 0x10 = is delimited close.
+ uint8_t is_state = 0x1;
// Initialize depth 1 start position.
// Positions_start.used is used as a max depth (such that cache->positions->used == max depth + 1).
if (state->interrupt) {
state->interrupt((void *) state, 0);
-
- if (F_status_set_fine(state->status) == F_interrupt) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_set_fine(state->status) == F_interrupt) break;
}
if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
- if (graph_first == 0x2) {
+ if (is_state & 0x2) {
state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = comment_delimit;
}
- newline_last = range->start;
- position_previous = range->start++;
- graph_first = 0x1;
+ newline_last = position_previous = range->start++;
line_start = range->start;
-
- if (range->start >= buffer.used || range->start > range->stop) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- if (depth) {
- state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop;
- }
- else {
- state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
- }
-
- return;
- }
-
- continue;
+ is_state = 0x1;
}
-
- if (buffer.string[range->start] == f_fss_slash_s.string[0]) {
- slash_first = range->start;
- slash_last = range->start;
+ else if (buffer.string[range->start] == f_fss_slash_s.string[0] && (is_state & 0x1)) {
+ slash_first = slash_last = position_previous = range->start++;
cache->slashes->array[depth] = 1;
- position_previous = range->start++;
for (; range->start <= range->stop && range->start < buffer.used && (buffer.string[range->start] == f_fss_placeholder_s.string[0] || buffer.string[range->start] == f_fss_slash_s.string[0]); ++range->start) {
if (state->interrupt) {
state->interrupt((void *) state, 0);
-
- if (F_status_set_fine(state->status) == F_interrupt) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_set_fine(state->status) == F_interrupt) break;
}
position_previous = range->start;
}
} // for
- if (range->start >= buffer.used || range->start > range->stop) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- if (depth) {
- state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop;
- }
- else {
- state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
- }
-
- return;
- }
+ if (F_status_is_error(state->status) || state->status == F_interrupt || range->start >= buffer.used || range->start > range->stop) break;
// All slashes for an open are delimited (because it could represent a slash in the object name).
// For example 'object {' = valid open, name 'object', 'object \{' represents 'object {', 'object \\{' = valid open, name 'object \', 'object \\\{' represents 'object \{', etc..
// For example '}' = valid close, '\}' represents '}', '\\}' represents '\}', '\\\}' represents '\\}', '\\\\}' represents '\\\}', and so on..
// When slash is odd and a (delimited) valid open/close is found, then save delimited positions and continue.
if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
- if (graph_first == 0x2) {
+ if (is_state & 0x2) {
state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = comment_delimit;
}
- newline_last = range->start;
- position_previous = range->start++;
+ newline_last = position_previous = range->start++;
line_start = range->start;
- graph_first = 0x1;
+ is_state = 0x1;
}
else if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0] || buffer.string[range->start] == f_fss_embedded_list_close_s.string[0]) {
before_list_open = position_previous;
- is_open = F_false;
- graph_first = 0x0;
+ is_state &= ~0x15;
if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0]) {
- is_open = F_true;
+ is_state |= 0x4;
}
position_previous = range->start++;
if (state->interrupt) {
state->interrupt((void *) state, 0);
-
- if (F_status_set_fine(state->status) == F_interrupt) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_set_fine(state->status) == F_interrupt) break;
}
- if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
- if (graph_first == 0x2) {
- state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
- if (F_status_is_error(state->status)) break;
-
- delimits->array[delimits->used++] = comment_delimit;
- }
-
- newline_last = range->start;
- line_start = range->start + 1;
- graph_first = 0x1;
-
- break;
- }
+ if (buffer.string[range->start] == f_fss_eol_s.string[0]) break;
if (buffer.string[range->start] != f_fss_placeholder_s.string[0]) {
if (f_fss_is_space(buffer, *range, state) == F_false) break;
if (F_status_is_error(state->status)) break;
} // while
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status) || state->status == F_interrupt || range->start >= buffer.used || range->start > range->stop) break;
- if (F_status_is_error(state->status) || range->start >= buffer.used || range->start > range->stop) {
- delimits->used = delimits_used;
- comments->used = comments_used;
+ // This is a valid object open/close that has been delimited, save the slash delimit positions.
+ if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
+ newline_last = range->start;
+ line_start = newline_last + 1;
- if (F_status_is_error_not(state->status)) {
- if (depth) {
- state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop;
+ if (is_state & 0x4) {
+ if (cache->slashes->array[depth] % 2 == 0) {
+ is_state |= 0x8;
}
else {
- state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
+ is_state &= ~0x8;
}
- }
- return;
- }
-
- // This is a valid object open/close that has been delimited, save the slash delimit positions.
- if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
- newline_last = range->start;
- line_start = range->start + 1;
- graph_first = 0x1;
-
- if (is_open) {
- is_object = cache->slashes->array[depth] % 2 == 0 ? F_true : F_false;
range->start = slash_first;
state->status = f_memory_array_increase_by((cache->slashes->array[depth] / 2) + 1, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
// Apply slash delimits, only slashes and placeholders should be present.
while (cache->slashes->array[depth]) {
} // while
// When slashes are even, the object is valid and needs to be processed.
- if (is_object) {
+ if (is_state & 0x8) {
if (++depth >= cache->objects->size) {
state->status = f_memory_array_resize(depth + 2, sizeof(f_range_t), (void **) &cache->objects->array, &cache->objects->used, &cache->objects->size);
}
}
}
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
cache->objects->array[depth].start = line_start;
cache->objects->array[depth].stop = before_list_open;
}
}
else {
- state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
+ is_state |= 0x10;
+ }
- return;
- }
+ if (is_state & 0x12) {
+ state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = slash_last;
}
- range->start = newline_last;
+ range->start = line_start;
+ is_state = 0x1;
}
}
- else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s.string[0]) {
- graph_first = 0x2;
+ else if (buffer.string[range->start] == f_fss_comment_s.string[0] && (is_state & 0x1)) {
+ is_state |= 0x2;
+ is_state &= ~0x1;
comment_delimit = slash_first;
}
else {
- graph_first = 0x0;
+ is_state &= ~0x1;
}
}
else if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0]) {
- graph_first = 0x0;
+ is_state &= ~0x1;
before_list_open = position_previous;
position_previous = range->start;
state->status = f_utf_buffer_increment(buffer, range, 1);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
while (range->start <= range->stop && range->start < buffer.used) {
if (state->interrupt) {
state->interrupt((void *) state, 0);
-
- if (F_status_set_fine(state->status) == F_interrupt) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_set_fine(state->status) == F_interrupt) break;
}
if (buffer.string[range->start] == f_fss_eol_s.string[0]) break;
if (F_status_is_error(state->status)) break;
} // while
- if (F_status_is_error(state->status) || range->start >= buffer.used || range->start > range->stop) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- if (F_status_is_error_not(state->status)) {
- if (depth) {
- state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop;
- }
- else {
- state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
- }
- }
-
- return;
- }
+ if (F_status_is_error(state->status) || state->status == F_interrupt || range->start >= buffer.used || range->start > range->stop) break;
if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
if (++depth >= cache->objects->size) {
}
}
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
cache->objects->array[depth].start = line_start;
cache->objects->array[depth].stop = before_list_open;
cache->slashes->used = depth + 1;
}
- if (graph_first == 0x2) {
+ if (is_state & 0x2) {
state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = comment_delimit;
}
newline_last = range->start;
- line_start = range->start + 1;
- graph_first = 0x1;
+ line_start = newline_last + 1;
+ is_state = 0x1;
}
else {
// No valid object close found, seek until EOL.
f_fss_seek_to_eol(buffer, range, state);
+ if (F_status_is_error(state->status)) break;
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
-
- if (graph_first == 0x2) {
+ if (is_state & 0x2) {
state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = comment_delimit;
}
newline_last = range->start;
- line_start = range->start + 1;
- graph_first = 0x1;
-
- while (range->start <= range->stop && range->start < buffer.used) {
-
- if (state->interrupt) {
- state->interrupt((void *) state, 0);
-
- if (F_status_set_fine(state->status) == F_interrupt) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
- }
-
- if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
- newline_last = range->start;
- line_start = range->start + 1;
- graph_first = 0x1;
-
- break;
- }
-
- position_previous = range->start;
-
- state->status = f_utf_buffer_increment(buffer, range, 1);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
- } // while
-
- if (range->start >= buffer.used || range->start > range->stop) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- if (depth) {
- state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop;
- }
- else {
- state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
- }
-
- return;
- }
+ line_start = newline_last + 1;
+ is_state = 0x1;
}
}
- else if (buffer.string[range->start] == f_fss_embedded_list_close_s.string[0]) {
+ else if (buffer.string[range->start] == f_fss_embedded_list_close_s.string[0] && (is_state & 0x1)) {
+ close_location = range->start;
+
while (range->start <= range->stop && range->start < buffer.used) {
if (state->interrupt) {
state->interrupt((void *) state, 0);
-
- if (F_status_set_fine(state->status) == F_interrupt) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_set_fine(state->status) == F_interrupt) break;
}
position_previous = range->start;
if (F_status_is_error(state->status) || buffer.string[range->start] == f_fss_eol_s.string[0]) break;
if (buffer.string[range->start] != f_fss_placeholder_s.string[0]) {
- if (f_fss_is_space(buffer, *range, state) == F_false) break;
+ if (f_fss_is_space(buffer, *range, state) == F_false || F_status_is_error(state->status)) break;
}
} // while
- if (F_status_is_error(state->status) || range->start >= buffer.used || range->start > range->stop) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- if (F_status_is_error_not(state->status)) {
- if (depth) {
- state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop;
- }
- else {
- state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
- }
- }
-
- return;
- }
+ if (F_status_is_error(state->status) || state->status == F_interrupt || range->start >= buffer.used || range->start > range->stop) break;
if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
if (depth >= found->used) {
}
}
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
if (depth) {
found->depth[depth].array[position].parent = found->depth[depth - 1].used;
found->used = depth + 1;
}
- if (graph_first == 0x2) {
+ if (is_state & 0x2) {
state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = comment_delimit;
}
found->depth[depth].array[position].close.start = line_start;
- found->depth[depth].array[position].close.stop = range->start - 1;
+ found->depth[depth].array[position].close.stop = close_location;
newline_last = range->start;
- line_start = range->start + 1;
- graph_first = 0x1;
+ line_start = newline_last + 1;
+ is_state = 0x1;
if (!depth) {
state->status = f_utf_buffer_increment(buffer, range, 1);
if (state->interrupt) {
state->interrupt((void *) state, 0);
-
- if (F_status_set_fine(state->status) == F_interrupt) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_set_fine(state->status) == F_interrupt) break;
}
if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
- if (graph_first == 0x2) {
+ if (is_state & 0x2) {
state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = comment_delimit;
}
newline_last = range->start;
- line_start = range->start + 1;
- graph_first = 0x1;
+ line_start = newline_last + 1;
+ is_state = 0x1;
break;
}
position_previous = range->start;
state->status = f_utf_buffer_increment(buffer, range, 1);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
} // while
- if (range->start >= buffer.used || range->start > range->stop) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- if (depth) {
- state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop;
- }
- else {
- state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
- }
-
- return;
- }
+ if (F_status_is_error(state->status) || state->status == F_interrupt) break;
}
}
- else if (buffer.string[range->start] == f_fss_comment_s.string[0] && (graph_first == 0x1 || graph_first == 0x2)) {
+ else if (buffer.string[range->start] == f_fss_comment_s.string[0] && (is_state & 0x1)) {
// The newline_last is initialized to the range->start, which may not actually be a new line.
position = (buffer.string[newline_last] == f_string_eol_s.string[0]) ? newline_last + 1 : newline_last;
f_fss_seek_to_eol(buffer, range, state);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
if (range->start > range->stop || range->start >= buffer.used) {
--range->start;
}
else {
- if (graph_first == 0x2) {
+ if (is_state & 0x2) {
state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
delimits->array[delimits->used++] = comment_delimit;
}
newline_last = range->start;
- graph_first = 0x1;
+ line_start = newline_last + 1;
+ is_state = 0x1;
}
state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &comments->array, &comments->used, &comments->size);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
+ if (F_status_is_error(state->status)) break;
comments->array[comments->used].start = position;
comments->array[comments->used++].stop = range->start++;
- line_start = range->start;
-
- continue;
}
else if (buffer.string[range->start] != f_fss_eol_s.string[0]) {
position_previous = range->start;
- if (graph_first == 0x1) {
+ if (is_state & 0x1) {
if (f_fss_is_space(buffer, *range, state) == F_false) {
- graph_first = 0x0;
+ is_state &= ~0x1;
}
}
state->status = f_utf_buffer_increment(buffer, range, 1);
}
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
- }
-
- if (range->start >= buffer.used || range->start > range->stop) break;
-
- continue;
- }
-
- position_previous = range->start;
-
- state->status = f_utf_buffer_increment(buffer, range, 1);
-
- if (F_status_is_error(state->status)) {
- delimits->used = delimits_used;
- comments->used = comments_used;
-
- return;
+ if (F_status_is_error(state->status)) break;
}
} // while
delimits->used = delimits_used;
comments->used = comments_used;
- if (range->start > range->stop) {
- state->status = F_status_set_error(depth ? F_end_not_nest_stop : F_end_not_stop);
- }
- else {
- state->status = F_status_set_error(depth ? F_end_not_nest_eos : F_end_not_eos);
+ if (F_status_is_error_not(state->status) && state->status != F_interrupt) {
+ if (range->start > range->stop) {
+ state->status = F_status_set_error(depth ? F_end_not_nest_stop : F_end_not_stop);
+ }
+ else {
+ state->status = F_status_set_error(depth ? F_end_not_nest_eos : F_end_not_eos);
+ }
}
}
#endif // _di_fl_fss_embedded_list_content_read_
projects / fll / commitdiff