Module Name: src
Committed By: rillig
Date: Mon Jul 26 18:10:14 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: expr_precedence.c expr_precedence.exp
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: fix parse error in conditional expression (since 2021-07-15)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/expr_precedence.c \
src/tests/usr.bin/xlint/lint1/expr_precedence.exp
cvs rdiff -u -r1.348 -r1.349 src/usr.bin/xlint/lint1/cgram.y
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/expr_precedence.c
diff -u src/tests/usr.bin/xlint/lint1/expr_precedence.c:1.6 src/tests/usr.bin/xlint/lint1/expr_precedence.c:1.7
--- src/tests/usr.bin/xlint/lint1/expr_precedence.c:1.6 Mon Jul 26 18:06:43 2021
+++ src/tests/usr.bin/xlint/lint1/expr_precedence.c Mon Jul 26 18:10:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: expr_precedence.c,v 1.6 2021/07/26 18:06:43 rillig Exp $ */
+/* $NetBSD: expr_precedence.c,v 1.7 2021/07/26 18:10:14 rillig Exp $ */
# 3 "expr_precedence.c"
/*
@@ -60,7 +60,6 @@ conditional_associativity(_Bool cond1, _
var = cond1 ? (cond2 ? a : b) : c;
/* The then-expression can even be a comma-expression. */
- /* expect+1: error: syntax error ',' [249] *//* FIXME */
var = cond1 ? cond2 ? a, b : (b, a) : c;
var = cond1 ? a : cond2 ? b : c;
Index: src/tests/usr.bin/xlint/lint1/expr_precedence.exp
diff -u src/tests/usr.bin/xlint/lint1/expr_precedence.exp:1.6 src/tests/usr.bin/xlint/lint1/expr_precedence.exp:1.7
--- src/tests/usr.bin/xlint/lint1/expr_precedence.exp:1.6 Mon Jul 26 18:06:43 2021
+++ src/tests/usr.bin/xlint/lint1/expr_precedence.exp Mon Jul 26 18:10:14 2021
@@ -2,4 +2,3 @@ expr_precedence.c(15): error: syntax err
expr_precedence.c(18): error: non-constant initializer [177]
expr_precedence.c(35): error: 'var' undefined [99]
expr_precedence.c(35): error: syntax error '=' [249]
-expr_precedence.c(64): error: syntax error ',' [249]
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.348 src/usr.bin/xlint/lint1/cgram.y:1.349
--- src/usr.bin/xlint/lint1/cgram.y:1.348 Mon Jul 26 17:27:22 2021
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 26 18:10:14 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.348 2021/07/26 17:27:22 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.349 2021/07/26 18:10:14 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.348 2021/07/26 17:27:22 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.349 2021/07/26 18:10:14 rillig Exp $");
#endif
#include <limits.h>
@@ -682,7 +682,7 @@ conditional_expression:
| conditional_expression T_LOGOR conditional_expression {
$$ = build_binary($1, LOGOR, $3);
}
- | conditional_expression T_QUEST conditional_expression
+ | conditional_expression T_QUEST expression
T_COLON conditional_expression {
$$ = build_binary($1, QUEST, build_binary($3, COLON, $5));
}
