Merge branch 'master' of git.piment-noir.org:TP_AL_C

[TP_AL_C.git] / lexer / main.c

diff --git a/lexer/main.c b/lexer/main.c
index c5a04576a1c9de4f9f505601af492d6a58054af9..c67370df93b76d9f8c905f569322c4c60691a9e0 100644 (file)
--- a/lexer/main.c
+++ b/lexer/main.c
@@ -13,11 +13,7 @@ void do_lexical_analysis() {
     c = fgetwc(source); // lecture du premier caractere
     do {
         scanner();
-        if (tokenType == MOT || tokenType == MOTCLE) {
-            fwprintf(target, L"%20s: %ls\n", tokenTypestr[tokenType], token[tokenFound].value);
-        } else {
-            fwprintf(target, L"%20s\n", tokenTypestr[tokenType]);
-        }
+        wprint_token();
         token[tokenFound].type = tokenTypestr[tokenType];
         tokenFound++;
     } while (tokenType != FIN); // tant que la fin du fichier n'est pas atteinte
@@ -25,15 +21,13 @@ void do_lexical_analysis() {
 
 void do_syntactic_analysis() {
     c = fgetwc(source); // lecture du premier caractere
-    do {
-        analyze_AXIOME();
-    } while (tokenType != FIN);
+    analyze_AXIOME();
 }
 
 void print_usage(const char* name) {
     fprintf(stdout,"Usage: %s [options]\n"
                    "Where [options] are:\n"
-                   " -h, --help: display this help text\n"
+                   " -h, --help: display this help message\n"
                    " -l, --lexical-only: do only the lexical analysis\n"
                    " -i, --input<filename>: use <filename> as input file instead of standard input\n"
                    " -o, --output<filename>: use <filename> as output file instead of standard output\n",
@@ -101,7 +95,7 @@ int main(int argc, char **argv) {
         // Ouvre le fichier source en lecture seulement (le fichier doit exister) :
         source = fopen(in_file, "r+");
         if (source == NULL) {
-            pr_error("Impossible d'ouvrir le fichier %s\n", in_file);
+            pr_error("Fail to open file %s\n", in_file);
             return EXIT_FAILURE;
         }
     } else {
@@ -113,7 +107,7 @@ int main(int argc, char **argv) {
         // avec suppression du contenu au prealable :
         target = fopen(out_file, "w+");
         if (target == NULL) {
-            pr_error("Impossible d'ouvrir le fichier %s\n", out_file);
+            pr_error("Fail to open file %s\n", out_file);
             return EXIT_FAILURE;
         }
     } else {