Merge branch 'master' into diagnostics

[xonotic/gmqcc.git] / gmqcc.h

diff --git a/gmqcc.h b/gmqcc.h
index d6055dbeedf2d27ac8e8a9061744302027fcb515..9a073e2ea88f168f10e09454504a3c5b3458214d 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -781,6 +781,9 @@ int  con_vout  (const char *, va_list);
 int  con_err   (const char *, ...);
 int  con_out   (const char *, ...);
 
+bool con_color_err(void);
+bool con_color_out(void);
+
 /* error/warning interface */
 extern size_t compile_errors;
 extern size_t compile_Werrors;
@@ -1014,6 +1017,23 @@ void            ftepp_flush            (struct ftepp_s *ftepp);
 void            ftepp_add_define       (struct ftepp_s *ftepp, const char *source, const char *name);
 void            ftepp_add_macro        (struct ftepp_s *ftepp, const char *name,   const char *value);
 
+/*===================================================================*/
+/*============================= exec.c ==============================*/
+/*===================================================================*/
+enum {
+    DIAGNOSTIC_NULL,
+    DIAGNOSTIC_SEMICOLON,
+    DIAGNOSTIC_EXPRESSION_CASE,
+    DIAGNOSTIC_UNEXPECTED_IDENT,
+    DIAGNOSTIC_UNEXPECTED_TOKEN,
+    DIAGNOSTIC_EXPECTED,
+    DIAGNOSTIC_EXPECTED_END
+};
+
+void diagnostic_destroy(void);
+void diagnostic_calculate(const char *file, size_t line, size_t column, size_t diagnostic);
+
+
 /*===================================================================*/
 /*======================= main.c commandline ========================*/
 /*===================================================================*/