1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
--- lookup-1.08b.orig/eval.c 2025-09-29 14:48:00.250696196 +0200
+++ lookup-1.08b/eval.c 2025-09-29 14:47:49.218707436 +0200
@@ -48,8 +48,9 @@
const unsigned char *eval_error_loc;
static const unsigned char *str;
-static unsigned long true = 1;
-static unsigned long false = 0;
+/* Avoid clashes with C boolean keywords/macros in modern GCC */
+static unsigned long eval_true_value = 1;
+static unsigned long eval_false_value = 0;
static struct
{
@@ -66,8 +67,8 @@
{ NAME("nonword"), UNSIGNED_LONG, &lookup.count.nonword },
{ NAME("filtered"), UNSIGNED_LONG, &lookup.count.filtered },
#endif
- { NAME("true"), UNSIGNED_LONG, &true },
- { NAME("false"), UNSIGNED_LONG, &false },
+ { NAME("true"), UNSIGNED_LONG, &eval_true_value },
+ { NAME("false"), UNSIGNED_LONG, &eval_false_value },
};
enum prec { P_EQUAL, P_BOOL, P_PLUS, P_MULT, P_HIGH };
--- a/commands.c 2025-09-29 15:31:28.947945721 +0200
+++ b/commands.c 2025-09-29 15:34:10.663784077 +0200
@@ -55,12 +55,12 @@
#define COMMAND_HAS_ERROR 1
#define SIMPLE_GLOBAL_FLAG(VAR, DESC) \
- static int cmd_set_default_ ## VAR ## _flag(String *bool) \
+ static int cmd_set_default_ ## VAR ## _flag(String *flagstr) \
{ \
String *when = (String*)"is"; \
- if (bool) \
+ if (flagstr) \
{ \
- lookup.flag.VAR = interpret_boolean(bool); \
+ lookup.flag.VAR = interpret_boolean(flagstr); \
if (!lookup.flag.verbose) \
return COMMAND_RUNS_OK; \
when = (String*)"now"; \
@@ -70,12 +70,12 @@
}
#define SIMPLE_LOCAL_FLAG(VAR, DESC) \
- static int cmd_set_local_ ## VAR ## _flag(String *bool) \
+ static int cmd_set_local_ ## VAR ## _flag(String *flagstr) \
{ \
String *when = (String*)"is"; \
kibishii_assert(lookup.slot != 0); \
- if (bool) { \
- lookup.slot->default_flag.VAR = interpret_boolean(bool); \
+ if (flagstr) { \
+ lookup.slot->default_flag.VAR = interpret_boolean(flagstr); \
if (!lookup.flag.verbose) \
return COMMAND_RUNS_OK; \
when = (String*)"now"; \
@@ -107,11 +107,11 @@
* Specialized version of command_flag() so that we don't say "verbosity on"
* when we turn it on.
*/
-static int set_verbose_flag(String *bool)
+static int set_verbose_flag(String *flagstr)
{
- if (bool)
+ if (flagstr)
{
- lookup.flag.verbose = interpret_boolean(bool);
+ lookup.flag.verbose = interpret_boolean(flagstr);
return COMMAND_RUNS_OK;
}
outputf("verbosity is %s.\n", lookup.flag.verbose ? "on" : "off");
@@ -290,7 +290,7 @@
}
-static int cmd_toggle_filter(String *bool)
+static int cmd_toggle_filter(String *flagstr)
{
const char *when = "";
@@ -298,12 +298,12 @@
if (!COMBO(lookup.slot) && lookup.slot->filter_spec.pattern == 0) {
outputf("%sno filter installed.\n", lookup.where);
- return bool ? COMMAND_HAS_ERROR : COMMAND_RUNS_OK;
+ return flagstr ? COMMAND_HAS_ERROR : COMMAND_RUNS_OK;
}
- if (bool)
+ if (flagstr)
{
- lookup.slot->default_flag.filter = interpret_boolean(bool);
+ lookup.slot->default_flag.filter = interpret_boolean(flagstr);
if (!lookup.flag.verbose)
return COMMAND_RUNS_OK;
when = "now ";
@@ -791,7 +791,7 @@
return COMMAND_RUNS_OK;
}
-static int cmd_toggle_modify(String *bool)
+static int cmd_toggle_modify(String *flagstr)
{
const char *when = "";
@@ -800,12 +800,12 @@
if (!COMBO(lookup.slot) && lookup.slot->modify_spec.pattern == 0)
{
outputf("%sno modification installed.\n", lookup.where);
- return bool ? COMMAND_HAS_ERROR : COMMAND_RUNS_OK;
+ return flagstr ? COMMAND_HAS_ERROR : COMMAND_RUNS_OK;
}
- if (bool)
+ if (flagstr)
{
- lookup.slot->default_flag.modify = interpret_boolean(bool);
+ lookup.slot->default_flag.modify = interpret_boolean(flagstr);
if (!lookup.flag.verbose)
return COMMAND_RUNS_OK;
when = "now ";
|
