Support in the AST for TYPE_FIELD globals which are no actual fields

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 149ea46ab17681efbc208e7c9806fe986efc7d8c..a65a735ebb6b351442bf6c8be743bc31bc654a76 100644 (file)
--- a/main.c
+++ b/main.c
@@ -34,11 +34,16 @@ bool        opts_memchk   = false;
 bool        opts_dump     = false;
 bool        opts_werror   = false;
 bool        opts_forcecrc = false;
+bool        opts_pp_only  = false;
 
 uint16_t    opts_forced_crc;
 
 static bool opts_output_wasset = false;
 
+/* set by the standard */
+const oper_info *operators      = NULL;
+size_t           operator_count = 0;
+
 typedef struct { char *filename; int type; } argitem;
 VECTOR_MAKE(argitem, items);
 
@@ -57,6 +62,7 @@ static int usage() {
     printf("  -o, --output=file      output file, defaults to progs.dat\n"
            "  -a filename            add an asm file to be assembled\n"
            "  -s filename            add a progs.src file to be used\n");
+    printf("  -E                     stop after preprocessing\n");
     printf("  -f<flag>               enable a flag\n"
            "  -fno-<flag>            disable a flag\n"
            "  -std standard          select one of the following standards\n"
@@ -65,14 +71,13 @@ static int usage() {
            "       -std=gmqcc        this compiler (default)\n");
     printf("  -W<warning>            enable a warning\n"
            "  -Wno-<warning>         disable a warning\n"
-           "  -Wall                  enable all warnings\n");
+           "  -Wall                  enable all warnings\n"
+           "  -Werror                treat warnings as errors\n");
     printf("  -force-crc=num         force a specific checksum into the header\n");
     printf("\n");
     printf("flags:\n"
-           "  -fdarkplaces-string-table-bug\n"
-           "            patch the string table to work with some bugged darkplaces versions\n"
-           "  -fomit-nullbytes\n"
-           "            omits certain null-bytes for a smaller output - requires a patched engine\n"
+           "  -fadjust-vector-fields\n"
+           "            when assigning a vector field, its _y and _z fields also get assigned\n"
            );
     return -1;
 }
@@ -209,6 +214,10 @@ static bool options_parse(int argc, char **argv) {
                     exit(0);
                     break;
 
+                case 'E':
+                    opts_pp_only = true;
+                    break;
+
                 /* handle all -fflags */
                 case 'f':
                     util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
@@ -249,6 +258,11 @@ static bool options_parse(int argc, char **argv) {
                         opts_werror = true;
                         break;
                     }
+                    else if (!strcmp(argv[0]+2, "NONE")) {
+                        for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
+                            opts_warn[itr] = 0;
+                        break;
+                    }
                     else if (!strcmp(argv[0]+2, "ALL")) {
                         for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
                             opts_warn[itr] = 0xFFFFFFFFL;
@@ -395,11 +409,26 @@ int main(int argc, char **argv) {
     options_set(opts_warn, WARN_LOCAL_CONSTANTS, true);
     options_set(opts_warn, WARN_VOID_VARIABLES, true);
     options_set(opts_warn, WARN_IMPLICIT_FUNCTION_POINTER, true);
+    options_set(opts_warn, WARN_VARIADIC_FUNCTION, true);
+    options_set(opts_warn, WARN_FRAME_MACROS, true);
+    options_set(opts_warn, WARN_UNUSED_VARIABLE, true);
+    options_set(opts_warn, WARN_EFFECTLESS_STATEMENT, true);
+    options_set(opts_warn, WARN_END_SYS_FIELDS, true);
+    options_set(opts_warn, WARN_ASSIGN_FUNCTION_TYPES, true);
 
     if (!options_parse(argc, argv)) {
         return usage();
     }
 
+    /* the standard decides which set of operators to use */
+    if (opts_standard == COMPILER_GMQCC) {
+        operators = c_operators;
+        operator_count = c_operator_count;
+    } else {
+        operators = qcc_operators;
+        operator_count = qcc_operator_count;
+    }
+
     if (opts_dump) {
         for (itr = 0; itr < COUNT_FLAGS; ++itr) {
             printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr));
@@ -437,7 +466,11 @@ int main(int argc, char **argv) {
             }
         }
 
-        parser_finish(opts_output);
+        if (!parser_finish(opts_output)) {
+            retval = 1;
+            goto cleanup;
+        }
+
     } else {
         FILE *src;
         char *line;