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

Make error messages more consistent.

Browse Source
This commit is contained in:
Dianne Skoll
2024-08-28 18:21:35 -04:00
parent 7d13f4b09e
commit 7b098e95ad
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/err.h
View File

@@ -204,7 +204,7 @@ EXTERN char *ErrMsg[]
/* E_ERR_READING */ "Error reading",
/* E_EXPECTING_EOL */ "Expecting end-of-line",
/* E_BAD_HEBDATE */ "Invalid Hebrew date",
/* E_IIF_ODD */ "IIF needs odd number of arguments",
/* E_IIF_ODD */ "iif(): odd number of arguments required",
/* E_MISS_ENDIF */ "Warning: Missing ENDIF",
/* E_EXPECT_COMMA */ "Expecting comma",
/* E_WD_TWICE */ "Weekday specified twice",

8
src/expr.c
View File

@@ -426,11 +426,11 @@ eval_builtin(expr_node *node, Value *locals, Value *ans, int *nonconst)
/* Check that we have the right number of argumens */
if (node->num_kids < f->minargs) {
Eprint("%s: %s", f->name, ErrMsg[E_2FEW_ARGS]);
Eprint("%s(): %s", f->name, ErrMsg[E_2FEW_ARGS]);
return E_2FEW_ARGS;
}
if (node->num_kids > f->maxargs && f->maxargs != NO_MAX) {
Eprint("%s: %s", f->name, ErrMsg[E_2MANY_ARGS]);
Eprint("%s(): %s", f->name, ErrMsg[E_2MANY_ARGS]);
return E_2MANY_ARGS;
}
@@ -628,12 +628,12 @@ eval_userfunc(expr_node *node, Value *locals, Value *ans, int *nonconst)
/* Make sure we have the right number of arguments */
if (node->num_kids < f->nargs) {
DBG(fprintf(ErrFp, "%s(...) => %s\n", fname, ErrMsg[E_2FEW_ARGS]));
Eprint("%s: %s", f->name, ErrMsg[E_2FEW_ARGS]);
Eprint("%s(): %s", f->name, ErrMsg[E_2FEW_ARGS]);
return E_2FEW_ARGS;
}
if (node->num_kids > f->nargs) {
DBG(fprintf(ErrFp, "%s(...) => %s\n", fname, ErrMsg[E_2MANY_ARGS]));
Eprint("%s: %s", f->name, ErrMsg[E_2MANY_ARGS]);
Eprint("%s(): %s", f->name, ErrMsg[E_2MANY_ARGS]);
return E_2MANY_ARGS;
}

1
src/funcs.c
View File

@@ -1284,6 +1284,7 @@ static int FChoose(expr_node *node, Value *locals, Value *ans, int *nonconst)
PUT(ErrMsg[E_BAD_TYPE]);
OUT();
}
Eprint("choose(): %s", ErrMsg[E_BAD_TYPE]);
return E_BAD_TYPE;
}
n = v.v.val;

4
tests/test.cmp
View File

@@ -5687,10 +5687,10 @@ set zxk max()
fset dooby(x) 1
set zxk dooby()
dooby(...) => Not enough arguments
../tests/test.rem(1118): dooby: Not enough arguments
../tests/test.rem(1118): dooby(): Not enough arguments
set zxk dooby(1, 2)
dooby(...) => Too many arguments
../tests/test.rem(1119): dooby: Too many arguments
../tests/test.rem(1119): dooby(): Too many arguments
set zxk dooby(1)
Entering UserFN dooby(1)
Leaving UserFN dooby(1) => 1