summaryrefslogtreecommitdiff
path: root/bin/expr/expr.y
diff options
context:
space:
mode:
authorjtc <jtc@NetBSD.org>1993-07-20 00:52:57 +0000
committerjtc <jtc@NetBSD.org>1993-07-20 00:52:57 +0000
commitaabfaec2f57029c7ef9fca5f5299a04b50b34dd5 (patch)
tree2af9736fc36c9531a09bb20ba2b6b5a93bca8fd7 /bin/expr/expr.y
parent78ce7a164e9b021c19cc62081c7687cf663e1feb (diff)
Don't coerce strings to int in comparisons.
Diffstat (limited to 'bin/expr/expr.y')
-rw-r--r--bin/expr/expr.y39
1 files changed, 1 insertions, 38 deletions
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 324923ddee0..f16515ab621 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -2,7 +2,7 @@
/* Written by Pace Willisson (pace@blitz.com)
* and placed in the public domain
*
- * $Header: /cvsroot/src/bin/expr/expr.y,v 1.7 1993/07/20 00:29:41 jtc Exp $
+ * $Header: /cvsroot/src/bin/expr/expr.y,v 1.8 1993/07/20 00:52:57 jtc Exp $
*/
#include <stdio.h>
#include <stdlib.h>
@@ -292,12 +292,6 @@ struct val *a, *b;
{
struct val *r;
- /* attempt to coerce both arguments to integers */
- (void) to_integer (a);
- (void) to_integer (b);
-
- /* But if either one of them really is a string, do
- a string comparison */
if (isstring (a) || isstring (b)) {
to_string (a);
to_string (b);
@@ -317,12 +311,6 @@ struct val *a, *b;
{
struct val *r;
- /* attempt to coerce both arguments to integers */
- (void) to_integer (a);
- (void) to_integer (b);
-
- /* But if either one of them really is a string, do
- a string comparison */
if (isstring (a) || isstring (b)) {
to_string (a);
to_string (b);
@@ -342,12 +330,6 @@ struct val *a, *b;
{
struct val *r;
- /* attempt to coerce both arguments to integers */
- (void) to_integer (a);
- (void) to_integer (b);
-
- /* But if either one of them really is a string, do
- a string comparison */
if (isstring (a) || isstring (b)) {
to_string (a);
to_string (b);
@@ -367,12 +349,6 @@ struct val *a, *b;
{
struct val *r;
- /* attempt to coerce both arguments to integers */
- (void) to_integer (a);
- (void) to_integer (b);
-
- /* But if either one of them really is a string, do
- a string comparison */
if (isstring (a) || isstring (b)) {
to_string (a);
to_string (b);
@@ -392,12 +368,6 @@ struct val *a, *b;
{
struct val *r;
- /* attempt to coerce both arguments to integers */
- (void) to_integer (a);
- (void) to_integer (b);
-
- /* But if either one of them really is a string, do
- a string comparison */
if (isstring (a) || isstring (b)) {
to_string (a);
to_string (b);
@@ -417,12 +387,6 @@ struct val *a, *b;
{
struct val *r;
- /* attempt to coerce both arguments to integers */
- (void) to_integer (a);
- (void) to_integer (b);
-
- /* But if either one of them really is a string, do
- a string comparison */
if (isstring (a) || isstring (b)) {
to_string (a);
to_string (b);
@@ -554,7 +518,6 @@ struct val *a, *b;
fprintf (stderr, "expr: %s\n", errbuf);
exit (2);
}
- free (newpat);
/* compare string against pattern */
if (regexec(&rp, a->u.s, SE_MAX, rm, 0) == 0) {