summaryrefslogtreecommitdiffstats
path: root/arith.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-01-15 20:19:37 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-01-15 20:19:37 -0800
commit9ba41588b1282bde4e113406923ec081124cded6 (patch)
tree5c5ace4694261fbe1f28eef5b8d0b51d6559fd4d /arith.c
parenta0d5ba9831cf2a33144337ab8f0e6f2fd1e6f0cb (diff)
downloadtxr-9ba41588b1282bde4e113406923ec081124cded6.tar.gz
txr-9ba41588b1282bde4e113406923ec081124cded6.tar.bz2
txr-9ba41588b1282bde4e113406923ec081124cded6.zip
* arith.c: Revised error messages to refer to Lisp names instead
of C names of functions, or otherwise clarified them. * filter.c: Likewise. * lib.c: Likewise. * match.c: Likewise.
Diffstat (limited to 'arith.c')
-rw-r--r--arith.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arith.c b/arith.c
index 09828f59..450e8c5c 100644
--- a/arith.c
+++ b/arith.c
@@ -402,10 +402,10 @@ tail:
return chr(sum);
}
}
- uw_throwf(error_s, lit("plus: invalid operands ~s ~s"), anum, bnum, nao);
+ uw_throwf(error_s, lit("+: invalid operands ~s ~s"), anum, bnum, nao);
char_range:
uw_throwf(numeric_error_s,
- lit("plus: sum of ~s and ~s is out of character range"),
+ lit("+: sum of ~s and ~s is out of character range"),
anum, bnum, nao);
}
@@ -513,12 +513,12 @@ tail:
if (sum < 0 || sum > 0x10FFFF)
uw_throwf(numeric_error_s,
- lit("minus: difference of ~s and ~s is out of character range"),
+ lit("-: difference of ~s and ~s is out of character range"),
anum, bnum, nao);
return chr(sum);
}
}
- uw_throwf(error_s, lit("minus: invalid operands ~s ~s"), anum, bnum, nao);
+ uw_throwf(error_s, lit("-: invalid operands ~s ~s"), anum, bnum, nao);
}
val neg(val anum)
@@ -535,7 +535,7 @@ val neg(val anum)
case NUM:
return num(-c_num(anum));
default:
- uw_throwf(error_s, lit("neg: ~s is not a number"), anum, nao);
+ uw_throwf(error_s, lit("-: ~s is not a number"), anum, nao);
}
}
@@ -556,7 +556,7 @@ val abso(val anum)
return num(n < 0 ? -n : n);
}
default:
- uw_throwf(error_s, lit("abso: ~s is not a number"), anum, nao);
+ uw_throwf(error_s, lit("abs: ~s is not a number"), anum, nao);
}
}
@@ -670,7 +670,7 @@ tail:
break;
}
}
- uw_throwf(error_s, lit("mul: invalid operands ~s ~s"), anum, bnum, nao);
+ uw_throwf(error_s, lit("*: invalid operands ~s ~s"), anum, bnum, nao);
}
val trunc(val anum, val bnum)
@@ -1033,7 +1033,7 @@ tail:
goto tail;
}
- uw_throwf(error_s, lit("gt: invalid operands ~s ~s"), anum, bnum, nao);
+ uw_throwf(error_s, lit(">: invalid operands ~s ~s"), anum, bnum, nao);
}
val lt(val anum, val bnum)
@@ -1069,7 +1069,7 @@ tail:
goto tail;
}
- uw_throwf(error_s, lit("lt: invalid operands ~s ~s"), anum, bnum, nao);
+ uw_throwf(error_s, lit("<: invalid operands ~s ~s"), anum, bnum, nao);
}
val ge(val anum, val bnum)
@@ -1110,7 +1110,7 @@ tail:
goto tail;
}
- uw_throwf(error_s, lit("ge: invalid operands ~s ~s"), anum, bnum, nao);
+ uw_throwf(error_s, lit(">=: invalid operands ~s ~s"), anum, bnum, nao);
}
val le(val anum, val bnum)
@@ -1151,7 +1151,7 @@ tail:
goto tail;
}
- uw_throwf(error_s, lit("lt: invalid operands ~s ~s"), anum, bnum, nao);
+ uw_throwf(error_s, lit("<=: invalid operands ~s ~s"), anum, bnum, nao);
}
val numeq(val anum, val bnum)