Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix score parsing #1227

Merged
merged 1 commit into from May 5, 2020
Merged

fix score parsing #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/rmutil/args.c
View file
Open in desktop
Expand Up @@ -82,13 +82,16 @@ int AC_GetLongLong(ArgsCursor *ac, long long *ll, int flags) {
return AC_ERR_PARSE;
}

// Do validation
if ((flags & AC_F_GE0) && tmpll < 0) {
return AC_ERR_ELIMIT;
}
// Do validation
if ((flags & AC_F_GE1) && tmpll < 1) {
return AC_ERR_ELIMIT;
}
if ((flags & AC_F_0TO1) && (tmpll < 0 || tmpll > 1)) {
return AC_ERR_ELIMIT;
}
MAYBE_ADVANCE();
*ll = tmpll;
return AC_OK;
Expand Down Expand Up @@ -138,6 +141,9 @@ int AC_GetDouble(ArgsCursor *ac, double *d, int flags) {
if ((flags & AC_F_GE1) && tmpd < 1.0) {
return AC_ERR_ELIMIT;
}
if ((flags & AC_F_0TO1) && (tmpd < 0.0 || tmpd > 1.0)) {
return AC_ERR_ELIMIT;
}
MAYBE_ADVANCE();
*d = tmpd;
return AC_OK;
Expand Down
1 change: 1 addition & 0 deletions src/rmutil/args.h
View file
Open in desktop
Expand Up @@ -66,6 +66,7 @@ typedef enum {
#define AC_F_GE0 0x200 // Must be >= 0 (no negative)
#define AC_F_NOADVANCE 0x400 // Don't advance cursor position
#define AC_F_COALESCE 0x800 // Coalesce non-integral input
#define AC_F_0TO1 0x1000 // Must be >=0 and <=1

// These functions return AC_OK or an error code on error. Note that the
// output value is not guaranteed to remain untouched in the case of an error
Expand Down
2 changes: 1 addition & 1 deletion src/rules/match.c
View file
Open in desktop
Expand Up @@ -112,7 +112,7 @@ static int parseAttrSettings(ArgsCursor *ac, SchemaAction *action, QueryError *e
double score = 0;
ACArgSpec specs[] = {
{.name = "LANGUAGE", .target = &langstr, .type = AC_ARGTYPE_STRING},
{.name = "SCORE", .target = &score, .type = AC_ARGTYPE_DOUBLE, .intflags = AC_F_GE0},
{.name = "SCORE", .target = &score, .type = AC_ARGTYPE_DOUBLE, .intflags = AC_F_0TO1},
{NULL}};
ACArgSpec *errspec = NULL;
int rc = AC_ParseArgSpec(ac, specs, &errspec);
Expand Down