A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialize saveptr and please dumb compilers.
[simgrid.git]
/
src
/
xbt
/
automaton
/
automatonparse_promela.c
diff --git
a/src/xbt/automaton/automatonparse_promela.c
b/src/xbt/automaton/automatonparse_promela.c
index
1df0120
..
f35835d
100644
(file)
--- a/
src/xbt/automaton/automatonparse_promela.c
+++ b/
src/xbt/automaton/automatonparse_promela.c
@@
-1,55
+1,58
@@
/* methods for implementation of automaton from promela description */
/* methods for implementation of automaton from promela description */
-/* Copyright (c) 2011-2013. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2011-2017. 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. */
/* 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 "src/internal_config.h"
#include "xbt/automaton.h"
#include <errno.h>
#include "xbt/automaton.h"
#include <errno.h>
-#include <string.h> /* strerror */
+#include <string.h> /* strerror */
+#if HAVE_UNISTD_H
+# include <unistd.h> /* isatty */
+#endif
static xbt_automaton_t parsed_automaton;
char* state_id_src;
static void new_state(char* id, int src){
static xbt_automaton_t parsed_automaton;
char* state_id_src;
static void new_state(char* id, int src){
-
- char* id_
state =
strdup(id);
- char* first_part = strtok
(id,"_"
);
+ char* saveptr = NULL; // for strtok_r()
+ char* id_
copy = xbt_
strdup(id);
+ char* first_part = strtok
_r(id_copy, "_", &saveptr
);
int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
if(strcmp(first_part,"accept")==0){
type = 1;
}else{
int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
if(strcmp(first_part,"accept")==0){
type = 1;
}else{
- char* second_part = strtok
(NULL,"_"
);
+ char* second_part = strtok
_r(NULL, "_", &saveptr
);
if(strcmp(second_part,"init")==0){
type = -1;
}
}
if(strcmp(second_part,"init")==0){
type = -1;
}
}
+ free(id_copy);
- xbt_automaton_state_t state = NULL;
- state = xbt_automaton_state_exists(parsed_automaton, id_state);
+ xbt_automaton_state_t state = xbt_automaton_state_exists(parsed_automaton, id);
if(state == NULL){
if(state == NULL){
- state = xbt_automaton_state_new(parsed_automaton, type, id
_state
);
+ state = xbt_automaton_state_new(parsed_automaton, type, id);
}
if(type==-1)
parsed_automaton->current_state = state;
}
if(type==-1)
parsed_automaton->current_state = state;
- if(src)
- state_id_src = strdup(id_state);
-
+ if(src) {
+ if (state_id_src)
+ free(state_id_src);
+ state_id_src = xbt_strdup(id);
+ }
}
}
-static void new_transition(char* id, xbt_automaton_exp_label_t label){
-
- char* id_state = strdup(id);
- xbt_automaton_state_t state_dst = NULL;
+static void new_transition(char* id, xbt_automaton_exp_label_t label)
+{
new_state(id, 0);
new_state(id, 0);
-
state_dst = xbt_automaton_state_exists(parsed_automaton, id_state
);
+
xbt_automaton_state_t state_dst = xbt_automaton_state_exists(parsed_automaton, id
);
xbt_automaton_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_transition_new(parsed_automaton, state_src, state_dst, label);
//xbt_transition_t trans = NULL;
xbt_automaton_transition_new(parsed_automaton, state_src, state_dst, label);
@@
-57,41
+60,40
@@
static void new_transition(char* id, xbt_automaton_exp_label_t label){
static xbt_automaton_exp_label_t new_label(int type, ...){
xbt_automaton_exp_label_t label = NULL;
static xbt_automaton_exp_label_t new_label(int type, ...){
xbt_automaton_exp_label_t label = NULL;
+ 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){
va_list ap;
va_start(ap,type);
switch(type){
- case 0 :
{
-
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);
+ case 0 :
+ left = va_arg(ap, xbt_automaton_exp_label_t);
+ right = va_arg(ap, xbt_automaton_exp_label_t);
label = xbt_automaton_exp_label_new(type, left, right);
break;
label = xbt_automaton_exp_label_new(type, left, right);
break;
- }
- case 1 : {
- 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);
+ case 1 :
+ left = va_arg(ap, xbt_automaton_exp_label_t);
+ right = va_arg(ap, xbt_automaton_exp_label_t);
label = xbt_automaton_exp_label_new(type, left, right);
break;
label = xbt_automaton_exp_label_new(type, left, right);
break;
- }
- case 2 : {
- xbt_automaton_exp_label_t exp_not = va_arg(ap, xbt_automaton_exp_label_t);
+ case 2 :
+ exp_not = va_arg(ap, xbt_automaton_exp_label_t);
label = xbt_automaton_exp_label_new(type, exp_not);
break;
label = xbt_automaton_exp_label_new(type, exp_not);
break;
- }
- case 3 : {
- char* p = va_arg(ap, char*);
+ case 3 :
+ p = va_arg(ap, char*);
label = xbt_automaton_exp_label_new(type, p);
break;
label = xbt_automaton_exp_label_new(type, p);
break;
- }
- case 4 : {
+ case 4 :
label = xbt_automaton_exp_label_new(type);
break;
}
label = xbt_automaton_exp_label_new(type);
break;
}
- }
va_end(ap);
return label;
}
va_end(ap);
return label;
}
-
#include "parserPromela.tab.cacc"
void xbt_automaton_load(xbt_automaton_t a, const char *file)
#include "parserPromela.tab.cacc"
void xbt_automaton_load(xbt_automaton_t a, const char *file)