modification projetfinalaccent2.c fonctions.h

tvieuble
1 parent caf4de25
Showing 2 changed files with 9 additions and 8 deletions Show diff stats
fonctions.h
projetfinalaccent2.c
@@ -17,7 +17,7 @@ struct cell {
 void ajout_tete(wchar_t, struct cell**);
-struct cell ** insertion(wchar_t, struct cell**);
+struct cell ** insertion(wchar_t, struct cell**, int*);
 void initialisation_tab_arbre(struct node[]);
@@ -33,4 +33,4 @@ void correction_mot(struct node[]);
 void desallocationArbre(struct cell**);
-void desallocationTableauArbre(struct node[]);
 \ No newline at end of file
+void desallocationTableauArbre(struct node[]);
@@ -17,16 +17,17 @@ void ajout_tete(wchar_t elem, struct cell** pL) {
   *pL = p;
 }
-struct cell ** insertion(wchar_t elem, struct cell** pL) {
+struct cell ** insertion(wchar_t elem, struct cell** pL, int* lettreAjoute) {
 	if(((*pL) == NULL) || ((*pL)->arbre->lettre > elem)) {
 		ajout_tete(elem, pL);
+		if(lettreAjoute != NULL) *lettreAjoute = 1;
 		return &(*pL)->arbre->listeFils;
 	}
 	else if((*pL)->arbre->lettre == elem) {
 		return &(*pL)->arbre->listeFils;
 	}
 	else {
-		return insertion(elem, &(*pL)->arbreSuivant);
+	  return insertion(elem, &(*pL)->arbreSuivant, lettreAjoute);
 	}
 }
@@ -45,7 +46,7 @@ void initialisation_tab_arbre(struct node tab[]) {
   tab[i+5].lettre = ';';
   for(int j = 0; j <= 5; j++) { 
     tab[i+j].listeFils = NULL;
-    insertion('\0', &(tab[i+j].listeFils));
+    insertion('\0', &(tab[i+j].listeFils), NULL);
   }
 }
@@ -66,9 +67,8 @@ void remplir_dico(FILE* fd, struct node tab_arbre_prcp[]) {
   int cptmot = 0, indice = 0;
   wchar_t motLu[50];
   while(fwscanf(fd, L"%ls", motLu)==1) {
-  	int estUneLettre = 1;
+    int estUneLettre = 1, lettreAjoute = 0;
 	int i = 0;
-    cptmot += 1;
      if((motLu[0] >= 'A') && (motLu[0] <= 'Z')) {
        localisationArbre = &tab_arbre_prcp[motLu[0]-65].listeFils;
      }
@@ -91,8 +91,9 @@ void remplir_dico(FILE* fd, struct node tab_arbre_prcp[]) {
      }
      while((motLu[i] != '\0') && (estUneLettre == 1)) {
   	i += 1;
-	localisationArbre = insertion(motLu[i], localisationArbre);
+	localisationArbre = insertion(motLu[i], localisationArbre, &lettreAjoute);
      }
+     if(lettreAjoute == 1) cptmot += 1;
    }
 	wprintf(L"\n");
 	fclose(fd);