Module Name: src
Committed By: rillig
Date: Tue Jan 5 23:07:49 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_long_double_int.exp msg_124.exp
msg_230.exp
src/usr.bin/xlint/lint1: ops.def
Log Message:
lint: clean up symbolic operator names that are used in the messages
Including the "p" in the symbolic operator names was questionable, for
several reasons:
1. The "p" could be taken to mean an actual variable name, which is
confusing if the function doesn't have such a variable, or even more
so if the line contains an unrelated variable called "p".
2. For the binary operators, having the "p" mentioned on both sides of
the operator (such as in "p + p") wrongly suggested that both
operands of the expression were the same.
3. The name "p" often stands for a pointer. Most of the operators
don't accept pointers, therefore the name was misleading.
For these reasons, the "p" was removed from the symbolic name of all
operators. This makes several pairs of operators indistinguishable:
INCBEF == INCAFT
DECBEF == DECAFT
UPLUS == PLUS
UMINUS == MINUS
STAR == MULT
AMPER == AND
This is not expected to create any confusion since C programmers are
expected to know these double meanings.
The symbolic names for SHLASS and SHRASS were missing the '=' before.
This was added since omitting it was probably an oversight.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/d_long_double_int.exp \
src/tests/usr.bin/xlint/lint1/msg_230.exp
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_124.exp
cvs rdiff -u -r1.5 -r1.6 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/tests/usr.bin/xlint/lint1/d_long_double_int.exp
diff -u src/tests/usr.bin/xlint/lint1/d_long_double_int.exp:1.2 src/tests/usr.bin/xlint/lint1/d_long_double_int.exp:1.3
--- src/tests/usr.bin/xlint/lint1/d_long_double_int.exp:1.2 Sun Jan 3 15:51:16 2021
+++ src/tests/usr.bin/xlint/lint1/d_long_double_int.exp Tue Jan 5 23:07:49 2021
@@ -1 +1 @@
-(9): warning: illegal pointer combination (pointer to long double) and (pointer to long), op p == p [124]
+(9): warning: illegal pointer combination (pointer to long double) and (pointer to long), op == [124]
Index: src/tests/usr.bin/xlint/lint1/msg_230.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_230.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_230.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_230.exp:1.2 Sun Jan 3 15:35:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_230.exp Tue Jan 5 23:07:49 2021
@@ -1,3 +1,3 @@
-msg_230.c(11): warning: comparison of unsigned char with 0, op p < p [162]
-msg_230.c(22): warning: nonportable character comparison, op p <= p [230]
-msg_230.c(23): warning: comparison of unsigned char with negative constant, op p <= p [162]
+msg_230.c(11): warning: comparison of unsigned char with 0, op < [162]
+msg_230.c(22): warning: nonportable character comparison, op <= [230]
+msg_230.c(23): warning: comparison of unsigned char with negative constant, op <= [162]
Index: src/tests/usr.bin/xlint/lint1/msg_124.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_124.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_124.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_124.exp:1.4 Sun Jan 3 15:55:18 2021
+++ src/tests/usr.bin/xlint/lint1/msg_124.exp Tue Jan 5 23:07:49 2021
@@ -1,3 +1,3 @@
-msg_124.c(16): warning: illegal pointer combination (pointer to function(int) returning void) and (pointer to int), op p = p [124]
-msg_124.c(17): warning: illegal pointer combination (pointer to function(pointer to function(int) returning void) returning pointer to function(int) returning void) and (pointer to int), op p = p [124]
-msg_124.c(18): warning: illegal pointer combination (pointer to function(pointer to const char, ...) returning int) and (pointer to int), op p = p [124]
+msg_124.c(16): warning: illegal pointer combination (pointer to function(int) returning void) and (pointer to int), op = [124]
+msg_124.c(17): warning: illegal pointer combination (pointer to function(pointer to function(int) returning void) returning pointer to function(int) returning void) and (pointer to int), op = [124]
+msg_124.c(18): warning: illegal pointer combination (pointer to function(pointer to const char, ...) returning int) and (pointer to int), op = [124]
Index: src/usr.bin/xlint/lint1/ops.def
diff -u src/usr.bin/xlint/lint1/ops.def:1.5 src/usr.bin/xlint/lint1/ops.def:1.6
--- src/usr.bin/xlint/lint1/ops.def:1.5 Tue Jan 5 21:40:42 2021
+++ src/usr.bin/xlint/lint1/ops.def Tue Jan 5 23:07:49 2021
@@ -3,60 +3,60 @@ ARROW -> 1,0,0,0,0,0,1,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 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
-INC p + 1 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
-DEC p - 1 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
-INCBEF ++p 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-DECBEF --p 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-INCAFT p++ 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-DECAFT p-- 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-UPLUS +p 0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,1,0 1
-UMINUS -p 0,0,0,0,1,1,1,0,0,0,1,0,0,0,0,1,1,0 1
-STAR *p 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1
-AMPER &p 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
-MULT p * p 1,0,0,0,1,1,1,0,1,0,0,1,0,0,0,1,1,0 1
-DIV p / p 1,0,0,0,1,1,1,0,1,0,1,1,0,0,0,1,1,0 1
-MOD p % p 1,0,1,0,0,1,1,0,1,0,1,1,0,0,0,1,1,0 1
-PLUS p + p 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1
-MINUS p - p 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1
-SHL p << p 1,0,1,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0 1
-SHR p >> p 1,0,1,0,0,1,1,0,0,0,1,0,1,0,0,1,1,0 1
-LT p < p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
-LE p <= p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
-GT p > p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
-GE p >= p 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
-EQ p == p 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1
-NE p != p 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1
-AND p & p 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
-XOR p ^ p 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
-OR p | p 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
-LOGAND p && p 1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0 1
-LOGOR p || p 1,1,0,1,0,1,0,1,0,0,0,0,1,0,0,1,0,0 1
+INC ++ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
+DEC -- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
+INCBEF ++x 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+DECBEF --x 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+INCAFT x++ 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+DECAFT x-- 0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+UPLUS + 0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,1,0 1
+UMINUS - 0,0,0,0,1,1,1,0,0,0,1,0,0,0,0,1,1,0 1
+STAR * 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1
+AMPER & 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
+MULT * 1,0,0,0,1,1,1,0,1,0,0,1,0,0,0,1,1,0 1
+DIV / 1,0,0,0,1,1,1,0,1,0,1,1,0,0,0,1,1,0 1
+MOD % 1,0,1,0,0,1,1,0,1,0,1,1,0,0,0,1,1,0 1
+PLUS + 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1
+MINUS - 1,0,0,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0 1
+SHL << 1,0,1,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0 1
+SHR >> 1,0,1,0,0,1,1,0,0,0,1,0,1,0,0,1,1,0 1
+LT < 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
+LE <= 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
+GT > 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
+GE >= 1,1,0,1,0,1,1,0,1,0,1,1,0,1,1,0,1,0 1
+EQ == 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1
+NE != 1,1,0,1,0,1,1,0,1,0,0,0,0,1,1,0,1,0 1
+AND & 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
+XOR ^ 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
+OR | 1,0,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0 1
+LOGAND && 1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0 1
+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
-ASSIGN p = p 1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0 1
-MULASS p *= p 1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-DIVASS p /= p 1,0,0,0,1,0,0,0,0,1,0,1,0,0,0,1,0,0 1
-MODASS p %= p 1,0,1,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0 1
-ADDASS p += p 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-SUBASS p -= p 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-SHLASS p << p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-SHRASS p >> p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-ANDASS p &= p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-XORASS p ^= p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-ORASS p |= p 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
-NAME n 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
+ASSIGN = 1,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0 1
+MULASS *= 1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+DIVASS /= 1,0,0,0,1,0,0,0,0,1,0,1,0,0,0,1,0,0 1
+MODASS %= 1,0,1,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0 1
+ADDASS += 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+SUBASS -= 1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+SHLASS <<= 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+SHRASS >>= 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+ANDASS &= 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+XORASS ^= 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+ORASS |= 1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0 1
+NAME name 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
CON const 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
-STRING char * 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1
+STRING 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
-CALL p() 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 1
+CALL 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
-CVT (cast)p 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 1
+CVT convert 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
-REAL p.re 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
-IMAG p.im 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
-INIT p = {} 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 1 pseudo
+REAL real 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
+IMAG imag 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0
+INIT 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
-FARG f(p) 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 1 pseudo
+FARG farg 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 1 pseudo
