Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/xlint/lint1 lint: make generating the operators tabl...



details:   https://anonhg.NetBSD.org/src/rev/c337031bbf72
branches:  trunk
changeset: 1017715:c337031bbf72
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Jan 05 21:32:47 2021 +0000

description:
lint: make generating the operators table simpler

The generated files are exactly the same as before.

diffstat:

 usr.bin/xlint/lint1/mkops   |   16 +----
 usr.bin/xlint/lint1/ops.def |  124 ++++++++++++++++++++++----------------------
 2 files changed, 66 insertions(+), 74 deletions(-)

diffs (160 lines):

diff -r 219aabaceb5b -r c337031bbf72 usr.bin/xlint/lint1/mkops
--- a/usr.bin/xlint/lint1/mkops Tue Jan 05 18:00:21 2021 +0000
+++ b/usr.bin/xlint/lint1/mkops Tue Jan 05 21:32:47 2021 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: mkops,v 1.11 2020/12/31 16:19:05 rillig Exp $
+#      $NetBSD: mkops,v 1.12 2021/01/05 21:32:47 rillig Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -96,18 +96,10 @@
                }
                FIRST = LAST;
                LAST = $2;
-               LASTCOMMENT = $4;
+               LASTCOMMENT = $5;
        }
-       if (v == "c") {
-               if ($3 == "X") {
-                       m = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,";
-                       act = 0;
-               } else {
-                       m = $3;
-                       act = 1;
-               }
-               printf("\t{ /* %s */\t{ %s \"%s\" }, %d },\n", $2, m, $1, act);
-       }
+       if (v == "c")
+               printf("\t{ /* %s */\t{ %s, \"%s\" }, %d },\n", $2, $3, $1, $4);
 }
 
 END {
diff -r 219aabaceb5b -r c337031bbf72 usr.bin/xlint/lint1/ops.def
--- a/usr.bin/xlint/lint1/ops.def       Tue Jan 05 18:00:21 2021 +0000
+++ b/usr.bin/xlint/lint1/ops.def       Tue Jan 05 21:32:47 2021 +0000
@@ -1,62 +1,62 @@
-no-op  NOOP    X
-->     ARROW   1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-.      POINT   1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-!      NOT     0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0,
-~      COMPL   0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,1,1,1,
-p + 1  INC     X
-p - 1  DEC     X
-++p    INCBEF  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
---p    DECBEF  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p++    INCAFT  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p--    DECAFT  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-+p     UPLUS   0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,1,0,
--p     UMINUS  0,0,0,0,1,1,1,0,0,0,1,0,0,0,0,1,1,0,
-*p     STAR    0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-&p     AMPER   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-p * p  MULT    1,0,0,0,1,1,1,0,1,0,0,1,0,0,0,1,1,0,
-p / p  DIV     1,0,0,0,1,1,1,0,1,0,1,1,0,0,0,1,1,0,
-p % p  MOD     1,0,1,0,0,1,1,0,1,0,1,1,0,0,0,1,1,0,
-p + p  PLUS    1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0,
-p - p  MINUS   1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0,
-p << p SHL     1,0,1,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0,
-p >> p SHR     1,0,1,0,0,1,1,0,0,0,1,0,1,0,0,1,1,0,
-p < p  LT      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0,
-p <= p LE      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0,
-p > p  GT      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0,
-p >= p GE      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0,
-p == p EQ      1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0,
-p != p NE      1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0,
-p & p  AND     1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0,
-p ^ p  XOR     1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0,
-p | p  OR      1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0,
-p && p LOGAND  1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0,
-p || p LOGOR   1,1,0,1,0,1,0,1,0,0,0,0,1,0,0,1,0,0,
-?      QUEST   1,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,
-:      COLON   1,0,0,0,0,0,1,0,1,0,0,0,0,0,1,0,0,0,
-p = p  ASSIGN  1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,
-p *= p MULASS  1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p /= p DIVASS  1,0,0,0,1,0,0,0,0,1,0,1,0,0,0,1,0,0,
-p %= p MODASS  1,0,1,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,
-p += p ADDASS  1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p -= p SUBASS  1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p << p SHLASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p >> p SHRASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p &= p ANDASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p ^= p XORASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-p |= p ORASS   1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,
-n      NAME    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-const  CON     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-char * STRING  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-fsel   FSEL    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-p()    CALL    1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-,      COMMA   1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-(cast)p        CVT     0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-icall  ICALL   1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-load   LOAD    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-push   PUSH    0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-return RETURN  1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,
-p.re   REAL    X
-p.im   IMAG    X
-p = {} INIT    1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,    pseudo
-case   CASE    X       pseudo
-f(p)   FARG    1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,    pseudo
+no-op  NOOP    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     0
+->     ARROW   1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0     1
+.      POINT   1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     1
+!      NOT     0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0     1
+~      COMPL   0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,1,1,1     1
+p + 1  INC     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     0
+p - 1  DEC     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     0
+++p    INCBEF  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+--p    DECBEF  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p++    INCAFT  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p--    DECAFT  0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
++p     UPLUS   0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,1,0     1
+-p     UMINUS  0,0,0,0,1,1,1,0,0,0,1,0,0,0,0,1,1,0     1
+*p     STAR    0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0     1
+&p     AMPER   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     1
+p * p  MULT    1,0,0,0,1,1,1,0,1,0,0,1,0,0,0,1,1,0     1
+p / p  DIV     1,0,0,0,1,1,1,0,1,0,1,1,0,0,0,1,1,0     1
+p % p  MOD     1,0,1,0,0,1,1,0,1,0,1,1,0,0,0,1,1,0     1
+p + p  PLUS    1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0     1
+p - p  MINUS   1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0     1
+p << p SHL     1,0,1,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0     1
+p >> p SHR     1,0,1,0,0,1,1,0,0,0,1,0,1,0,0,1,1,0     1
+p < p  LT      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0     1
+p <= p LE      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0     1
+p > p  GT      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0     1
+p >= p GE      1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0     1
+p == p EQ      1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0     1
+p != p NE      1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0     1
+p & p  AND     1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0     1
+p ^ p  XOR     1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0     1
+p | p  OR      1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0     1
+p && p LOGAND  1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0     1
+p || p LOGOR   1,1,0,1,0,1,0,1,0,0,0,0,1,0,0,1,0,0     1
+?      QUEST   1,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0     1
+:      COLON   1,0,0,0,0,0,1,0,1,0,0,0,0,0,1,0,0,0     1
+p = p  ASSIGN  1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0     1
+p *= p MULASS  1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p /= p DIVASS  1,0,0,0,1,0,0,0,0,1,0,1,0,0,0,1,0,0     1
+p %= p MODASS  1,0,1,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0     1
+p += p ADDASS  1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p -= p SUBASS  1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p << p SHLASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p >> p SHRASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p &= p ANDASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p ^= p XORASS  1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+p |= p ORASS   1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0     1
+n      NAME    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     1
+const  CON     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     1
+char * STRING  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     1
+fsel   FSEL    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     1
+p()    CALL    1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0     1
+,      COMMA   1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0     1
+(cast)p        CVT     0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0     1
+icall  ICALL   1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0     1
+load   LOAD    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     1
+push   PUSH    0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0     1
+return RETURN  1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0     1
+p.re   REAL    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     0
+p.im   IMAG    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     0
+p = {} INIT    1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0     1       pseudo
+case   CASE    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     0       pseudo
+f(p)   FARG    1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0     1       pseudo



Home | Main Index | Thread Index | Old Index