gogacoder/libcyberiadaml
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trim action strings

Browse Source
This commit is contained in:
Alexey Fedoseev
2024-04-13 15:56:13 +03:00
parent b732093e8d
commit 03825c47b0
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cyberiadaml.c
View File

@@ -360,6 +360,21 @@ static int cyberiada_string_is_empty(const char* s)
return 1; return 1;
} }
static int cyberiada_string_trim(char* orig)
{
char* s;
if (!orig) return 1;
if (!*orig) return 0;
s = orig + strlen(orig) - 1;
while(s > orig) {
if (isspace(*s)) {
*s = 0;
}
s--;
}
return 0;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Graph manipulation functions * Graph manipulation functions
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
@@ -720,6 +735,9 @@ static int cyberiada_decode_edge_action(const char* text, CyberiadaAction** acti
DEBUG("action: %s\n", action);*/ DEBUG("action: %s\n", action);*/
if (*trigger || *guard || *behavior) { if (*trigger || *guard || *behavior) {
cyberiada_string_trim(trigger);
cyberiada_string_trim(guard);
cyberiada_string_trim(behavior);
*action = cyberiada_new_action(cybActionTransition, trigger, guard, behavior); *action = cyberiada_new_action(cybActionTransition, trigger, guard, behavior);
} else { } else {
*action = NULL; *action = NULL;
@@ -791,6 +809,9 @@ static int cyberiada_decode_state_block_action(const char* text, CyberiadaAction
} }
decode_utf8_strings(&trigger, &guard, &behavior); decode_utf8_strings(&trigger, &guard, &behavior);
cyberiada_string_trim(trigger);
cyberiada_string_trim(guard);
cyberiada_string_trim(behavior);
cyberiada_add_action(trigger, guard, behavior, action); cyberiada_add_action(trigger, guard, behavior, action);
if (*trigger) free(trigger); if (*trigger) free(trigger);
@@ -1795,7 +1816,7 @@ static GraphProcessorState handle_node_action(xmlNode* xml_node,
cyberiada_copy_string(&(current->comment_data->body), cyberiada_copy_string(&(current->comment_data->body),
&(current->comment_data->body_len), buffer); &(current->comment_data->body_len), buffer);
} else { } else {
DEBUG("Set node %s action %s\n", current->id, buffer); /* DEBUG("Set node %s action %s\n", current->id, buffer); */
if (cyberiada_decode_state_actions_yed(buffer, &(current->actions)) != CYBERIADA_NO_ERROR) { if (cyberiada_decode_state_actions_yed(buffer, &(current->actions)) != CYBERIADA_NO_ERROR) {
ERROR("cannot decode yed node action\n"); ERROR("cannot decode yed node action\n");
return gpsInvalid; return gpsInvalid;