X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..0fca8a1497fff4bb22f715f851ddbea4073ad3c2:/src/xbt/automaton/automaton.c

diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c
index 9fde6edb14..fd3e111e86 100644
--- a/src/xbt/automaton/automaton.c
+++ b/src/xbt/automaton/automaton.c
@@ -1,6 +1,6 @@
 /* automaton - representation of büchi automaton */
 
-/* Copyright (c) 2011-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2011-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,6 +8,7 @@
 #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");
 
@@ -55,45 +56,46 @@ xbt_automaton_transition_t xbt_automaton_transition_new(xbt_automaton_t a, xbt_a
   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;
 }
 
@@ -212,7 +214,9 @@ static int call_simple_function(void* function)
   return ((int (*)(void)) function)();
 }
 
-xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, int(*fct)(void)){
+xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id,
+                                                                            int (*fct)(void))
+{
   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;
@@ -222,7 +226,9 @@ xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_
   return prop_symb;
 }
 
-XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_symbol_new_pointer(xbt_automaton_t a, const char* id, int* value)
+XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new_pointer(xbt_automaton_t a,
+                                                                                               const char* id,
+                                                                                               int* value)
 {
   xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
   prop_symb->pred = xbt_strdup(id);
@@ -233,10 +239,9 @@ XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_sym
   return prop_symb;
 }
 
-XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_symbol_new_callback(
-  xbt_automaton_t a, const char* id,
-  xbt_automaton_propositional_symbol_callback_type callback,
-  void* data, xbt_automaton_propositional_symbol_free_function_type free_function)
+XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new_callback(
+    xbt_automaton_t a, const char* id, xbt_automaton_propositional_symbol_callback_type callback, void* data,
+    xbt_automaton_propositional_symbol_free_function_type free_function)
 {
   xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
   prop_symb->pred = xbt_strdup(id);
@@ -247,7 +252,7 @@ XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_sym
   return prop_symb;
 }
 
-XBT_PUBLIC(int) xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propositional_symbol_t symbol)
+XBT_PUBLIC int xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propositional_symbol_t symbol)
 {
   if (symbol->callback)
     return (symbol->callback)(symbol->data);
@@ -255,17 +260,18 @@ XBT_PUBLIC(int) xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propos
     return *(int*) symbol->data;
 }
 
-XBT_PUBLIC(xbt_automaton_propositional_symbol_callback_type) xbt_automaton_propositional_symbol_get_callback(xbt_automaton_propositional_symbol_t symbol)
+XBT_PUBLIC xbt_automaton_propositional_symbol_callback_type
+xbt_automaton_propositional_symbol_get_callback(xbt_automaton_propositional_symbol_t symbol)
 {
   return symbol->callback;
 }
 
-XBT_PUBLIC(void*) xbt_automaton_propositional_symbol_get_data(xbt_automaton_propositional_symbol_t symbol)
+XBT_PUBLIC void* xbt_automaton_propositional_symbol_get_data(xbt_automaton_propositional_symbol_t symbol)
 {
   return symbol->data;
 }
 
-XBT_PUBLIC(const char*) xbt_automaton_propositional_symbol_get_name(xbt_automaton_propositional_symbol_t symbol)
+XBT_PUBLIC const char* xbt_automaton_propositional_symbol_get_name(xbt_automaton_propositional_symbol_t symbol)
 {
   return symbol->pred;
 }
@@ -304,27 +310,29 @@ int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_
   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;
+      res = 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.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);
     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){