felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't set nonconst_expr on a reminder if the non-constant expression is only in the *BODY* of the reminder.

Browse Source 
Only set it if it affects the trigger specification.
This commit is contained in:
Dianne Skoll
2025-10-12 11:22:13 -04:00
parent f726b09fc6
commit 5534bf8272
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/calendar.c
View File

@@ -2111,7 +2111,7 @@ static int DoCalRem(ParsePtr p, int col)
}
/* Save nonconst_expr flag */
nonconst_expr = p->nonconst_expr;
nonconst_expr = trig.nonconst_expr;
/* Convert PS and PSF to PASSTHRU */
if (trig.typ == PS_TYPE) {
strcpy(trig.passthru, "PostScript");

12
src/dorem.c
View File

@@ -547,7 +547,7 @@ int DoRem(ParsePtr p)
if (PurgeMode) {
if (trig.expired || (!trig.is_todo && dse < DSEToday)) {
if (p->expr_happened) {
if (p->nonconst_expr) {
if (trig.nonconst_expr) {
if (!Hush) {
PurgeEchoLine("%s\n", "#!P: Next line may have expired, but contains non-constant expression");
PurgeEchoLine("%s\n", "#!P: or a relative SCANFROM clause");
@@ -632,7 +632,7 @@ int DoRem(ParsePtr p)
PrintJSONKeyPairInt("time_in_tz", tim.ttime_orig);
}
}
if (p->nonconst_expr) {
if (trig.nonconst_expr) {
PrintJSONKeyPairInt("nonconst_expr", 1);
}
if (if_depth) {
@@ -833,6 +833,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
trig->adj_for_last = 0;
trig->infos = NULL;
trig->tz = NULL;
trig->nonconst_expr = 0;
int parsing = 1;
while(parsing) {
@@ -1097,6 +1098,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
s->expr_happened = 1;
nonconst_debug(s->nonconst_expr, tr("OMITFUNC counts as a non-constant expression"));
s->nonconst_expr = 1;
trig->nonconst_expr = 1;
DBufFree(&buf);
break;
@@ -1201,6 +1203,9 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
}
}
if (s->nonconst_expr) {
trig->nonconst_expr = 1;
}
if (trig->need_wkday && trig->wd == NO_WD) {
Eprint("Weekday name(s) required");
return E_PARSE_ERR;
@@ -1237,7 +1242,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
}
}
if (!s->nonconst_expr) {
if (!trig->nonconst_expr) {
if (trig->y != NO_YR && trig->m != NO_MON && trig->d != NO_DAY && trig->until != NO_UNTIL) {
if (DSE(trig->y, trig->m, trig->d) > trig->until) {
Wprint(tr("Warning: UNTIL/THROUGH date earlier than start date"));
@@ -1497,6 +1502,7 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
s->expr_happened = 1;
nonconst_debug(s->nonconst_expr, tr("Relative SCANFROM counts as a non-constant expression"));
s->nonconst_expr = 1;
t->nonconst_expr = 1;
return OK;
default:

1
src/types.h
View File

@@ -146,6 +146,7 @@ typedef struct {
int maybe_uncomputable; /* Suppress "can't compute trigger" warnings */
int addomit; /* Add trigger date to global OMITs */
int noqueue; /* Don't queue even if timed */
int nonconst_expr; /* Non-constant expression encountered */
int max_overdue; /* Stop warning if TODO is too far overdue */
char sched[VAR_NAME_LEN+1]; /* Scheduling function */
char warn[VAR_NAME_LEN+1]; /* Warning function */