#include <unistd.h>
#endif
-#define GMQCC_IS_STDOUT(X) ((X) == stdout)
-#define GMQCC_IS_STDERR(X) ((X) == stderr)
+#define GMQCC_IS_STDOUT(X) ((FILE*)((void*)X) == stdout)
+#define GMQCC_IS_STDERR(X) ((FILE*)((void*)X) == stderr)
#define GMQCC_IS_DEFINE(X) (GMQCC_IS_STDERR(X) || GMQCC_IS_STDOUT(X))
typedef struct {
FILE *handle_err;
FILE *handle_out;
-
+
int color_err;
int color_out;
} con_t;
* Doing colored output on windows is fucking stupid. The linux way is
* the real way. So we emulate it on windows :)
*/
-#ifdef _WIN32
+#ifdef _MSC_VER
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
* with yay, another macro :P
*/
#define isatty _isatty
-
+
enum {
RESET = 0,
BOLD = 1,
WWHITE
};
-static void win_fputs(char *str, FILE *f) {
+static void win_fputs(char *str, FILE *h) {
/* state for translate */
int acolor;
int wcolor;
int icolor;
-
+
int state;
int place;
-
+
/* attributes */
int intense = -1;
int colors[] = {-1, -1 };
int colorpos = 1;
-
+
CONSOLE_SCREEN_BUFFER_INFO cinfo;
- GetConsoleScreenBufferInfo(
- (h == stdout) ?
+ GetConsoleScreenBufferInfo (
+ (GMQCC_IS_STDOUT(h)) ?
GetStdHandle(STD_OUTPUT_HANDLE) :
GetStdHandle(STD_ERROR_HANDLE), &cinfo
);
icolor = cinfo.wAttributes;
-
+
while (*str) {
if (*str == '\e')
state = '\e';
acolor += (colors[find] - 48) * mult;
mult *= 10;
}
-
+
/* convert to windows color */
if (acolor == BOLD)
intense = WINTENSE;
wcolor = WWHITE;
intense = WBLACK;
}
-
- SetConsoleTextattribute(
+
+ SetConsoleTextAttribute (
(h == stdout) ?
GetStdHandle(STD_OUTPUT_HANDLE) :
GetStdHandle(STD_ERROR_HANDLE),
-
+
wcolor | intense | (icolor & 0xF0)
);
colorpos = 1;
}
/* restore */
SetConsoleTextAttribute(
- (h == stdout) ?
+ (GMQCC_IS_STDOUT(h)) ?
GetStdHandle(STD_OUTPUT_HANDLE) :
GetStdHandle(STD_ERROR_HANDLE),
icolor
* Enables color on output if supported.
* NOTE: The support for checking colors is NULL. On windows this will
* always work, on *nix it depends if the term has colors.
- *
+ *
* NOTE: This prevents colored output to piped stdout/err via isatty
* checks.
*/
*/
static int con_write(FILE *handle, const char *fmt, va_list va) {
int ln;
- #ifndef _WIN32
+ #ifndef _MSC_VER
ln = vfprintf(handle, fmt, va);
#else
{
*/
int con_change(const char *out, const char *err) {
con_close();
-
- if (GMQCC_IS_DEFINE((FILE*)out)) {
- console.handle_out = (((FILE*)err) == stdout) ? stdout : stderr;
+
+ if (GMQCC_IS_DEFINE(out)) {
+ console.handle_out = GMQCC_IS_STDOUT(out) ? stdout : stderr;
con_enablecolor();
} else if (!(console.handle_out = fopen(out, "w"))) return 0;
-
- if (GMQCC_IS_DEFINE((FILE*)err)) {
- console.handle_err = (((FILE*)err) == stdout) ? stdout : stderr;
+
+ if (GMQCC_IS_DEFINE(err)) {
+ console.handle_err = GMQCC_IS_STDOUT(err) ? stdout : stderr;
con_enablecolor();
} else if (!(console.handle_err = fopen(err, "w"))) return 0;
-
+
+ /* no buffering */
+ setvbuf(console.handle_out, NULL, _IONBF, 0);
+ setvbuf(console.handle_err, NULL, _IONBF, 0);
+
return 1;
}
return ln;
}
-
/*
* Utility console message writes for lexer contexts. These will allow
* for reporting of file:line based on lexer context, These are used
* heavily in the parser/ir/ast.
*/
-void con_vprintmsg(int level, const char *name, size_t line, const char *msgtype, const char *msg, va_list ap) {
+void con_vprintmsg_c(int level, const char *name, size_t line, const char *msgtype, const char *msg, va_list ap, const char *condname) {
/* color selection table */
static int sel[] = {
CON_WHITE,
CON_CYAN,
CON_RED
};
-
- int err = !!(level == LVL_ERROR);
- int color = (err) ? console.color_err : console.color_out;
-
- /* this might confuse you :P */
- ((err) ? &con_err : &con_out)(
- (color) ?
- "\033[0;%dm%s:%d: \033[0;%dm%s: \033[0m" :
- "%s:%d: %s: ",
-
- CON_CYAN,
- name,
- (int)line,
- sel[level],
- msgtype
- );
-
- con_verr(msg, ap);
- fprintf (stderr, "\n");
+
+ int err = !!(level == LVL_ERROR);
+ int color = (err) ? console.color_err : console.color_out;
+ int (*print) (const char *, ...) = (err) ? &con_err : &con_out;
+ int (*vprint)(const char *, va_list) = (err) ? &con_verr : &con_vout;
+
+ if (color)
+ print("\033[0;%dm%s:%d: \033[0;%dm%s: \033[0m", CON_CYAN, name, (int)line, sel[level], msgtype);
+ else
+ print("%s:%d: %s: ", name, (int)line, msgtype);
+
+ vprint(msg, ap);
+ if (condname)
+ print(" [%s]\n", condname);
+ else
+ print("\n");
+}
+
+void con_vprintmsg(int level, const char *name, size_t line, const char *msgtype, const char *msg, va_list ap) {
+ con_vprintmsg_c(level, name, line, msgtype, msg, ap, NULL);
}
void con_printmsg(int level, const char *name, size_t line, const char *msgtype, const char *msg, ...) {
con_cvprintmsg(ctx, lvl, msgtype, msg, va);
va_end (va);
}
+
+/* General error interface */
+size_t compile_errors = 0;
+size_t compile_warnings = 0;
+
+void vcompile_error(lex_ctx ctx, const char *msg, va_list ap)
+{
+ ++compile_errors;
+ con_cvprintmsg((void*)&ctx, LVL_ERROR, "error", msg, ap);
+}
+
+void compile_error(lex_ctx ctx, const char *msg, ...)
+{
+ va_list ap;
+ va_start(ap, msg);
+ vcompile_error(ctx, msg, ap);
+ va_end(ap);
+}
+
+bool GMQCC_WARN vcompile_warning(lex_ctx ctx, int warntype, const char *fmt, va_list ap)
+{
+ int lvl = LVL_WARNING;
+ char warn_name[1024];
+
+ if (!OPTS_WARN(warntype))
+ return false;
+
+ warn_name[0] = '-';
+ warn_name[1] = 'W';
+ (void)util_strtononcmd(opts_warn_list[warntype].name, warn_name+2, sizeof(warn_name)-2);
+
+ if (opts.werror) {
+ ++compile_errors;
+ lvl = LVL_ERROR;
+ }
+ else
+ ++compile_warnings;
+
+ con_vprintmsg_c(lvl, ctx.file, ctx.line, (opts.werror ? "error" : "warning"), fmt, ap, warn_name);
+
+ return opts.werror;
+}
+
+bool GMQCC_WARN compile_warning(lex_ctx ctx, int warntype, const char *fmt, ...)
+{
+ bool r;
+ va_list ap;
+ va_start(ap, fmt);
+ r = vcompile_warning(ctx, warntype, fmt, ap);
+ va_end(ap);
+ return r;
+}
projects / xonotic / gmqcc.git / blobdiff