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

Tweak diagnostic messages.

Browse Source
This commit is contained in:
Dianne Skoll
2024-08-28 14:35:49 -04:00
parent 8515fb7ddd
commit cd8624e176
4 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dorem.c
View File

@@ -65,7 +65,10 @@ check_trigger_function(char const *fname, char const *type)
}
f = FindUserFunc(fname);
if (!f) {
Wprint("Undefined %s function `%s'", type, fname);
if (strcmp(type, "WARN")) {
/* Undefined WARN functions are diagnosed elsewhere... */
Wprint("Undefined %s function: `%s'", type, fname);
}
return;
}
if (ensure_expr_references_first_local_arg(f->node)) {

2
src/err.h
View File

@@ -241,7 +241,7 @@ EXTERN char *ErrMsg[]
/* E_NOREMINDERS */ "No reminders.",
/* M_QUEUED */ "%d reminder(s) queued for later today.\n",
/* E_EXPECTING_NUMBER */ "Expecting number",
/* M_BAD_WARN_FUNC */ "Bad function in WARN clause",
/* M_BAD_WARN_FUNC */ "Undefined WARN function",
/* E_CANT_CONVERT_TZ */ "Can't convert between time zones",
/* E_NO_MATCHING_REMS */ "No files matching *.rem",
/* E_STRING_TOO_LONG */ "String too long",

80
tests/test.cmp
View File

@@ -5391,6 +5391,22 @@ REM OMITFUNC gg MSG hehe
hehe
REM WARN not_defined MSG Wookie
../tests/test.rem(1040): Trig = Saturday, 16 February, 1991
../tests/test.rem(1040): Undefined WARN function: `not_defined'
Wookie
REM AT 11:00 SCHED not_defined MSG blork
../tests/test.rem(1041): Undefined SCHED function: `not_defined'
../tests/test.rem(1041): Trig = Saturday, 16 February, 1991 AT 11:00
blork
REM OMITFUNC not_defined MSG hehe
../tests/test.rem(1042): Undefined OMITFUNC function: `not_defined'
../tests/test.rem(1042): Trig = Saturday, 16 February, 1991
hehe
### Strings in logical operators
SET logstr "" && 7
"" && ? => ""
@@ -11532,38 +11548,38 @@ Reminders for Sunday, 1st January, 2012:
2
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
-stdin-(1): Undefined OMITFUNC function: `foo'
# rem2ps2 begin
January 2012 31 0 0
Sunday Monday Tuesday Wednesday Thursday Friday Saturday

4
tests/test.rem
View File

@@ -1037,6 +1037,10 @@ REM WARN gg MSG Wookie
REM AT 11:00 SCHED gg MSG blork
REM OMITFUNC gg MSG hehe
REM WARN not_defined MSG Wookie
REM AT 11:00 SCHED not_defined MSG blork
REM OMITFUNC not_defined MSG hehe
### Strings in logical operators
SET logstr "" && 7
SET logstr "foo" && 7