Module Name: src
Committed By: rillig
Date: Wed Dec 30 01:44:32 UTC 2020
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: reduce nesting of function calls
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 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/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.117 src/usr.bin/xlint/lint1/cgram.y:1.118
--- src/usr.bin/xlint/lint1/cgram.y:1.117 Wed Dec 30 01:02:38 2020
+++ src/usr.bin/xlint/lint1/cgram.y Wed Dec 30 01:44:32 2020
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.117 2020/12/30 01:02:38 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.118 2020/12/30 01:44:32 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.117 2020/12/30 01:02:38 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.118 2020/12/30 01:44:32 rillig Exp $");
#endif
#include <limits.h>
@@ -1165,8 +1165,8 @@ pointer:
$$ = merge_pointers_and_qualifiers($1, $2);
}
| asterisk type_qualifier_list pointer {
- $$ = merge_pointers_and_qualifiers(
- merge_pointers_and_qualifiers($1, $2), $3);
+ $$ = merge_pointers_and_qualifiers($1, $2);
+ $$ = merge_pointers_and_qualifiers($$, $3);
}
;
