diff --git a/src/cparse.c b/src/cparse.c index ad196a8..5a48437 100644 --- a/src/cparse.c +++ b/src/cparse.c @@ -59,6 +59,7 @@ void find_funcs(const char *path, graph_vec *gv, graph_mco *gmc) reallocarray(gv->node[cur_node]->succ, (gv->node[cur_node]->cap += 5), sizeof(nodept)); gv->node[cur_node]->succ[gv->node[cur_node]->nbs] = gv->node[index]; gv->node[cur_node]->nbs++; + gv->node[index]->call = true; mcinsert_edge(gmc, cur_node, index); } else { @@ -68,6 +69,7 @@ void find_funcs(const char *path, graph_vec *gv, graph_mco *gmc) reallocarray(gv->node[cur_node]->succ, (gv->node[cur_node]->cap += 5), sizeof(nodept)); gv->node[cur_node]->succ[gv->node[cur_node]->nbs] = gv->node[gv->n]; gv->node[cur_node]->nbs++; + gv->node[gv->n]->call = true; mcinsert_func(gmc, token); mcinsert_edge(gmc, cur_node, -1); diff --git a/src/main.c b/src/main.c index c6d48f8..266fc89 100644 --- a/src/main.c +++ b/src/main.c @@ -33,11 +33,24 @@ int main(int argc, char *argv[]) // printf("%d.%s -> %d.%s\n", gmc.vec[i].i, gmc.func[gmc.vec[i].i], gmc.vec[i].j, gmc.func[gmc.vec[i].j]); // } // puts("\n"); - vprint(gv.node[8], &gv); - mcprint(gmc, 8); - - vfind_cycles(&gv); - mcfind_cycles(&gmc); + + for (int i = 0; i <= gmc.nbs; ++i) { + if (!gmc.call[i]) { + mcprint(gmc, i); + puts("\n"); + } + } + for (int i = 0; i <= gv.n; ++i) { + if (!gv.node[i]->call) { + vprint(gv.node[i], &gv); + puts("\n"); + } + } + // vprint(gv.node[8], &gv); + // mcprint(gmc, 8); + // + // vfind_cycles(&gv); + // mcfind_cycles(&gmc); vdot_graph(gv, true); mcdot_graph(gmc, true); diff --git a/src/matcom.c b/src/matcom.c index 93a3cdf..bce301e 100644 --- a/src/matcom.c +++ b/src/matcom.c @@ -14,9 +14,11 @@ graph_mco mcgragh(void) g.nba = -1; g.func = malloc((g.fcap = 10) * sizeof(fix_str)); assert(g.func); + g.call = malloc((g.fcap = 10) * sizeof(bool)); + assert(g.call); g.vec = malloc((g.vcap = 10) * sizeof(struct edge)); - g.vu = NULL; assert(g.vec); + g.vu = NULL; return g; } @@ -26,6 +28,8 @@ void mcinsert_func(graph_mco *g, fix_str i) if (g->nbs == g->fcap) { g->func = reallocarray(g->func, (g->fcap += 128), sizeof(fix_str)); assert(g->func); + g->call = reallocarray(g->call, g->fcap, sizeof(bool)); + assert(g->call); } strcpy(g->func[g->nbs], i); } @@ -39,10 +43,13 @@ void mcinsert_edge(graph_mco *g, int dep, int arr) assert(g->vec); } e.i = dep; - if (arr == -1) + if (arr == -1) { e.j = g->nbs; - else + g->call[g->nbs] = true; + } else { e.j = arr; + g->call[arr] = true; + } g->vec[g->nba] = e; } @@ -80,20 +87,27 @@ static void mcprint_succ(graph_mco g, int succ) static void mcprint_edges(graph_mco g, int n) { - int i; + int i, j = 0; if (g.vu[n]) return; g.vu[n] = 1; printf("NODE: %s\n", g.func[n]); for (i = 0; i <= g.nba; ++i) { if (g.vec[i].i == n) { + j++; mcprint_succ(g, g.vec[i].j); } } + // HACK + if (j == 0) { + printf("\033[A\033[2K"); + rewind(stdout); + } + for (i = 0; i <= g.nba; ++i) { if (g.vec[i].i == n) { if (g.vec[g.vec[i].j].i != -1) - mcprint_edges(g, g.vec[g.vec[i].j].i); + mcprint_edges(g, g.vec[i].j); } } } diff --git a/src/matcom.h b/src/matcom.h index 8fdb201..51f0f2c 100644 --- a/src/matcom.h +++ b/src/matcom.h @@ -17,6 +17,7 @@ struct graph_mco { int nba; // nombre d'aretes int vcap; // capacité de vec int fcap; // capacité de func + bool *call; // si la fontion a ete appele int *vu; // status de sommets fix_str *func; // noms de fonctions struct edge *vec; // vecteur d'aretes diff --git a/src/vec.c b/src/vec.c index d3df220..e0ef5be 100644 --- a/src/vec.c +++ b/src/vec.c @@ -29,6 +29,7 @@ void vinsert_node(graph_vec *g, fix_str str) n->nbs = 0; n->vu = 0; n->cap = 5; + n->call = false; n->succ = malloc(5 * sizeof(nodept)); strcpy(n->func, str); g->node[g->n] = n; diff --git a/src/vec.h b/src/vec.h index 78d246d..802b2c0 100644 --- a/src/vec.h +++ b/src/vec.h @@ -15,6 +15,7 @@ struct nodes { }; struct node { + bool call; // fonction a ete appele ou pas int vu; // status de noeud (`vu/en traitement/fini` pour dfs ou `vu/non vu` pour affichage) int num; // le numero de noeud int nbs; // nombre de successeurs diff --git a/test.c b/test.c index 14587c3..525cbf1 100644 --- a/test.c +++ b/test.c @@ -9,6 +9,11 @@ void bar(void); int foo(void); int toto(int a, int b); +void bobo(void) +{ + aurevoir(); +} + int aurevoir(void) { return 42;