Better error messages

This commit is contained in:
Pavel Machek 2000-06-05 15:41:29 +00:00
parent 49222defff
commit 98da26a0a0

View file

@ -379,7 +379,7 @@ interpret(struct f_inst *what)
case T_CLIST: case T_CLIST:
case T_PATH_MASK: case T_PATH_MASK:
if (sym->class != (SYM_VARIABLE | v2.type)) if (sym->class != (SYM_VARIABLE | v2.type))
runtime( "Variable of bad type" ); runtime( "Assigning to variable of incompatible type" );
* (struct f_val *) sym->aux2 = v2; * (struct f_val *) sym->aux2 = v2;
break; break;
default: default:
@ -401,7 +401,7 @@ interpret(struct f_inst *what)
case '?': /* ? has really strange error value, so we can implement if ... else nicely :-) */ case '?': /* ? has really strange error value, so we can implement if ... else nicely :-) */
ONEARG; ONEARG;
if (v1.type != T_BOOL) if (v1.type != T_BOOL)
runtime( "If requires bool expression" ); runtime( "If requires boolean expression" );
if (v1.val.i) { if (v1.val.i) {
ARG(res,a2.p); ARG(res,a2.p);
res.val.i = 0; res.val.i = 0;
@ -458,7 +458,7 @@ interpret(struct f_inst *what)
case P('a','S'): case P('a','S'):
ONEARG; ONEARG;
if (what->aux != v1.type) if (what->aux != v1.type)
runtime( "Attempt to set static attribute to invalid type" ); runtime( "Attempt to set static attribute to incompatible type" );
rta_cow(); rta_cow();
{ {
struct rta *rta = (*f_rte)->attrs; struct rta *rta = (*f_rte)->attrs;
@ -622,7 +622,7 @@ interpret(struct f_inst *what)
case P('i','M'): /* IP.MASK(val) */ case P('i','M'): /* IP.MASK(val) */
TWOARGS; TWOARGS;
if (v2.type != T_INT) if (v2.type != T_INT)
runtime( "Can not use this type for mask."); runtime( "Can not use non-integer for mask.");
if (v1.type != T_IP) if (v1.type != T_IP)
runtime( "You can mask only IP addresses." ); runtime( "You can mask only IP addresses." );
{ {