[src/trunk]: src/usr.bin/xlint/lint1 lint: sort operators in typeok_op accord...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/16955b3972f6
branches:  trunk
changeset: 985678:16955b3972f6
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Sep 04 10:09:19 2021 +0000

description:
lint: sort operators in typeok_op according to ops.def

Well, except for INIT, FARG, RETURN.  These are listed at the very
bottom of the operators table but still behave much like ASSIGN.

No functional change.

diffstat:

 usr.bin/xlint/lint1/tree.c |  41 ++++++++++++++++++-----------------------
 1 files changed, 18 insertions(+), 23 deletions(-)

diffs (96 lines):

diff -r 873a44ad0a51 -r 16955b3972f6 usr.bin/xlint/lint1/tree.c
--- a/usr.bin/xlint/lint1/tree.c        Sat Sep 04 09:45:26 2021 +0000
+++ b/usr.bin/xlint/lint1/tree.c        Sat Sep 04 10:09:19 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tree.c,v 1.375 2021/09/04 09:45:26 rillig Exp $        */
+/*     $NetBSD: tree.c,v 1.376 2021/09/04 10:09:19 rillig Exp $        */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.375 2021/09/04 09:45:26 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.376 2021/09/04 10:09:19 rillig Exp $");
 #endif
 
 #include <float.h>
@@ -1196,45 +1196,42 @@
          const tnode_t *rn, const type_t *rtp, tspec_t rt)
 {
        switch (op) {
+       case ARROW:
+               return typeok_arrow(lt);
        case POINT:
                return typeok_point(ln, ltp, lt);
-       case ARROW:
-               return typeok_arrow(lt);
+       case INCBEF:
+       case DECBEF:
        case INCAFT:
        case DECAFT:
-       case INCBEF:
-       case DECBEF:
                return typeok_incdec(op, ln, ltp);
+       case INDIR:
+               return typeok_indir(lt);
        case ADDR:
                return typeok_address(mp, ln, ltp, lt);
-       case INDIR:
-               return typeok_indir(lt);
        case PLUS:
                return typeok_plus(op, ltp, lt, rtp, rt);
        case MINUS:
                return typeok_minus(op, ltp, lt, rtp, rt);
+       case SHL:
+               typeok_shl(mp, lt, rt);
+               goto shift;
        case SHR:
                typeok_shr(mp, ln, lt, rn, rt);
-               goto shift;
-       case SHL:
-               typeok_shl(mp, lt, rt);
        shift:
                typeok_shift(lt, rn, rt);
                break;
+       case LT:
+       case LE:
+       case GT:
+       case GE:
+       compare:
+               return typeok_compare(op, ln, ltp, lt, rn, rtp, rt);
        case EQ:
        case NE:
-               /*
-                * Accept some things which are allowed with EQ and NE,
-                * but not with ordered comparisons.
-                */
                if (is_typeok_eq(ln, lt, rn, rt))
                        break;
-               /* FALLTHROUGH */
-       case LT:
-       case GT:
-       case LE:
-       case GE:
-               return typeok_compare(op, ln, ltp, lt, rn, rtp, rt);
+               goto compare;
        case QUEST:
                return typeok_quest(lt, rn);
        case COLON:
@@ -1252,7 +1249,6 @@
                goto assign;
        case ADDASS:
        case SUBASS:
-               /* operands have scalar types (checked above) */
                if ((lt == PTR && !is_integer(rt)) || rt == PTR) {
                        warn_incompatible_types(op, ltp, lt, rtp, rt);
                        return false;
@@ -1269,7 +1265,6 @@
        case ANDASS:
        case XORASS:
        case ORASS:
-               goto assign;
        assign:
                return typeok_assign(op, ln, ltp, lt);
        case COMMA: