Module Name: src
Committed By: rillig
Date: Thu Apr 1 14:59:21 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: ops.def
Log Message:
lint: replace empty macro arguments with non-empty arguments
Empty arguments are a new feature of C99. Since lint is one of the
build tools, it is supposed to only use C90 features. C99 6.10.3 "Macro
replacement" explicitly allows empty macro arguments while C90 3.8.3
"Macro replacement" last sentence defines an empty macro argument as
undefined behavior.
This change makes the '1's stick out less from the table. I tried to
use '.' instead of '-' as well, but that made it too hard to see the
commas.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/xlint/lint1/ops.def
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/ops.def
diff -u src/usr.bin/xlint/lint1/ops.def:1.19 src/usr.bin/xlint/lint1/ops.def:1.20
--- src/usr.bin/xlint/lint1/ops.def:1.19 Sat Mar 20 20:39:35 2021
+++ src/usr.bin/xlint/lint1/ops.def Thu Apr 1 14:59:21 2021
@@ -1,86 +1,86 @@
-/* $NetBSD: ops.def,v 1.19 2021/03/20 20:39:35 rillig Exp $ */
+/* $NetBSD: ops.def,v 1.20 2021/04/01 14:59:21 rillig Exp $ */
begin_ops()
/* See mod_t in op.h for the definition of the table columns. */
/* name repr b l b B i c a s f v t b s l r p c e e = */
-op( NOOP, "no-op", , , , , , , , , , , , , , , , , , , , )
-op( ARROW, "->", 1, ,1, , , , , , ,1, , , , , , , , , , )
-op( POINT, ".", 1, ,1, , , , , , , , , , , , , , , , , )
-op( NOT, "!", ,1,1,1, , , ,1,1, ,1, , , , , , , ,1, )
-op( COMPL, "~", , , , , ,1, , ,1,1, , , , , , , , ,1,1)
-op( INC, "++", , , , , , , , , , , , , , , , , , , , )
-op( DEC, "--", , , , , , , , , , , , , , , , , , , , )
-op( INCBEF, "++x", , , , , , , ,1, , , , ,1, , , , , ,1, )
-op( DECBEF, "--x", , , , , , , ,1, , , , ,1, , , , , ,1, )
-op( INCAFT, "x++", , , , , , , ,1, , , , ,1, , , , , ,1, )
-op( DECAFT, "x--", , , , , , , ,1, , , , ,1, , , , , ,1, )
-op( UPLUS, "+", , , , , , ,1, ,1,1, , , , , , , , ,1,1)
-op( UMINUS, "-", , , , , , ,1, ,1,1, , , ,1, , , , ,1,1)
-op( INDIR, "*", , , , , , , , , ,1, , , , , , , , , , )
-op( ADDR, "&", , ,1, , , , , , , , , , , , , , , , , )
+op( NOOP, "no-op", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( ARROW, "->", 1,-,1,-,-,-,-,-,-,1,-,-,-,-,-,-,-,-,-,-)
+op( POINT, ".", 1,-,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( NOT, "!", -,1,1,1,-,-,-,1,1,-,1,-,-,-,-,-,-,-,1,-)
+op( COMPL, "~", -,-,-,-,-,1,-,-,1,1,-,-,-,-,-,-,-,-,1,1)
+op( INC, "++", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( DEC, "--", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( INCBEF, "++x", -,-,-,-,-,-,-,1,-,-,-,-,1,-,-,-,-,-,1,-)
+op( DECBEF, "--x", -,-,-,-,-,-,-,1,-,-,-,-,1,-,-,-,-,-,1,-)
+op( INCAFT, "x++", -,-,-,-,-,-,-,1,-,-,-,-,1,-,-,-,-,-,1,-)
+op( DECAFT, "x--", -,-,-,-,-,-,-,1,-,-,-,-,1,-,-,-,-,-,1,-)
+op( UPLUS, "+", -,-,-,-,-,-,1,-,1,1,-,-,-,-,-,-,-,-,1,1)
+op( UMINUS, "-", -,-,-,-,-,-,1,-,1,1,-,-,-,1,-,-,-,-,1,1)
+op( INDIR, "*", -,-,-,-,-,-,-,-,-,1,-,-,-,-,-,-,-,-,-,-)
+op( ADDR, "&", -,-,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
/* the operator 'arr[ind]' is translated to '*(arr + ind)' during parsing. */
/* name repr b l b B i c a s f v t b s l r p c e e = */
-op( MULT, "*", 1, , , , , ,1, ,1,1, ,1, , ,1, , , ,1,1)
-op( DIV, "/", 1, , , , , ,1, ,1,1, ,1, ,1,1, , , ,1,1)
-op( MOD, "%", 1, , , ,1, , , ,1,1, ,1, ,1,1, , , ,1,1)
-op( PLUS, "+", 1, , , , , , ,1,1,1, ,1, , , , , , ,1, )
-op( MINUS, "-", 1, , , , , , ,1,1,1, ,1, , , , , , ,1, )
-op( SHL, "<<", 1, , , ,1, , , ,1,1, , , , , ,1, , ,1,1)
-op( SHR, ">>", 1, , , ,1, , , ,1,1, , , ,1, ,1, , ,1,1)
-
-/* name repr b l b B i c a s f v t b s l r p c e e = */
-op( LT, "<", 1,1, , , , , ,1,1,1, ,1, ,1,1, ,1,1, ,1)
-op( LE, "<=", 1,1, , , , , ,1,1,1, ,1, ,1,1, ,1,1, ,1)
-op( GT, ">", 1,1, , , , , ,1,1,1, ,1, ,1,1, ,1,1, ,1)
-op( GE, ">=", 1,1, , , , , ,1,1,1, ,1, ,1,1, ,1,1, ,1)
-op( EQ, "==", 1,1,1, , , , ,1,1,1, ,1, , , , ,1,1, ,1)
-op( NE, "!=", 1,1,1, , , , ,1,1,1, ,1, , , , ,1,1, ,1)
-
-/* name repr b l b B i c a s f v t b s l r p c e e = */
-op( BITAND, "&", 1, ,1, ,1, , , ,1,1, ,1, , , ,1, , ,1, )
-op( BITXOR, "^", 1, ,1, ,1, , , ,1,1, ,1, , , ,1, , ,1, )
-op( BITOR, "|", 1, ,1, ,1, , , ,1,1, ,1, , , ,1, , ,1, )
-op( LOGAND, "&&", 1,1,1,1, , , ,1,1, ,1, , , , , , , ,1, )
-op( LOGOR, "||", 1,1,1,1, , , ,1,1, ,1, , , , ,1, , ,1, )
-op( QUEST, "?", 1, , , , , , , ,1, ,1, , , , , , , , , )
-op( COLON, ":", 1, ,1, , , , , , ,1, ,1, , , , , ,1, , )
-
-/* name repr b l b B i c a s f v t b s l r p c e e = */
-op( ASSIGN, "=", 1, ,1, , , , , , , , , ,1, , , , ,1, , )
-op( MULASS, "*=", 1, , , , , ,1, , , , , ,1, , , , , ,1, )
-op( DIVASS, "/=", 1, , , , , ,1, , , , , ,1, ,1, , , ,1, )
-op( MODASS, "%=", 1, , , ,1, , , , , , , ,1, ,1, , , ,1, )
-op( ADDASS, "+=", 1, , , , , , ,1, , , , ,1, , , , , ,1, )
-op( SUBASS, "-=", 1, , , , , , ,1, , , , ,1, , , , , ,1, )
-op( SHLASS, "<<=", 1, , , ,1, , , , , , , ,1, , , , , ,1, )
-op( SHRASS, ">>=", 1, , , ,1, , , , , , , ,1, , , , , ,1, )
-op( ANDASS, "&=", 1, ,1, ,1, , , , , , , ,1, , , , , ,1, )
-op( XORASS, "^=", 1, ,1, ,1, , , , , , , ,1, , , , , ,1, )
-op( ORASS, "|=", 1, ,1, ,1, , , , , , , ,1, , , , , ,1, )
-
-/* name repr b l b B i c a s f v t b s l r p c e e = */
-op( NAME, "name", , , , , , , , , , , , , , , , , , , , )
-op( CON, "constant", , , , , , , , , , , , , , , , , , , , )
-op( STRING, "string", , , , , , , , , , , , , , , , , , , , )
-op( FSEL, "fsel", , , , , , , , , , , , , , , , , , , , )
-op( CALL, "call", 1, , , , , , , , , , , ,1, , , , , , , )
-op( COMMA, ",", 1, ,1, , , , , , , , , , , , , , , , ,1)
-op( CVT, "convert", , , , , , , , , ,1, , , , , , , , , , )
-op( ICALL, "icall", 1, , , , , , , , , , , ,1, , , , , , , )
-op( LOAD, "load", , , , , , , , , , , , , , , , , , , , )
-op( PUSH, "push", , , , , , , , , ,1, , , , , , , , , , )
-op( RETURN, "return", 1, ,1, , , , , , , , , ,1, , , , ,1, , )
-op( REAL, "real", , , , , , , , , , , , , , , , , , , , )
-op( IMAG, "imag", , , , , , , , , , , , , , , , , , , , )
+op( MULT, "*", 1,-,-,-,-,-,1,-,1,1,-,1,-,-,1,-,-,-,1,1)
+op( DIV, "/", 1,-,-,-,-,-,1,-,1,1,-,1,-,1,1,-,-,-,1,1)
+op( MOD, "%", 1,-,-,-,1,-,-,-,1,1,-,1,-,1,1,-,-,-,1,1)
+op( PLUS, "+", 1,-,-,-,-,-,-,1,1,1,-,1,-,-,-,-,-,-,1,-)
+op( MINUS, "-", 1,-,-,-,-,-,-,1,1,1,-,1,-,-,-,-,-,-,1,-)
+op( SHL, "<<", 1,-,-,-,1,-,-,-,1,1,-,-,-,-,-,1,-,-,1,1)
+op( SHR, ">>", 1,-,-,-,1,-,-,-,1,1,-,-,-,1,-,1,-,-,1,1)
+
+/* name repr b l b B i c a s f v t b s l r p c e e = */
+op( LT, "<", 1,1,-,-,-,-,-,1,1,1,-,1,-,1,1,-,1,1,-,1)
+op( LE, "<=", 1,1,-,-,-,-,-,1,1,1,-,1,-,1,1,-,1,1,-,1)
+op( GT, ">", 1,1,-,-,-,-,-,1,1,1,-,1,-,1,1,-,1,1,-,1)
+op( GE, ">=", 1,1,-,-,-,-,-,1,1,1,-,1,-,1,1,-,1,1,-,1)
+op( EQ, "==", 1,1,1,-,-,-,-,1,1,1,-,1,-,-,-,-,1,1,-,1)
+op( NE, "!=", 1,1,1,-,-,-,-,1,1,1,-,1,-,-,-,-,1,1,-,1)
+
+/* name repr b l b B i c a s f v t b s l r p c e e = */
+op( BITAND, "&", 1,-,1,-,1,-,-,-,1,1,-,1,-,-,-,1,-,-,1,-)
+op( BITXOR, "^", 1,-,1,-,1,-,-,-,1,1,-,1,-,-,-,1,-,-,1,-)
+op( BITOR, "|", 1,-,1,-,1,-,-,-,1,1,-,1,-,-,-,1,-,-,1,-)
+op( LOGAND, "&&", 1,1,1,1,-,-,-,1,1,-,1,-,-,-,-,-,-,-,1,-)
+op( LOGOR, "||", 1,1,1,1,-,-,-,1,1,-,1,-,-,-,-,1,-,-,1,-)
+op( QUEST, "?", 1,-,-,-,-,-,-,-,1,-,1,-,-,-,-,-,-,-,-,-)
+op( COLON, ":", 1,-,1,-,-,-,-,-,-,1,-,1,-,-,-,-,-,1,-,-)
+
+/* name repr b l b B i c a s f v t b s l r p c e e = */
+op( ASSIGN, "=", 1,-,1,-,-,-,-,-,-,-,-,-,1,-,-,-,-,1,-,-)
+op( MULASS, "*=", 1,-,-,-,-,-,1,-,-,-,-,-,1,-,-,-,-,-,1,-)
+op( DIVASS, "/=", 1,-,-,-,-,-,1,-,-,-,-,-,1,-,1,-,-,-,1,-)
+op( MODASS, "%=", 1,-,-,-,1,-,-,-,-,-,-,-,1,-,1,-,-,-,1,-)
+op( ADDASS, "+=", 1,-,-,-,-,-,-,1,-,-,-,-,1,-,-,-,-,-,1,-)
+op( SUBASS, "-=", 1,-,-,-,-,-,-,1,-,-,-,-,1,-,-,-,-,-,1,-)
+op( SHLASS, "<<=", 1,-,-,-,1,-,-,-,-,-,-,-,1,-,-,-,-,-,1,-)
+op( SHRASS, ">>=", 1,-,-,-,1,-,-,-,-,-,-,-,1,-,-,-,-,-,1,-)
+op( ANDASS, "&=", 1,-,1,-,1,-,-,-,-,-,-,-,1,-,-,-,-,-,1,-)
+op( XORASS, "^=", 1,-,1,-,1,-,-,-,-,-,-,-,1,-,-,-,-,-,1,-)
+op( ORASS, "|=", 1,-,1,-,1,-,-,-,-,-,-,-,1,-,-,-,-,-,1,-)
+
+/* name repr b l b B i c a s f v t b s l r p c e e = */
+op( NAME, "name", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( CON, "constant", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( STRING, "string", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( FSEL, "fsel", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( CALL, "call", 1,-,-,-,-,-,-,-,-,-,-,-,1,-,-,-,-,-,-,-)
+op( COMMA, ",", 1,-,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,1)
+op( CVT, "convert", -,-,-,-,-,-,-,-,-,1,-,-,-,-,-,-,-,-,-,-)
+op( ICALL, "icall", 1,-,-,-,-,-,-,-,-,-,-,-,1,-,-,-,-,-,-,-)
+op( LOAD, "load", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( PUSH, "push", -,-,-,-,-,-,-,-,-,1,-,-,-,-,-,-,-,-,-,-)
+op( RETURN, "return", 1,-,1,-,-,-,-,-,-,-,-,-,1,-,-,-,-,1,-,-)
+op( REAL, "real", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( IMAG, "imag", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
/* INIT, CASE and FARG are pseudo operators that don't appear in the tree. */
/* name repr b l b B i c a s f v t b s l r p c e e = */
-op( INIT, "init", 1, ,1, , , , , , , , , , , , , , ,1, , )
-op( CASE, "case", , , , , , , , , , , , , , , , , , , , )
-op( FARG, "farg", 1, ,1, , , , , , , , , , , , , , ,1, , )
+op( INIT, "init", 1,-,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,1,-,-)
+op( CASE, "case", -,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-)
+op( FARG, "farg", 1,-,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,1,-,-)
end_ops()
