X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/xbt/automaton/automatonparse_promela.c

diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index 9736dd122e..44758e34a2 100644
--- a/src/xbt/automaton/automatonparse_promela.c
+++ b/src/xbt/automaton/automatonparse_promela.c
@@ -1,18 +1,21 @@
 /* methods for implementation of automaton from promela description */
 
-/* Copyright (c) 2011-2012. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2011-2015. 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. */
 
 #include "xbt/automaton.h"
+#include <errno.h>
+#include <string.h>             /* strerror */
 
 static xbt_automaton_t parsed_automaton;
 char* state_id_src;
 
 static void new_state(char* id, int src){
 
-  char* id_state = strdup(id);
+  char* id_state = xbt_strdup(id);
   char* first_part = strtok(id,"_");
   int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
 
@@ -25,62 +28,62 @@ static void new_state(char* id, int src){
     }
   }
 
-  xbt_state_t state = NULL;
+  xbt_automaton_state_t state = NULL;
   state = xbt_automaton_state_exists(parsed_automaton, id_state);
   if(state == NULL){
-    state = xbt_automaton_new_state(parsed_automaton, type, id_state);
+    state = xbt_automaton_state_new(parsed_automaton, type, id_state);
   }
 
   if(type==-1)
     parsed_automaton->current_state = state;
 
   if(src)
-    state_id_src = strdup(id_state);
+    state_id_src = xbt_strdup(id_state);
     
 }
 
-static void new_transition(char* id, xbt_exp_label_t label){
+static void new_transition(char* id, xbt_automaton_exp_label_t label){
 
-  char* id_state = strdup(id);
-  xbt_state_t state_dst = NULL;
+  char* id_state = xbt_strdup(id);
+  xbt_automaton_state_t state_dst = NULL;
   new_state(id, 0);
   state_dst = xbt_automaton_state_exists(parsed_automaton, id_state);
-  xbt_state_t state_src = xbt_automaton_state_exists(parsed_automaton, state_id_src);
+  xbt_automaton_state_t state_src = xbt_automaton_state_exists(parsed_automaton, state_id_src);
   
   //xbt_transition_t trans = NULL;
-  xbt_automaton_new_transition(parsed_automaton, state_src, state_dst, label);
+  xbt_automaton_transition_new(parsed_automaton, state_src, state_dst, label);
 
 }
 
-static xbt_exp_label_t new_label(int type, ...){
-  xbt_exp_label_t label = NULL;
+static xbt_automaton_exp_label_t new_label(int type, ...){
+  xbt_automaton_exp_label_t label = NULL;
   va_list ap;
   va_start(ap,type);
   switch(type){
   case 0 : {
-    xbt_exp_label_t left = va_arg(ap, xbt_exp_label_t);
-    xbt_exp_label_t right = va_arg(ap, xbt_exp_label_t);
-    label = xbt_automaton_new_label(type, left, right);
+    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
+    xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t);
+    label = xbt_automaton_exp_label_new(type, left, right);
     break;
   }
   case 1 : {
-    xbt_exp_label_t left = va_arg(ap, xbt_exp_label_t);
-    xbt_exp_label_t right = va_arg(ap, xbt_exp_label_t);
-    label = xbt_automaton_new_label(type, left, right);
+    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
+    xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t);
+    label = xbt_automaton_exp_label_new(type, left, right);
     break;
   }
   case 2 : {
-    xbt_exp_label_t exp_not = va_arg(ap, xbt_exp_label_t);
-    label = xbt_automaton_new_label(type, exp_not);
+    xbt_automaton_exp_label_t exp_not = va_arg(ap, xbt_automaton_exp_label_t);
+    label = xbt_automaton_exp_label_new(type, exp_not);
     break;
   }
   case 3 : {
     char* p = va_arg(ap, char*);
-    label = xbt_automaton_new_label(type, p);
+    label = xbt_automaton_exp_label_new(type, p);
     break;
   }
   case 4 : {
-    label = xbt_automaton_new_label(type);
+    label = xbt_automaton_exp_label_new(type);
     break;
   }
   }
@@ -91,8 +94,11 @@ static xbt_exp_label_t new_label(int type, ...){
 
 #include "parserPromela.tab.cacc"
 
-void xbt_automaton_load(xbt_automaton_t a, const char *file){
+void xbt_automaton_load(xbt_automaton_t a, const char *file)
+{
   parsed_automaton = a;
   yyin = fopen(file, "r");
+  if (yyin == NULL)
+    xbt_die("Failed to open automaton file `%s': %s", file, strerror(errno));
   yyparse();
 }