qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 05:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make internal_error globally available.

Browse source
This commit is contained in:
Bill Currie 2011-01-17 12:09:44 +09:00
parent 537b930ba6
commit d3a98af783
3 changed files with 46 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/qfcc/include/expr.h
View file

@ -616,11 +616,14 @@ expr_t *cast_expr (struct type_s *t, expr_t *e);
void init_elements (struct def_s *def, expr_t *eles);
expr_t *error (expr_t *e, const char *fmt, ...)
__attribute__((format(printf, 2,3)));
__attribute__ ((format (printf, 2, 3)));
void
internal_error (expr_t *e, const char *fmt, ...)
__attribute__ ((format (printf, 2, 3), noreturn));
expr_t *warning (expr_t *e, const char *fmt, ...)
__attribute__((format(printf, 2,3)));
__attribute__ ((format (printf, 2, 3)));
expr_t *notice (expr_t *e, const char *fmt, ...)
__attribute__((format(printf, 2,3)));
__attribute__ ((format (printf, 2, 3)));
const char *get_op_string (int op);

25
tools/qfcc/source/constfold.c
View file

@ -51,13 +51,6 @@ static __attribute__ ((used)) const char rcsid[] =
#include "qfcc.h"
#include "type.h"
static __attribute__ ((noreturn)) void
internal_error (expr_t *e)
{
error (e, "internal error");
abort ();
}
static expr_t *
cf_cast_expr (type_t *type, expr_t *e)
{
@ -138,7 +131,7 @@ do_op_string (int op, expr_t *e, expr_t *e1, expr_t *e2)
e1->e.integer_val = strcmp (s1, s2) != 0;
break;
default:
internal_error (e1);
internal_error (e1, 0);
}
return e1;
}
@ -167,7 +160,7 @@ convert_to_float (expr_t *e)
e = cf_cast_expr (&type_float, e);
return e;
default:
internal_error (e);
internal_error (e, 0);
}
}
@ -309,7 +302,7 @@ do_op_float (int op, expr_t *e, expr_t *e1, expr_t *e2)
e1->e.integer_val = f1 != f2;
break;
default:
internal_error (e1);
internal_error (e1, 0);
}
return e1;
}
@ -409,7 +402,7 @@ do_op_vector (int op, expr_t *e, expr_t *e1, expr_t *e2)
e1->e.integer_val = !VectorCompare (v1, v2);
break;
default:
internal_error (e1);
internal_error (e1, 0);
}
return e1;
}
@ -483,7 +476,7 @@ do_op_pointer (int op, expr_t *e, expr_t *e1, expr_t *e2)
ass->file = e2->file;
ass = fold_constants (ass);
if (e->e.expr.e2 == tmp)
internal_error (e2);
internal_error (e2, 0);
e->e.expr.e2 = ass->e.expr.e2;
}
if (op == EQ || op == NE) {
@ -596,7 +589,7 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
e1->e.integer_val = !QuatCompare (q1, q2);
break;
default:
internal_error (e1);
internal_error (e1, 0);
}
return e1;
}
@ -719,7 +712,7 @@ do_op_integer (int op, expr_t *e, expr_t *e1, expr_t *e2)
e1->e.integer_val = i1 != i2;
break;
default:
internal_error (e1);
internal_error (e1, 0);
}
return e1;
}
@ -815,7 +808,7 @@ do_op_short (int op, expr_t *e, expr_t *e1, expr_t *e2)
e1->e.integer_val = i1 != i2;
break;
default:
internal_error (e1);
internal_error (e1, 0);
}
return e1;
}
@ -1095,6 +1088,6 @@ fold_constants (expr_t *e)
return do_op_struct (op, e, e1, e2);
if (!do_op[t1] || !do_op[t1][t2])
internal_error (e);
internal_error (e, 0);
return do_op[t1][t2] (op, e, e1, e2);
}

41
tools/qfcc/source/expr.c
View file

@ -3155,27 +3155,48 @@ warning (expr_t *e, const char *fmt, ...)
return e;
}
expr_t *
error (expr_t *e, const char *fmt, ...)
static void
_error (expr_t *e, const char *err, const char *fmt, va_list args)
{
va_list args;
string_t file = pr.source_file;
int line = pr.source_line;
report_function (e);
va_start (args, fmt);
if (e) {
file = e->file;
line = e->line;
}
fprintf (stderr, "%s:%d: error: ", G_GETSTR (file), line);
vfprintf (stderr, fmt, args);
fprintf (stderr, "%s:%d: %s%s", G_GETSTR (file), line, err,
fmt ? ": " : "");
if (fmt)
vfprintf (stderr, fmt, args);
fputs ("\n", stderr);
va_end (args);
pr.error_count++;
}
if (e) {
e->type = ex_error;
}
void
internal_error (expr_t *e, const char *fmt, ...)
{
va_list args;
va_start (args, fmt);
_error (e, "internal error", fmt, args);
va_end (args);
abort ();
}
expr_t *
error (expr_t *e, const char *fmt, ...)
{
va_list args;
va_start (args, fmt);
_error (e, "error", fmt, args);
va_end (args);
if (!e)
e = new_expr ();
e->type = ex_error;
return e;
}