caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmio_stl: case insensitive comparison on the first letter in parsing_find_token()

Browse Source
This commit is contained in:
Hugues Delorme 2014-11-20 09:23:03 +01:00
parent 4fa3e7f380
commit 60db7e397a
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gmio_stl/stla_read.c
View File

@ -111,9 +111,9 @@ static void gmio_stream_fwd_iterator_stla_read_hook(void* cookie,
GMIO_INLINE static gmio_bool_t parsing_can_continue(const gmio_stla_parse_data_t* data) GMIO_INLINE static gmio_bool_t parsing_can_continue(const gmio_stla_parse_data_t* data)
{ {
if (data->error || data->stream_iterator_cookie.is_stop_requested) if (!data->error && !data->stream_iterator_cookie.is_stop_requested)
return 0; return GMIO_TRUE;
return 1; return GMIO_FALSE;
} }
GMIO_INLINE static const char* current_token_as_identifier(const gmio_stla_parse_data_t* data) GMIO_INLINE static const char* current_token_as_identifier(const gmio_stla_parse_data_t* data)
@ -131,9 +131,11 @@ GMIO_INLINE static int get_current_token_as_real32(const gmio_stla_parse_data_t*
GMIO_INLINE static void parsing_error(gmio_stla_parse_data_t* data) GMIO_INLINE static void parsing_error(gmio_stla_parse_data_t* data)
{ {
data->error = 1; data->error = GMIO_TRUE;
data->token = unknown_token; data->token = unknown_token;
printf("parsing_error, token: %s\n", data->string_buffer.ptr); fprintf(stderr,
"\n[gmio_stla_read()] parsing_error, token: \"%s\"\n",
data->string_buffer.ptr);
} }
static gmio_stla_token_t parsing_find_token(const gmio_ascii_string_buffer_t* str_buffer) static gmio_stla_token_t parsing_find_token(const gmio_ascii_string_buffer_t* str_buffer)
@ -146,33 +148,42 @@ static gmio_stla_token_t parsing_find_token(const gmio_ascii_string_buffer_t* st
return empty_token; return empty_token;
/* Try to guess if it's a float */ /* Try to guess if it's a float */
if (word[0] == '+' || word[0] == '-' || isdigit(word[0])) if ((word[0] == '+' || word[0] == '-' || isdigit(word[0]))
&& isdigit(word[word_len - 1]))
{
return FLOAT_token; return FLOAT_token;
}
/* Try to find non "endXxx" token */ /* Try to find non "endXxx" token */
if (word_len >= 4) { if (word_len >= 4) {
switch (word[0]) { switch (word[0]) {
case 'f': case 'f':
case 'F':
if (strcmp(word + 1, "acet") == 0) if (strcmp(word + 1, "acet") == 0)
return FACET_token; return FACET_token;
break; break;
case 'l': case 'l':
case 'L':
if (strcmp(word + 1, "oop") == 0) if (strcmp(word + 1, "oop") == 0)
return LOOP_token; return LOOP_token;
break; break;
case 'n': case 'n':
case 'N':
if (strcmp(word + 1, "ormal") == 0) if (strcmp(word + 1, "ormal") == 0)
return NORMAL_token; return NORMAL_token;
break; break;
case 'o': case 'o':
case 'O':
if (strcmp(word + 1, "uter") == 0) if (strcmp(word + 1, "uter") == 0)
return OUTER_token; return OUTER_token;
break; break;
case 's': case 's':
case 'S':
if (strcmp(word + 1, "olid") == 0) if (strcmp(word + 1, "olid") == 0)
return SOLID_token; return SOLID_token;
break; break;
case 'v': case 'v':
case 'V':
if (strcmp(word + 1, "ertex") == 0) if (strcmp(word + 1, "ertex") == 0)
return VERTEX_token; return VERTEX_token;
break; break;
@ -185,14 +196,17 @@ static gmio_stla_token_t parsing_find_token(const gmio_ascii_string_buffer_t* st
if (word_len >= 7 && strncmp(word, "end", 3) == 0) { if (word_len >= 7 && strncmp(word, "end", 3) == 0) {
switch (word[3]) { switch (word[3]) {
case 'f': case 'f':
case 'F':
if (strcmp(word + 4, "acet") == 0) if (strcmp(word + 4, "acet") == 0)
return ENDFACET_token; return ENDFACET_token;
break; break;
case 'l': case 'l':
case 'L':
if (strcmp(word + 4, "oop") == 0) if (strcmp(word + 4, "oop") == 0)
return ENDLOOP_token; return ENDLOOP_token;
break; break;
case 's': case 's':
case 'S':
if (strcmp(word + 4, "olid") == 0) if (strcmp(word + 4, "olid") == 0)
return ENDSOLID_token; return ENDSOLID_token;
break; break;
@ -395,7 +409,7 @@ int gmio_stla_read(gmio_stl_mesh_creator_t *creator,
} }
parse_data.token = unknown_token; parse_data.token = unknown_token;
parse_data.error = 0; parse_data.error = GMIO_FALSE;
parse_data.stream_iterator_cookie.task_control = &trsf->task_control; parse_data.stream_iterator_cookie.task_control = &trsf->task_control;
parse_data.stream_iterator_cookie.stream_data_size = data_size_hint; parse_data.stream_iterator_cookie.stream_data_size = data_size_hint;