ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make error message for input parameter type mismatch more specific to show what is incorrect

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-12-17 14:03:26 -05:00
parent 34e0c05b09
commit 90e125a73a
2 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/force.cpp
View File

@ -934,20 +934,21 @@ void Force::boundsbig(const char *file, int line, char *str,
double Force::numeric(const char *file, int line, char *str)
{
if (!str)
error->all(file,line,"Expected floating point parameter "
"in input script or data file");
int n = strlen(str);
int n = 0;
if (str) n = strlen(str);
if (n == 0)
error->all(file,line,"Expected floating point parameter "
"in input script or data file");
error->all(file,line,"Expected floating point parameter instead of"
" NULL or empty string in input script or data file");
for (int i = 0; i < n; i++) {
if (isdigit(str[i])) continue;
if (str[i] == '-' || str[i] == '+' || str[i] == '.') continue;
if (str[i] == 'e' || str[i] == 'E') continue;
error->all(file,line,"Expected floating point parameter "
"in input script or data file");
char msg[256];
snprintf(msg,256,"Expected floating point parameter instead of "
"'%s' in input script or data file",str);
error->all(file,line,msg);
}
return atof(str);
@ -961,18 +962,19 @@ double Force::numeric(const char *file, int line, char *str)
int Force::inumeric(const char *file, int line, char *str)
{
if (!str)
error->all(file,line,
"Expected integer parameter in input script or data file");
int n = strlen(str);
int n = 0;
if (str) n = strlen(str);
if (n == 0)
error->all(file,line,
"Expected integer parameter in input script or data file");
error->all(file,line,"Expected integer parameter instead of "
"NULL or empty string in input script or data file");
for (int i = 0; i < n; i++) {
if (isdigit(str[i]) || str[i] == '-' || str[i] == '+') continue;
error->all(file,line,
"Expected integer parameter in input script or data file");
char msg[256];
snprintf(msg,256,"Expected integer parameter instead of "
"'%s' in input script or data file",str);
error->all(file,line,msg);
}
return atoi(str);
@ -986,18 +988,19 @@ int Force::inumeric(const char *file, int line, char *str)
bigint Force::bnumeric(const char *file, int line, char *str)
{
if (!str)
error->all(file,line,
"Expected integer parameter in input script or data file");
int n = strlen(str);
int n = 0;
if (str) n = strlen(str);
if (n == 0)
error->all(file,line,
"Expected integer parameter in input script or data file");
error->all(file,line,"Expected integer parameter instead of "
"NULL or empty string in input script or data file");
for (int i = 0; i < n; i++) {
if (isdigit(str[i]) || str[i] == '-' || str[i] == '+') continue;
error->all(file,line,
"Expected integer parameter in input script or data file");
char msg[256];
snprintf(msg,256,"Expected integer parameter instead of "
"'%s' in input script or data file",str);
error->all(file,line,msg);
}
return ATOBIGINT(str);
@ -1011,18 +1014,19 @@ bigint Force::bnumeric(const char *file, int line, char *str)
tagint Force::tnumeric(const char *file, int line, char *str)
{
if (!str)
error->all(file,line,
"Expected integer parameter in input script or data file");
int n = strlen(str);
int n = 0;
if (str) n = strlen(str);
if (n == 0)
error->all(file,line,
"Expected integer parameter in input script or data file");
error->all(file,line,"Expected integer parameter instead of "
"NULL or empty string in input script or data file");
for (int i = 0; i < n; i++) {
if (isdigit(str[i]) || str[i] == '-' || str[i] == '+') continue;
error->all(file,line,
"Expected integer parameter in input script or data file");
char msg[256];
snprintf(msg,256,"Expected integer parameter instead of "
"'%s' in input script or data file",str);
error->all(file,line,msg);
}
return ATOTAGINT(str);