model-checker : examples updated with new lex and yacc parsing

[simgrid.git] / examples / msg / mc / bugged1_while_liveness.c

diff --git a/examples/msg/mc/bugged1_while_liveness.c b/examples/msg/mc/bugged1_while_liveness.c
index 95b6e5b..23ddc73 100644 (file)
--- a/examples/msg/mc/bugged1_while_liveness.c
+++ b/examples/msg/mc/bugged1_while_liveness.c
@@ -7,9 +7,7 @@
 #include "msg/msg.h"
 #include "mc/mc.h"
 #include "xbt/automaton.h"
-#include "xbt/automatonparse_promela.h"
 #include "bugged1_liveness.h"
-#include "y.tab.c"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(bugged1_liveness, "my log messages");
 
@@ -85,7 +83,7 @@ int client(int argc, char *argv[])
     if(strcmp(my_mailbox, "1") == 0){
       r = 1;
       cs = 0;
-      XBT_DEBUG("Propositions changed : r=1, cs=0");
+      XBT_INFO("Propositions changed : r=1, cs=0");
     }
 
     // wait the answer
@@ -96,7 +94,7 @@ int client(int argc, char *argv[])
     if((strcmp(my_mailbox, "1") == 0) && (strcmp("grant", kind) == 0)){
       cs = 1;
       r = 0;
-      XBT_DEBUG("Propositions changed : r=0, cs=1");
+      XBT_INFO("Propositions changed : r=0, cs=1");
     }
 
 
@@ -110,7 +108,7 @@ int client(int argc, char *argv[])
     if(strcmp(my_mailbox, "1") == 0){
       cs=0;
       r=0;
-      XBT_DEBUG("Propositions changed : r=0, cs=0");
+      XBT_INFO("Propositions changed : r=0, cs=0");
     }
     
   }
@@ -120,18 +118,17 @@ int client(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  init();
-  yyparse();
-  automaton = get_automaton();
-  xbt_new_propositional_symbol(automaton,"r", &predR); 
-  xbt_new_propositional_symbol(automaton,"cs", &predCS); 
+
+  xbt_automaton_t a = MC_create_automaton("promela1_bugged1_liveness");
+  xbt_new_propositional_symbol(a,"r", &predR); 
+  xbt_new_propositional_symbol(a,"cs", &predCS); 
   
   MSG_global_init(&argc, argv);
   MSG_create_environment("../msg_platform.xml");
   MSG_function_register("coordinator", coordinator);
   MSG_function_register("client", client);
   MSG_launch_application("deploy_bugged1_liveness.xml");
-  MSG_main_liveness(automaton, argv[0]);
+  MSG_main_liveness(a);
 
   return 0;
 }