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

various little cleanups

Browse source
This commit is contained in:
Bill Currie 2001-07-26 05:08:27 +00:00
parent 95ad5aa329
commit 7718ca4c96
1 changed files with 33 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ get_type (expr_t *e)
switch (e->type) { switch (e->type) {
case ex_label: case ex_label:
case ex_block: case ex_block:
return ev_type_count; return ev_type_count; // something went very wrong
case ex_expr: case ex_expr:
case ex_uexpr: case ex_uexpr:
return e->e.expr.type->type; return e->e.expr.type->type;
@ -109,12 +109,13 @@ error (expr_t *e, const char *fmt, ...)
fprintf (stderr, "%s:%d: ", strings + file, line); fprintf (stderr, "%s:%d: ", strings + file, line);
vfprintf (stderr, fmt, args); vfprintf (stderr, fmt, args);
fputs ("\n", stderr); fputs ("\n", stderr);
va_end (args);
pr_error_count++;
if (e) { if (e) {
e = new_expr (); e = new_expr ();
e->type = ex_integer; e->type = ex_integer;
} }
va_end (args);
pr_error_count++;
return e; return e;
} }
@ -145,52 +146,29 @@ const char *
get_op_string (int op) get_op_string (int op)
{ {
switch (op) { switch (op) {
case OR: case OR: return "||";
return "||"; case AND: return "&&";
case AND: case EQ: return "==";
return "&&"; case NE: return "!=";
case EQ: case LE: return "<=";
return "=="; case GE: return ">=";
case NE: case LT: return "<";
return "!="; case GT: return ">";
case LE: case '=': return "=";
return "<="; case '+': return "+";
case GE: case '-': return "-";
return ">="; case '*': return "*";
case LT: case '/': return "/";
return "<"; case '&': return "&";
case GT: case '|': return "|";
return ">"; case '!': return "!";
case '=': case '(': return "(";
return "="; case '.': return ".";
case '+': case 'i': return "<if>";
return "+"; case 'n': return "<ifnot>";
case '-': case 'g': return "<goto>";
return "-"; case 'r': return "<return>";
case '*': default: return "unknown";
return "*";
case '/':
return "/";
case '&':
return "&";
case '|':
return "|";
case '!':
return "!";
case '(':
return "(";
case '.':
return ".";
case 'i':
return "<if>";
case 'n':
return "<ifnot>";
case 'g':
return "<goto>";
case 'r':
return "<return>";
default:
return "unknown";
} }
} }
@ -202,7 +180,6 @@ type_mismatch (expr_t *e1, expr_t *e2, int op)
t1 = get_type (e1); t1 = get_type (e1);
t2 = get_type (e2); t2 = get_type (e2);
return error (e1, "type mismatch: %s %s %s", return error (e1, "type mismatch: %s %s %s",
type_names[t1], get_op_string (op), type_names[t2]); type_names[t1], get_op_string (op), type_names[t2]);
} }
@ -331,8 +308,8 @@ print_expr (expr_t *e)
break; break;
case ex_vector: case ex_vector:
printf ("'%g", e->e.vector_val[0]); printf ("'%g", e->e.vector_val[0]);
printf ( " %g", e->e.vector_val[1]); printf (" %g", e->e.vector_val[1]);
printf ( " %g'", e->e.vector_val[2]); printf (" %g'", e->e.vector_val[2]);
break; break;
case ex_quaternion: case ex_quaternion:
printf ("'%g", e->e.quaternion_val[0]); printf ("'%g", e->e.quaternion_val[0]);
@ -458,7 +435,7 @@ do_op_float (int op, expr_t *e1, expr_t *e2)
e1->e.integer_val = f1 != f2; e1->e.integer_val = f1 != f2;
break; break;
default: default:
return error (e1, "invalid operand for string"); return error (e1, "invalid operand for float");
} }
return e1; return e1;
} }
@ -495,7 +472,7 @@ do_op_vector (int op, expr_t *e1, expr_t *e2)
|| (v1[2] != v2[2]); || (v1[2] != v2[2]);
break; break;
default: default:
return error (e1, "invalid operand for string"); return error (e1, "invalid operand for vector");
} }
return e1; return e1;
} }
@ -559,7 +536,7 @@ do_op_integer (int op, expr_t *e1, expr_t *e2)
e1->e.integer_val = i1 != i2; e1->e.integer_val = i1 != i2;
break; break;
default: default:
return error (e1, "invalid operand for string"); return error (e1, "invalid operand for integer");
} }
return e1; return e1;
} }
@ -777,6 +754,7 @@ unary_expr (int op, expr_t *e)
switch (e->type) { switch (e->type) {
case ex_label: case ex_label:
case ex_block: case ex_block:
error (e, "internal error");
abort (); abort ();
case ex_uexpr: case ex_uexpr:
if (e->e.expr.op == '-') if (e->e.expr.op == '-')