removed superfluous &

[cparser] / main.c

diff --git a/main.c b/main.c
index a13ecf3..2790e01 100644 (file)
--- a/main.c
+++ b/main.c
@@ -46,14 +46,17 @@
 
 #include "lexer.h"
 #include "token_t.h"
+#include "types.h"
 #include "type_hash.h"
 #include "parser.h"
 #include "ast2firm.h"
+#include "diagnostic.h"
 #include "lang_features.h"
+#include "driver/firm_opt.h"
 #include "driver/firm_cmdline.h"
 #include "adt/error.h"
 #include "write_fluffy.h"
-#include "driver/firm_opt.h"
+#include "revision.h"
 
 #ifndef PREPROCESSOR
 #define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int"
@@ -68,7 +71,7 @@
 #endif
 
 /** The current c mode/dialect. */
-unsigned int c_mode = _C99|_GNUC;
+unsigned int c_mode = _C89|_C99|_GNUC;
 
 /** The 'machine size', 16, 32 or 64 bit, 32bit is the default. */
 unsigned int machine_size = 32;
@@ -76,6 +79,9 @@ unsigned int machine_size = 32;
 /** true if the char type is signed. */
 bool char_is_signed = true;
 
+/** true for strict language checking. */
+bool strict_mode = false;
+
 static int            verbose;
 static struct obstack cppflags_obst;
 
@@ -365,6 +371,8 @@ int main(int argc, char **argv)
                        char_is_signed = true;
                } else if(strcmp(arg, "--unsigned-chars") == 0) {
                        char_is_signed = false;
+               } else if(strcmp(arg, "--strict") == 0) {
+                       strict_mode = true;
                } else if(strcmp(arg, "--no-ms") == 0) {
                        c_mode &= ~_MS;
                } else if(strcmp(arg, "--lextest") == 0) {
@@ -373,6 +381,20 @@ int main(int argc, char **argv)
                        mode = PrintAst;
                } else if(strcmp(arg, "--print-fluffy") == 0) {
                        mode = PrintFluffy;
+               } else if(strcmp(arg, "--version") == 0) {
+                       firm_version_t ver;
+                       firm_get_version(&ver);
+                       printf("cparser (%d.%d %s) using libFirm (%u.%u", 0, 1, cparser_REVISION, ver.major, ver.minor);
+                       if(ver.revision[0] != 0) {
+                               putchar(' ');
+                               fputs(ver.revision, stdout);
+                       }
+                       if(ver.build[0] != 0) {
+                               putchar(' ');
+                               fputs(ver.build, stdout);
+                       }
+                       puts(")\n");
+                       exit(EXIT_SUCCESS);
                } else if(strcmp(arg, "-fsyntax-only") == 0) {
                        mode = ParseOnly;
                } else if(strncmp(arg, "-I", 2) == 0) {
@@ -383,6 +405,10 @@ int main(int argc, char **argv)
                        const char *opt;
                        GET_ARG_AFTER(opt, "-D");
                        obstack_printf(&cppflags_obst, " -D%s", opt);
+               } else if(strncmp(arg, "-U", 2) == 0) {
+                       const char *opt;
+                       GET_ARG_AFTER(opt, "-U");
+                       obstack_printf(&cppflags_obst, " -U%s", opt);
                } else if(strcmp(arg, "--dump-function") == 0) {
                        ++i;
                        if(i >= argc) {
@@ -395,16 +421,26 @@ int main(int argc, char **argv)
                        mode         = CompileDump;
                } else if(strcmp(arg, "-v") == 0) {
                        verbose = 1;
+               } else if(strcmp(arg, "-w") == 0) {
+                       inhibit_all_warnings = true;
                } else if(arg[0] == '-' && arg[1] == 'f') {
                        const char *opt;
                        GET_ARG_AFTER(opt, "-f");
-                       int res = firm_option(opt);
-                       if (res == 0) {
-                               fprintf(stderr, "error: unknown Firm option '-f %s'\n", opt);
-                               argument_errors = true;
-                               continue;
-                       } else if (res == -1) {
-                               help_displayed = true;
+
+                       if(strcmp(opt, "omit-frame-pointer") == 0) {
+                               firm_be_option("omitfp");
+                       } else if(strcmp(opt, "no-omit-frame-pointer") == 0) {
+                               firm_be_option("omitfp=no");
+                       } else {
+                               int res = firm_option(opt);
+                               if (res == 0) {
+                                       fprintf(stderr, "error: unknown Firm option '-f %s'\n",
+                                               opt);
+                                       argument_errors = true;
+                                       continue;
+                               } else if (res == -1) {
+                                       help_displayed = true;
+                               }
                        }
                } else if(arg[0] == '-' && arg[1] == 'b') {
                        const char *opt;
@@ -417,6 +453,16 @@ int main(int argc, char **argv)
                        } else if (res == -1) {
                                help_displayed = true;
                        }
+               } else if(arg[0] == '-' && arg[1] == 'W') {
+                       const char *opt;
+                       GET_ARG_AFTER(opt, "-W");
+                       if (strcmp(opt, "error") == 0) {
+                               warnings_are_errors = true;
+                       } else if (strcmp(opt, "fatal-errors") == 0) {
+                               fatal_errors = true;
+                       } else {
+                               fprintf(stderr, "warning: ignoring gcc option -W%s\n", opt);
+                       }
                } else if(arg[0] == '-' && arg[1] == 'm') {
                        const char *opt;
                        GET_ARG_AFTER(opt, "-m");
@@ -429,8 +475,9 @@ int main(int argc, char **argv)
                        if (value != 16 && value != 32 && value != 64) {
                                fprintf(stderr, "error: option -m supports only 16, 32 or 64\n");
                                argument_errors = true;
-                       } else
+                       } else {
                                machine_size = (unsigned int)value;
+                       }
                } else if(arg[0] == '-') {
                        if (arg[1] == '\0') {
                                if(input != NULL) {
@@ -442,8 +489,6 @@ int main(int argc, char **argv)
                        } else if(strcmp(arg, "-pedantic") == 0) {
                                fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
                        } else if(arg[1] == 'O' ||
-                                       arg[1] == 'f' ||
-                                       arg[1] == 'W' ||
                                        arg[1] == 'g' ||
                                        strncmp(arg + 1, "std=", 4) == 0) {
                                fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
@@ -461,6 +506,9 @@ int main(int argc, char **argv)
                }
        }
 
+       /* we do the lowering in ast2firm */
+       firm_opt.lower_bitfields = FALSE;
+
        if(help_displayed) {
                return !argument_errors;
        }
@@ -474,12 +522,13 @@ int main(int argc, char **argv)
        init_tokens();
        init_types();
        init_typehash();
+       init_basic_types();
        init_lexer();
        init_ast();
        init_parser();
        init_ast2firm();
 
-       FILE *out;
+       FILE *out = NULL;
        char  outnamebuf[4096];
        if(outname == NULL) {
                switch(mode) {
@@ -547,8 +596,14 @@ int main(int argc, char **argv)
        FILE *preprocessed_in = preprocess(in, input);
        translation_unit_t *const unit = do_parsing(preprocessed_in, input);
        pclose(preprocessed_in);
-       if(unit == NULL)
-               return 1;
+       if(unit == NULL) {
+               /* parsing failed because of errors */
+               fprintf(stderr, "%u error(s), %u warning(s)\n", error_count, warning_count);
+               return EXIT_FAILURE;
+       }
+       if (warning_count > 0) {
+               fprintf(stderr, "%u warning(s)\n", warning_count);
+       }
 
        if(mode == PrintAst) {
                type_set_output(out);