Module Name: src
Committed By: rillig
Date: Sun Oct 24 11:42:58 UTC 2021
Modified Files:
src/tests/usr.bin/indent: opt_bs.c opt_pcs.c
Log Message:
tests/indent: test interaction between -pcs and -bs
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/indent/opt_bs.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/indent/opt_pcs.c
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/indent/opt_bs.c
diff -u src/tests/usr.bin/indent/opt_bs.c:1.3 src/tests/usr.bin/indent/opt_bs.c:1.4
--- src/tests/usr.bin/indent/opt_bs.c:1.3 Sat Oct 16 21:32:10 2021
+++ src/tests/usr.bin/indent/opt_bs.c Sun Oct 24 11:42:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_bs.c,v 1.3 2021/10/16 21:32:10 rillig Exp $ */
+/* $NetBSD: opt_bs.c,v 1.4 2021/10/24 11:42:57 rillig Exp $ */
/* $FreeBSD$ */
/*
@@ -60,3 +60,40 @@ example(int i)
print(sizeof(int));
}
#indent end
+
+/*
+ * The option '-bs' only affects 'sizeof', not 'offsetof', even though these
+ * two keywords are syntactically similar.
+ */
+#indent input
+int sizeof_type = sizeof (int);
+int sizeof_type = sizeof(int);
+int sizeof_expr = sizeof (0);
+int sizeof_expr = sizeof(0);
+int sizeof_expr = sizeof 0;
+
+int offset = offsetof(struct s, member);
+int offset = offsetof (struct s, member);
+#indent end
+
+#indent run -pcs -di0
+int sizeof_type = sizeof (int);
+int sizeof_type = sizeof (int);
+int sizeof_expr = sizeof (0);
+int sizeof_expr = sizeof (0);
+int sizeof_expr = sizeof 0;
+
+int offset = offsetof (struct s, member);
+int offset = offsetof (struct s, member);
+#indent end
+
+#indent run -npcs -di0
+int sizeof_type = sizeof(int);
+int sizeof_type = sizeof(int);
+int sizeof_expr = sizeof(0);
+int sizeof_expr = sizeof(0);
+int sizeof_expr = sizeof 0;
+
+int offset = offsetof(struct s, member);
+int offset = offsetof(struct s, member);
+#indent end
Index: src/tests/usr.bin/indent/opt_pcs.c
diff -u src/tests/usr.bin/indent/opt_pcs.c:1.4 src/tests/usr.bin/indent/opt_pcs.c:1.5
--- src/tests/usr.bin/indent/opt_pcs.c:1.4 Sun Oct 24 11:31:37 2021
+++ src/tests/usr.bin/indent/opt_pcs.c Sun Oct 24 11:42:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_pcs.c,v 1.4 2021/10/24 11:31:37 rillig Exp $ */
+/* $NetBSD: opt_pcs.c,v 1.5 2021/10/24 11:42:57 rillig Exp $ */
/* $FreeBSD$ */
/*
@@ -56,7 +56,8 @@ int offset = offsetof(struct s, member);
int offset = offsetof (struct s, member);
#indent end
-#indent run -pcs -di0
+/* The option '-pcs' overrides '-nbs'. */
+#indent run -pcs -di0 -nbs
int sizeof_type = sizeof (int);
int sizeof_type = sizeof (int);
int sizeof_expr = sizeof (0);
@@ -67,6 +68,21 @@ int offset = offsetof (struct s, member)
int offset = offsetof (struct s, member);
#indent end
+/*
+ * If the option '-npcs' is given, '-bs' can still specialize it. This only
+ * applies to 'sizeof', but not 'offsetof'.
+ */
+#indent run -npcs -di0 -bs
+int sizeof_type = sizeof (int);
+int sizeof_type = sizeof (int);
+int sizeof_expr = sizeof (0);
+int sizeof_expr = sizeof (0);
+int sizeof_expr = sizeof 0;
+
+int offset = offsetof(struct s, member);
+int offset = offsetof(struct s, member);
+#indent end
+
#indent run -npcs -di0
int sizeof_type = sizeof(int);
int sizeof_type = sizeof(int);
