Module Name: src
Committed By: rillig
Date: Mon Jan 18 17:20:15 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l
Log Message:
lint: align token names with the wording from C99
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/xlint/lint1/scan.l
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/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.149 src/usr.bin/xlint/lint1/cgram.y:1.150
--- src/usr.bin/xlint/lint1/cgram.y:1.149 Mon Jan 18 16:47:46 2021
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jan 18 17:20:15 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.149 2021/01/18 16:47:46 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.150 2021/01/18 17:20:15 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.149 2021/01/18 16:47:46 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.150 2021/01/18 17:20:15 rillig Exp $");
#endif
#include <limits.h>
@@ -140,7 +140,7 @@ anonymize(sym_t *s)
%token T_LBRACE T_RBRACE T_LBRACK T_RBRACK T_LPAREN T_RPAREN
%token <y_op> T_MEMBACC
-%token <y_op> T_UNOP
+%token <y_op> T_UNARY
%token <y_op> T_INCDEC
%token T_SIZEOF
%token T_BUILTIN_OFFSETOF
@@ -148,20 +148,20 @@ anonymize(sym_t *s)
%token T_EXTENSION
%token T_ALIGNOF
%token <y_op> T_ASTERISK
-%token <y_op> T_DIVOP
-%token <y_op> T_ADDOP
-%token <y_op> T_SHFTOP
-%token <y_op> T_RELOP
-%token <y_op> T_EQOP
+%token <y_op> T_MULTIPLICATIVE
+%token <y_op> T_ADDITIVE
+%token <y_op> T_SHIFT
+%token <y_op> T_RELATIONAL
+%token <y_op> T_EQUALITY
%token <y_op> T_AMPER
%token <y_op> T_XOR
-%token <y_op> T_OR
+%token <y_op> T_BITOR
%token <y_op> T_LOGAND
%token <y_op> T_LOGOR
%token T_QUEST
%token T_COLON
%token <y_op> T_ASSIGN
-%token <y_op> T_OPASS
+%token <y_op> T_OPASSIGN
%token T_COMMA
%token T_SEMI
%token T_ELLIPSIS
@@ -248,19 +248,19 @@ anonymize(sym_t *s)
%token <y_type> T_AT_WEAK
%left T_COMMA
-%right T_ASSIGN T_OPASS
+%right T_ASSIGN T_OPASSIGN
%right T_QUEST T_COLON
%left T_LOGOR
%left T_LOGAND
-%left T_OR
+%left T_BITOR
%left T_XOR
%left T_AMPER
-%left T_EQOP
-%left T_RELOP
-%left T_SHFTOP
-%left T_ADDOP
-%left T_ASTERISK T_DIVOP
-%right T_UNOP T_INCDEC T_SIZEOF T_ALIGNOF T_REAL T_IMAG
+%left T_EQUALITY
+%left T_RELATIONAL
+%left T_SHIFT
+%left T_ADDITIVE
+%left T_ASTERISK T_MULTIPLICATIVE
+%right T_UNARY T_INCDEC T_SIZEOF T_ALIGNOF T_REAL T_IMAG
%left T_LPAREN T_LBRACK T_MEMBACC
%token <y_sb> T_NAME
@@ -1802,19 +1802,19 @@ expr:
expr T_ASTERISK expr {
$$ = build(MULT, $1, $3);
}
- | expr T_DIVOP expr {
+ | expr T_MULTIPLICATIVE expr {
$$ = build($2, $1, $3);
}
- | expr T_ADDOP expr {
+ | expr T_ADDITIVE expr {
$$ = build($2, $1, $3);
}
- | expr T_SHFTOP expr {
+ | expr T_SHIFT expr {
$$ = build($2, $1, $3);
}
- | expr T_RELOP expr {
+ | expr T_RELATIONAL expr {
$$ = build($2, $1, $3);
}
- | expr T_EQOP expr {
+ | expr T_EQUALITY expr {
$$ = build($2, $1, $3);
}
| expr T_AMPER expr {
@@ -1823,7 +1823,7 @@ expr:
| expr T_XOR expr {
$$ = build(BITXOR, $1, $3);
}
- | expr T_OR expr {
+ | expr T_BITOR expr {
$$ = build(BITOR, $1, $3);
}
| expr T_LOGAND expr {
@@ -1838,7 +1838,7 @@ expr:
| expr T_ASSIGN expr {
$$ = build(ASSIGN, $1, $3);
}
- | expr T_OPASS expr {
+ | expr T_OPASSIGN expr {
$$ = build($2, $1, $3);
}
| expr T_COMMA expr {
@@ -1905,10 +1905,10 @@ term:
| T_AMPER term {
$$ = build(ADDR, $2, NULL);
}
- | T_UNOP term {
+ | T_UNARY term {
$$ = build($1, $2, NULL);
}
- | T_ADDOP term {
+ | T_ADDITIVE term {
if (tflag && $1 == PLUS) {
/* unary + is illegal in traditional C */
warning(100);
@@ -1975,10 +1975,10 @@ term:
| T_ALIGNOF T_LPAREN type_name T_RPAREN %prec T_ALIGNOF {
$$ = build_alignof($3);
}
- | T_LPAREN type_name T_RPAREN term %prec T_UNOP {
+ | T_LPAREN type_name T_RPAREN term %prec T_UNARY {
$$ = cast($4, $2);
}
- | T_LPAREN type_name T_RPAREN %prec T_UNOP {
+ | T_LPAREN type_name T_RPAREN %prec T_UNARY {
sym_t *tmp = mktempsym($2);
idecl(tmp, 1, NULL);
} init_lbrace init_expr_list init_rbrace {
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.126 src/usr.bin/xlint/lint1/scan.l:1.127
--- src/usr.bin/xlint/lint1/scan.l:1.126 Mon Jan 18 17:11:14 2021
+++ src/usr.bin/xlint/lint1/scan.l Mon Jan 18 17:20:15 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.126 2021/01/18 17:11:14 rillig Exp $ */
+/* $NetBSD: scan.l,v 1.127 2021/01/18 17:20:15 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.126 2021/01/18 17:11:14 rillig Exp $");
+__RCSID("$NetBSD: scan.l,v 1.127 2021/01/18 17:20:15 rillig Exp $");
#endif
#include <ctype.h>
@@ -114,40 +114,40 @@ TL ([fFlL]?[i]?)
0[xX]{HD}+{HX}{TL} |
\.{D}+{EX}?{TL} return fcon();
"=" return operator(T_ASSIGN, NOOP);
-"*=" return operator(T_OPASS, MULASS);
-"/=" return operator(T_OPASS, DIVASS);
-"%=" return operator(T_OPASS, MODASS);
-"+=" return operator(T_OPASS, ADDASS);
-"-=" return operator(T_OPASS, SUBASS);
-"<<=" return operator(T_OPASS, SHLASS);
-">>=" return operator(T_OPASS, SHRASS);
-"&=" return operator(T_OPASS, ANDASS);
-"^=" return operator(T_OPASS, XORASS);
-"|=" return operator(T_OPASS, ORASS);
+"*=" return operator(T_OPASSIGN, MULASS);
+"/=" return operator(T_OPASSIGN, DIVASS);
+"%=" return operator(T_OPASSIGN, MODASS);
+"+=" return operator(T_OPASSIGN, ADDASS);
+"-=" return operator(T_OPASSIGN, SUBASS);
+"<<=" return operator(T_OPASSIGN, SHLASS);
+">>=" return operator(T_OPASSIGN, SHRASS);
+"&=" return operator(T_OPASSIGN, ANDASS);
+"^=" return operator(T_OPASSIGN, XORASS);
+"|=" return operator(T_OPASSIGN, ORASS);
"||" return operator(T_LOGOR, NOOP);
"&&" return operator(T_LOGAND, NOOP);
-"|" return operator(T_OR, NOOP);
+"|" return operator(T_BITOR, NOOP);
"&" return operator(T_AMPER, NOOP);
"^" return operator(T_XOR, NOOP);
-"==" return operator(T_EQOP, EQ);
-"!=" return operator(T_EQOP, NE);
-"<" return operator(T_RELOP, LT);
-">" return operator(T_RELOP, GT);
-"<=" return operator(T_RELOP, LE);
-">=" return operator(T_RELOP, GE);
-"<<" return operator(T_SHFTOP, SHL);
-">>" return operator(T_SHFTOP, SHR);
+"==" return operator(T_EQUALITY, EQ);
+"!=" return operator(T_EQUALITY, NE);
+"<" return operator(T_RELATIONAL, LT);
+">" return operator(T_RELATIONAL, GT);
+"<=" return operator(T_RELATIONAL, LE);
+">=" return operator(T_RELATIONAL, GE);
+"<<" return operator(T_SHIFT, SHL);
+">>" return operator(T_SHIFT, SHR);
"++" return operator(T_INCDEC, INC);
"--" return operator(T_INCDEC, DEC);
"->" return operator(T_MEMBACC, ARROW);
"." return operator(T_MEMBACC, POINT);
-"+" return operator(T_ADDOP, PLUS);
-"-" return operator(T_ADDOP, MINUS);
+"+" return operator(T_ADDITIVE, PLUS);
+"-" return operator(T_ADDITIVE, MINUS);
"*" return operator(T_ASTERISK, NOOP);
-"/" return operator(T_DIVOP, DIV);
-"%" return operator(T_DIVOP, MOD);
-"!" return operator(T_UNOP, NOT);
-"~" return operator(T_UNOP, COMPL);
+"/" return operator(T_MULTIPLICATIVE, DIV);
+"%" return operator(T_MULTIPLICATIVE, MOD);
+"!" return operator(T_UNARY, NOT);
+"~" return operator(T_UNARY, COMPL);
"\"" return string();
"L\"" return wcstrg();
";" return T_SEMI;
