#include "xbt/automaton.h"
#include <stdio.h> /* printf */
-#include <xbt/log.h>
#include <xbt/sysdep.h>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_automaton, xbt, "Automaton");
-
struct xbt_automaton_propositional_symbol{
char* pred;
/** Callback used to evaluate the value of the symbol */
return transition;
}
-xbt_automaton_exp_label_t xbt_automaton_exp_label_new(int type, ...){
+xbt_automaton_exp_label_t xbt_automaton_exp_label_new_or(xbt_automaton_exp_label_t left,
+ xbt_automaton_exp_label_t right)
+{
xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1);
- label->type = type;
- xbt_automaton_exp_label_t left;
- xbt_automaton_exp_label_t right;
- xbt_automaton_exp_label_t exp_not;
- char *p;
- va_list ap;
- va_start(ap, type);
- switch(type){
- case 0 :
- left = va_arg(ap, xbt_automaton_exp_label_t);
- right = va_arg(ap, xbt_automaton_exp_label_t);
- label->u.or_and.left_exp = left;
- label->u.or_and.right_exp = right;
- break;
- case 1 :
- left = va_arg(ap, xbt_automaton_exp_label_t);
- right = va_arg(ap, xbt_automaton_exp_label_t);
- label->u.or_and.left_exp = left;
- label->u.or_and.right_exp = right;
- break;
- case 2 :
- exp_not = va_arg(ap, xbt_automaton_exp_label_t);
- label->u.exp_not = exp_not;
- break;
- case 3 :
- p = va_arg(ap, char*);
- label->u.predicat = xbt_strdup(p);
- break;
- case 4:
- break;
- default:
- XBT_DEBUG("Invalid type: %d", type);
- xbt_free(label);
- label = NULL;
- break;
- }
- va_end(ap);
+ label->type = AUT_OR;
+ label->u.or_and.left_exp = left;
+ label->u.or_and.right_exp = right;
+ return label;
+}
+
+xbt_automaton_exp_label_t xbt_automaton_exp_label_new_and(xbt_automaton_exp_label_t left,
+ xbt_automaton_exp_label_t right)
+{
+ xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1);
+ label->type = AUT_AND;
+ label->u.or_and.left_exp = left;
+ label->u.or_and.right_exp = right;
+ return label;
+}
+
+xbt_automaton_exp_label_t xbt_automaton_exp_label_new_not(xbt_automaton_exp_label_t exp_not)
+{
+ xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1);
+ label->type = AUT_NOT;
+ label->u.exp_not = exp_not;
+ return label;
+}
+
+xbt_automaton_exp_label_t xbt_automaton_exp_label_new_predicat(char* p)
+{
+ xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1);
+ label->type = AUT_PREDICAT;
+ label->u.predicat = xbt_strdup(p);
+ return label;
+}
+
+xbt_automaton_exp_label_t xbt_automaton_exp_label_new_one(void)
+{
+ xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1);
+ label->type = AUT_ONE;
return label;
}
return a->current_state;
}
-static int call_simple_function(void* function)
+static int call_simple_function(int function(void) )
{
- return ((int (*)(void)) function)();
+ return function();
}
xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id,
{
xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
prop_symb->pred = xbt_strdup(id);
- prop_symb->callback = &call_simple_function;
- prop_symb->data = fct;
+ prop_symb->callback = ((int (*)(void *))&call_simple_function);
+ prop_symb->data = (void*)&fct;
prop_symb->free_function = NULL;
xbt_dynar_push(a->propositional_symbols, &prop_symb);
return prop_symb;
}
int xbt_automaton_state_compare(xbt_automaton_state_t s1, xbt_automaton_state_t s2){
-
/* single id for each state, id and type sufficient for comparison*/
-
- if(strcmp(s1->id, s2->id))
- return 1;
-
- if(s1->type != s2->type)
- return 1;
-
- return 0;
-
+ return (strcmp(s1->id, s2->id) != 0) || (s1->type != s2->type);
}
-int xbt_automaton_transition_compare(const void *t1, const void *t2){
-
- if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->src, ((xbt_automaton_transition_t)t2)->src))
- return 1;
-
- if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->dst, ((xbt_automaton_transition_t)t2)->dst))
- return 1;
-
- if(xbt_automaton_exp_label_compare(((xbt_automaton_transition_t)t1)->label,((xbt_automaton_transition_t)t2)->label))
- return 1;
-
- return 0;
-
+int xbt_automaton_transition_compare(xbt_automaton_transition_t t1, xbt_automaton_transition_t t2)
+{
+ return xbt_automaton_state_compare(t1->src, t2->src) || xbt_automaton_state_compare(t1->dst, t2->dst) ||
+ xbt_automaton_exp_label_compare(t1->label, t2->label);
}
int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_exp_label_t l2){
if(l1->type != l2->type)
return 1;
+ int res;
switch(l1->type){
case 0 : // OR
case 1 : // AND
- if(xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp))
- return 1;
- else
- return xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
+ res = xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp) ||
+ xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
break;
case 2 : // NOT
- return xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not);
+ res = xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not);
break;
case 3 : // predicat
- return (strcmp(l1->u.predicat, l2->u.predicat));
+ res = strcmp(l1->u.predicat, l2->u.predicat) != 0;
break;
case 4 : // 1
- return 0;
+ res = 0;
break;
default :
- return -1;
+ res = -1;
break;
}
+ return res;
}
int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
