lc-compile: Add -Werror option

peter-b · peter-b · commit 80139b1e39cf · 2015-11-06T12:53:04.000Z
Make lc-compile understand a `-Werror` command-line option, that turns
all warnings into errors.  This is extremely basic: it doesn't support
turning warnings on or off for particular warning types, or any
different ways of specifying command-line options (e.g. `-W error` or
`--warn error`).
diff --git a/toolchain/lc-compile/src/main.c b/toolchain/lc-compile/src/main.c
@@ -104,6 +104,7 @@ usage(int status)
 "      --deps changed-order Generate the order the input source files should be\n"
 "                           compiled in, but only if they need recompiling.\n"
 "      --manifest MANIFEST  Filename for generated manifest.\n"
+"      -Werror              Turn all warnings into errors.\n"
 "  -v, --verbose            Output extra debugging information.\n"
 "  -h, --help               Print this message.\n"
 "  --                       Treat all remaining arguments as filenames.\n"
@@ -180,6 +181,15 @@ static void full_main(int argc, char *argv[])
                 SetManifestOutputFile(argv[++argi]);
                 continue;
             }
+            /* FIXME This should be expanded to support "-W error",
+             * "--warn error", "--warn=error", etc.  Also options for
+             * enabling/disabling/errorifying particular warning
+             * types. */
+            if (0 == strcmp(opt, "-Werror"))
+            {
+                s_is_werror_enabled = 1;
+                continue;
+            }
             if (0 == strcmp(opt, "-v") || 0 == strcmp(opt, "--verbose"))
             {
                 ++s_verbose_level;
diff --git a/toolchain/lc-compile/src/report.c b/toolchain/lc-compile/src/report.c
@@ -28,6 +28,7 @@ extern int IsDependencyCompile(void);
 
 static int s_error_count;
 int s_verbose_level;
+int s_is_werror_enabled;
 
 void InitializeReports(void)
 {
@@ -162,9 +163,16 @@ static void _Warning(long p_position, const char *p_message)
 {
     if (IsDependencyCompile())
         return;
-    
-    _PrintPosition(p_position);
-    fprintf(stderr, "warning: %s\n", p_message);
+
+    if (s_is_werror_enabled)
+    {
+        _Error(p_position, p_message);
+    }
+    else
+    {
+        _PrintPosition(p_position);
+        fprintf(stderr, "warning: %s\n", p_message);
+    }
 }
 
 static void _ErrorS(long p_position, const char *p_message, const char *p_string)
@@ -173,6 +181,7 @@ static void _ErrorS(long p_position, const char *p_message, const char *p_string
     GetColumnOfPosition(p_position, &t_column);
     GetRowOfPosition(p_position, &t_row);
     _PrintPosition(p_position);
+    fprintf(stderr, "error: ");
     fprintf(stderr, p_message, p_string);
     fprintf(stderr, "\n");
     s_error_count += 1;
@@ -184,13 +193,20 @@ static void _WarningS(long p_position, const char *p_message, const char *p_stri
     
     if (IsDependencyCompile())
         return;
-    
-    GetColumnOfPosition(p_position, &t_column);
-    GetRowOfPosition(p_position, &t_row);
-    _PrintPosition(p_position);
-    fprintf(stderr, "warning: ");
-    fprintf(stderr, p_message, p_string);
-    fprintf(stderr, "\n");
+
+    if (s_is_werror_enabled)
+    {
+       _ErrorS(p_position, p_message, p_string);
+    }
+    else
+    {
+        GetColumnOfPosition(p_position, &t_column);
+        GetRowOfPosition(p_position, &t_row);
+        _PrintPosition(p_position);
+        fprintf(stderr, "warning: ");
+        fprintf(stderr, p_message, p_string);
+        fprintf(stderr, "\n");
+    }
 }
 
 static void _ErrorI(long p_position, const char *p_message, NameRef p_name)
diff --git a/toolchain/lc-compile/src/report.h b/toolchain/lc-compile/src/report.h
@@ -21,6 +21,7 @@
 extern "C" {
 #endif
 
+extern int s_is_werror_enabled;
 extern int s_verbose_level;
 
 void InitializeReports(void);
