Tue Jan 5 21:40:42 2021 UTC ()
lint: swap columns 1 and 2 in ops.def

List the ID of a record first, followed by the describing fields.


(rillig)
diff -r1.12 -r1.13 src/usr.bin/xlint/lint1/mkops
diff -r1.4 -r1.5 src/usr.bin/xlint/lint1/ops.def
cvs diff -r1.12 -r1.13 src/usr.bin/xlint/lint1/Attic/mkops (expand / switch to unified diff)

--- src/usr.bin/xlint/lint1/Attic/mkops 2021/01/05 21:32:47 1.12
+++ src/usr.bin/xlint/lint1/Attic/mkops 2021/01/05 21:40:42 1.13
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!/bin/sh - 1#!/bin/sh -
2# $NetBSD: mkops,v 1.12 2021/01/05 21:32:47 rillig Exp $ 2# $NetBSD: mkops,v 1.13 2021/01/05 21:40:42 rillig Exp $
3# 3#
4# Copyright (c) 2011 The NetBSD Foundation, Inc. 4# Copyright (c) 2011 The NetBSD Foundation, Inc.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code is derived from software contributed to The NetBSD Foundation 7# This code is derived from software contributed to The NetBSD Foundation
8# by Christos Zoulas. 8# by Christos Zoulas.
9# 9#
10# Redistribution and use in source and binary forms, with or without 10# Redistribution and use in source and binary forms, with or without
11# modification, are permitted provided that the following conditions 11# modification, are permitted provided that the following conditions
12# are met: 12# are met:
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -85,31 +85,31 @@ BEGIN { @@ -85,31 +85,31 @@ BEGIN {
85 } 85 }
86} 86}
87 87
88{ 88{
89 if (v == "h") { 89 if (v == "h") {
90 if (LAST != "") { 90 if (LAST != "") {
91 if (FIRST == "") { 91 if (FIRST == "") {
92 display("\t%s\t= 0,", LAST, LASTCOMMENT); 92 display("\t%s\t= 0,", LAST, LASTCOMMENT);
93 } else { 93 } else {
94 display("\t%s,", LAST, LASTCOMMENT); 94 display("\t%s,", LAST, LASTCOMMENT);
95 } 95 }
96 } 96 }
97 FIRST = LAST; 97 FIRST = LAST;
98 LAST = $2; 98 LAST = $1;
99 LASTCOMMENT = $5; 99 LASTCOMMENT = $5;
100 } 100 }
101 if (v == "c") 101 if (v == "c")
102 printf("\t{ /* %s */\t{ %s, \"%s\" }, %d },\n", $2, $3, $1, $4); 102 printf("\t{ /* %s */\t{ %s, \"%s\" }, %d },\n", $1, $3, $2, $4);
103} 103}
104 104
105END { 105END {
106 if (v == "h") { 106 if (v == "h") {
107 display("\t%s,", LAST, LASTCOMMENT); 107 display("\t%s,", LAST, LASTCOMMENT);
108 printf("#define\tNOPS\t((int)%s + 1)\n", LAST); 108 printf("#define\tNOPS\t((int)%s + 1)\n", LAST);
109 println("} op_t;"); 109 println("} op_t;");
110 println("const char *getopname(op_t);"); 110 println("const char *getopname(op_t);");
111 println("void initmtab(void);"); 111 println("void initmtab(void);");
112 } 112 }
113 if (v == "c") { 113 if (v == "c") {
114 println("};"); 114 println("};");
115 println("const char *"); 115 println("const char *");
cvs diff -r1.4 -r1.5 src/usr.bin/xlint/lint1/ops.def (expand / switch to unified diff)

--- src/usr.bin/xlint/lint1/ops.def 2021/01/05 21:32:47 1.4
+++ src/usr.bin/xlint/lint1/ops.def 2021/01/05 21:40:42 1.5
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1no-op NOOP 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0 1NOOP no-op 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
2-> ARROW 1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1 2ARROW -> 1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1
3. POINT 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1 3POINT . 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
4! NOT 0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0 1 4NOT ! 0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0 1
5~ COMPL 0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,1,1,1 1 5COMPL ~ 0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,1,1,1 1
6p + 1 INC 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0 6INC p + 1 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
7p - 1 DEC 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0 7DEC p - 1 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
8++p INCBEF 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 8INCBEF ++p 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
9--p DECBEF 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 9DECBEF --p 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
10p++ INCAFT 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 10INCAFT p++ 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
11p-- DECAFT 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 11DECAFT p-- 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
12+p UPLUS 0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,1,0 1 12UPLUS +p 0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,1,0 1
13-p UMINUS 0,0,0,0,1,1,1,0,0,0,1,0,0,0,0,1,1,0 1 13UMINUS -p 0,0,0,0,1,1,1,0,0,0,1,0,0,0,0,1,1,0 1
14*p STAR 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1 14STAR *p 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1
15&p AMPER 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1 15AMPER &p 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
16p * p MULT 1,0,0,0,1,1,1,0,1,0,0,1,0,0,0,1,1,0 1 16MULT p * p 1,0,0,0,1,1,1,0,1,0,0,1,0,0,0,1,1,0 1
17p / p DIV 1,0,0,0,1,1,1,0,1,0,1,1,0,0,0,1,1,0 1 17DIV p / p 1,0,0,0,1,1,1,0,1,0,1,1,0,0,0,1,1,0 1
18p % p MOD 1,0,1,0,0,1,1,0,1,0,1,1,0,0,0,1,1,0 1 18MOD p % p 1,0,1,0,0,1,1,0,1,0,1,1,0,0,0,1,1,0 1
19p + p PLUS 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1 19PLUS p + p 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1
20p - p MINUS 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1 20MINUS p - p 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1
21p << p SHL 1,0,1,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0 1 21SHL p << p 1,0,1,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0 1
22p >> p SHR 1,0,1,0,0,1,1,0,0,0,1,0,1,0,0,1,1,0 1 22SHR p >> p 1,0,1,0,0,1,1,0,0,0,1,0,1,0,0,1,1,0 1
23p < p LT 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1 23LT p < p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
24p <= p LE 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1 24LE p <= p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
25p > p GT 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1 25GT p > p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
26p >= p GE 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1 26GE p >= p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
27p == p EQ 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1 27EQ p == p 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1
28p != p NE 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1 28NE p != p 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1
29p & p AND 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1 29AND p & p 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
30p ^ p XOR 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1 30XOR p ^ p 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
31p | p OR 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1 31OR p | p 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
32p && p LOGAND 1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0 1 32LOGAND p && p 1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0 1
33p || p LOGOR 1,1,0,1,0,1,0,1,0,0,0,0,1,0,0,1,0,0 1 33LOGOR p || p 1,1,0,1,0,1,0,1,0,0,0,0,1,0,0,1,0,0 1
34? QUEST 1,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0 1 34QUEST ? 1,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0 1
35: COLON 1,0,0,0,0,0,1,0,1,0,0,0,0,0,1,0,0,0 1 35COLON : 1,0,0,0,0,0,1,0,1,0,0,0,0,0,1,0,0,0 1
36p = p ASSIGN 1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0 1 36ASSIGN p = p 1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0 1
37p *= p MULASS 1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0 1 37MULASS p *= p 1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0 1
38p /= p DIVASS 1,0,0,0,1,0,0,0,0,1,0,1,0,0,0,1,0,0 1 38DIVASS p /= p 1,0,0,0,1,0,0,0,0,1,0,1,0,0,0,1,0,0 1
39p %= p MODASS 1,0,1,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0 1 39MODASS p %= p 1,0,1,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0 1
40p += p ADDASS 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 40ADDASS p += p 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
41p -= p SUBASS 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 41SUBASS p -= p 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
42p << p SHLASS 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 42SHLASS p << p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
43p >> p SHRASS 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 43SHRASS p >> p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
44p &= p ANDASS 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 44ANDASS p &= p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
45p ^= p XORASS 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 45XORASS p ^= p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
46p |= p ORASS 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1 46ORASS p |= p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
47n NAME 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1 47NAME n 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
48const CON 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1 48CON const 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
49char * STRING 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1 49STRING char * 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
50fsel FSEL 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1 50FSEL fsel 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
51p() CALL 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 1 51CALL p() 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 1
52, COMMA 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 1 52COMMA , 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 1
53(cast)p CVT 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1 53CVT (cast)p 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1
54icall ICALL 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 1 54ICALL icall 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 1
55load LOAD 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1 55LOAD load 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
56push PUSH 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1 56PUSH push 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1
57return RETURN 1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0 1 57RETURN return 1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0 1
58p.re REAL 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0 58REAL p.re 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
59p.im IMAG 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0 59IMAG p.im 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
60p = {} INIT 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 1 pseudo 60INIT p = {} 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 1 pseudo
61case CASE 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0 pseudo 61CASE case 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0 pseudo
62f(p) FARG 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 1 pseudo 62FARG f(p) 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 1 pseudo