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 f8622174c4b2c8cb52f5a84f4ce0aff74a87a6dc..7c31ee37aa388dd52629cc95f06359a560b56f9e 100644 (file)
--- a/lexer/main.c
+++ b/lexer/main.c
@@ -13,7 +13,7 @@ void do_lexical_analysis() {
     c = fgetwc(source); // lecture du premier caractere
     do {
         scanner();
-        wprint_token_target();
+        wprint_token(target);
         token[tokenFound].type = tokenTypestr[tokenType];
         tokenFound++;
     } while (tokenType != FIN); // tant que la fin du fichier n'est pas atteinte
@@ -84,13 +84,15 @@ int main(int argc, char **argv) {
             case ':':
                 /* missing option argument */
                 pr_error("%s: option '-%c' requires an argument\n",
-                        argv[0], optopt);
+                         argv[0], optopt);
                 break;
             case '?':
             default:
                 /* invalid option */
                 pr_error("%s: option '-%c' is invalid: ignored\n",
-                        argv[0], optopt);
+                         argv[0], optopt);
+                /* print the help message for invalid options */
+                hflag = 1;
                 break;
         }
     }
@@ -120,7 +122,7 @@ int main(int argc, char **argv) {
 
     if (hflag) {
         print_usage(argv[0]);
-    } else if (lflag){
+    } else if (lflag) {
         do_lexical_analysis();
     } else {
         do_syntactic_analysis();