From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Sun, 19 Nov 2017 13:34:52 +0000 (+0100)
Subject: Merge branch 'master' of git.piment-noir.org:TP_AL_C
X-Git-Url: https://git.piment-noir.org/?p=TP_AL_C.git;a=commitdiff_plain;h=82220449f3f8d1c25474651379118eda02430a3c;hp=-c

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

82220449f3f8d1c25474651379118eda02430a3c
diff --combined lexer/main.c
index ca385b3,9d49b77..c67370d
--- a/lexer/main.c
+++ b/lexer/main.c
@@@ -13,7 -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
@@@ -21,13 -25,15 +21,13 @@@
  
  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",