aboutsummaryrefslogtreecommitdiffstats
path: root/array.c
diff options
context:
space:
mode:
authorAndrew J. Schorr <aschorr@telemetry-investments.com>2016-06-13 18:39:10 -0400
committerAndrew J. Schorr <aschorr@telemetry-investments.com>2016-06-13 18:39:10 -0400
commit18c6b0f85db6683f1d0789e800acfdd35da3ce07 (patch)
tree6f2bd19e71ca42fb2a784451b9486b652fc00090 /array.c
parent0e02913c51b1d737b4d283901e22c57b954e65ae (diff)
downloadegawk-18c6b0f85db6683f1d0789e800acfdd35da3ce07.tar.gz
egawk-18c6b0f85db6683f1d0789e800acfdd35da3ce07.tar.bz2
egawk-18c6b0f85db6683f1d0789e800acfdd35da3ce07.zip
Fix usage of scalar type flag bits and fix some bugs in numeric conversions and lint checks.
Diffstat (limited to 'array.c')
-rw-r--r--array.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/array.c b/array.c
index f8051065..afa37954 100644
--- a/array.c
+++ b/array.c
@@ -1157,17 +1157,8 @@ sort_up_value_type(const void *p1, const void *p2)
}
/* two scalars */
- /* 2. Resolve MAYBE_NUM, so that have only NUMBER or STRING */
- if ((n1->flags & MAYBE_NUM) != 0)
- (void) force_number(n1);
- if ((n2->flags & MAYBE_NUM) != 0)
- (void) force_number(n2);
-
- /* 2.5. Resolve INTIND, so that is STRING, and not NUMBER */
- if ((n1->flags & INTIND) != 0)
- (void) force_string(n1);
- if ((n2->flags & INTIND) != 0)
- (void) force_string(n2);
+ (void) fixtype(n1);
+ (void) fixtype(n2);
if ((n1->flags & NUMBER) != 0 && (n2->flags & NUMBER) != 0) {
return cmp_numbers(n1, n2);