Reorder includes.

[TP_AL_C.git] / lexer / main.c
diff --git a/lexer/main.c b/lexer/main.c

index 85adea092562d8c3c248b632060eff1933158b36..d1efb4b6743e5deb766207a327c429c9d4100b5f 100644 (file)
--- a/lexer/main.c
+++ b/lexer/main.c
@@ -5,29 +5,30 @@
  #include <getopt.h>
  
  #include "global_vars.h"
+#include "print_helper.h"
  #include "lexical_analyzer.h"
  #include "syntactic_analyzer.h"
-#include "print_helper.h"
  
-void do_lexical_analysis() {
+static 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
  }
  
-void do_syntactic_analysis() {
+static void do_syntactic_analysis() {
      fputws(L"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"fr_FR\" lang=\"fr_FR\">\n",
             target);
      c = fgetwc(source); // lecture du premier caractere
+    scanner();
      analyze_AXIOME();
      fputws(L"</html>\n", target);
  }
  
-void print_usage(const char* name) {
+static void print_usage(const char* name) {
      fprintf(stdout,"Usage: %s [options]\n"
                     "Where [options] are:\n"
                     " -h, --help: display this help message\n"
@@ -122,7 +123,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();