X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=opts.c;h=c5c358d5e1dc8417a1428de24a84dde23af0d653;hp=cc647ba924440699cff3f6936d7c89d47b53515f;hb=ae09831227b2a3f81335526208aaaf54e10d794b;hpb=eb8dc60981c669a2b6c077e638a63656d5d02625

diff --git a/opts.c b/opts.c
index cc647ba..c5c358d 100644
--- a/opts.c
+++ b/opts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
  *     Wolfgang Bumiller
  *     Dale Weiler 
  *
@@ -29,18 +29,19 @@ static void opts_setdefault() {
     memset(&opts, 0, sizeof(opts_cmd_t));
     
     /* warnings */
+    opts_set(opts.warn,  WARN_UNUSED_VARIABLE,           true);
+    opts_set(opts.warn,  WARN_USED_UNINITIALIZED,        true);
     opts_set(opts.warn,  WARN_UNKNOWN_CONTROL_SEQUENCE,  true);
     opts_set(opts.warn,  WARN_EXTENSIONS,                true);
     opts_set(opts.warn,  WARN_FIELD_REDECLARED,          true);
-    opts_set(opts.warn,  WARN_TOO_FEW_PARAMETERS,        true);
     opts_set(opts.warn,  WARN_MISSING_RETURN_VALUES,     true);
-    opts_set(opts.warn,  WARN_USED_UNINITIALIZED,        true);
+    opts_set(opts.warn,  WARN_INVALID_PARAMETER_COUNT,   true);
+    opts_set(opts.warn,  WARN_LOCAL_SHADOWS,             false);
     opts_set(opts.warn,  WARN_LOCAL_CONSTANTS,           true);
     opts_set(opts.warn,  WARN_VOID_VARIABLES,            true);
     opts_set(opts.warn,  WARN_IMPLICIT_FUNCTION_POINTER, true);
     opts_set(opts.warn,  WARN_VARIADIC_FUNCTION,         true);
     opts_set(opts.warn,  WARN_FRAME_MACROS,              true);
-    opts_set(opts.warn,  WARN_UNUSED_VARIABLE,           true);
     opts_set(opts.warn,  WARN_EFFECTLESS_STATEMENT,      true);
     opts_set(opts.warn,  WARN_END_SYS_FIELDS,            true);
     opts_set(opts.warn,  WARN_ASSIGN_FUNCTION_TYPES,     true);
@@ -51,17 +52,26 @@ static void opts_setdefault() {
     opts_set(opts.warn,  WARN_MULTIBYTE_CHARACTER,       true);
     opts_set(opts.warn,  WARN_UNKNOWN_PRAGMAS,           true);
     opts_set(opts.warn,  WARN_UNREACHABLE_CODE,          true);
+    opts_set(opts.warn,  WARN_CPP,                       true);
+    opts_set(opts.warn,  WARN_UNKNOWN_ATTRIBUTE,         true);
+    opts_set(opts.warn,  WARN_RESERVED_NAMES,            true);
+    opts_set(opts.warn,  WARN_UNINITIALIZED_CONSTANT,    true);
+    opts_set(opts.warn,  WARN_UNINITIALIZED_GLOBAL,      false);
+    opts_set(opts.warn,  WARN_DEPRECATED,                true);
+    opts_set(opts.warn,  WARN_PARENTHESIS,               true);
     /* flags */
     opts_set(opts.flags, ADJUST_VECTOR_FIELDS,           true);
     opts_set(opts.flags, FTEPP,                          false);
+    opts_set(opts.flags, FTEPP_PREDEFS,                  false);
     opts_set(opts.flags, CORRECT_TERNARY,                true);
+    opts_set(opts.flags, BAIL_ON_WERROR,                 true);
 }
 
 void opts_init(const char *output, int standard, size_t arraysize) {
     opts_setdefault();
     
     opts.output         = output;
-    opts.standard       = standard;
+    opts.standard       = (opts_std_t)standard; /* C++ ... y u no like me? */
     opts.max_array_size = arraysize;
 }
 
@@ -71,7 +81,7 @@ static bool opts_setflag_all(const char *name, bool on, uint32_t *flags, const o
     for (i = 0; i < listsize; ++i) {
         if (!strcmp(name, list[i].name)) {
             longbit lb = list[i].bit;
-#if 0
+#if 1
             if (on)
                 flags[lb.idx] |= (1<<(lb.bit));
             else
@@ -87,19 +97,23 @@ static bool opts_setflag_all(const char *name, bool on, uint32_t *flags, const o
     }
     return false;
 }
-bool opts_setflag (const char *name, bool on) {
+bool opts_setflag  (const char *name, bool on) {
     return opts_setflag_all(name, on, opts.flags,        opts_flag_list, COUNT_FLAGS);
 }
-bool opts_setwarn (const char *name, bool on) {
+bool opts_setwarn  (const char *name, bool on) {
     return opts_setflag_all(name, on, opts.warn,         opts_warn_list, COUNT_WARNINGS);
 }
-bool opts_setoptim(const char *name, bool on) {
+bool opts_setwerror(const char *name, bool on) {
+    return opts_setflag_all(name, on, opts.werror,       opts_warn_list, COUNT_WARNINGS);
+}
+bool opts_setoptim (const char *name, bool on) {
     return opts_setflag_all(name, on, opts.optimization, opts_opt_list,  COUNT_OPTIMIZATIONS);
 }
 
 void opts_set(uint32_t *flags, size_t idx, bool on) {
-    longbit lb = LONGBIT(idx);
-#if 0
+    longbit lb;
+    LONGBIT_SET(lb, idx);
+#if 1
     if (on)
         flags[lb.idx] |= (1<<(lb.bit));
     else
@@ -164,7 +178,7 @@ static size_t opts_ini_parse (
     char *read_name;
     char *read_value;
 
-    while (util_getline(&line, &linesize, filehandle) != EOF) {
+    while (file_getline(&line, &linesize, filehandle) != EOF) {
         parse_beg = line;
 
         /* handle BOM */
@@ -310,11 +324,11 @@ void opts_ini_init(const char *file) {
     
     if (!file) {
         /* try ini */
-        if (!(ini = fopen((file = "gmqcc.ini"), "r")))
+        if (!(ini = file_open((file = "gmqcc.ini"), "r")))
             /* try cfg */
-            if (!(ini = fopen((file = "gmqcc.cfg"), "r")))
+            if (!(ini = file_open((file = "gmqcc.cfg"), "r")))
                 return;
-    } else if (!(ini = fopen(file, "r")))
+    } else if (!(ini = file_open(file, "r")))
         return;
 
     con_out("found ini file `%s`\n", file);
@@ -325,5 +339,5 @@ void opts_ini_init(const char *file) {
         vec_free(error);
     }
 
-    fclose(ini);
+    file_close(ini);
 }