ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

dependency: use pkg_comparator_lookup_by_name() instead of having special lexing rules for comparator tokens 

This allows us to add new tokens in the future by adding them to one place.
pull/48/head
William Pitcock 2013-02-24 07:41:18 -06:00
parent 6e4573367d
commit e178f6d620
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dependency.c
View File

@ -104,12 +104,16 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
parse_state_t state = OUTSIDE_MODULE; parse_state_t state = OUTSIDE_MODULE;
pkg_dependency_t *deplist = NULL; pkg_dependency_t *deplist = NULL;
pkg_comparator_t compare = PKG_ANY; pkg_comparator_t compare = PKG_ANY;
char cmpname[PKG_BUFSIZE];
char buf[PKG_BUFSIZE]; char buf[PKG_BUFSIZE];
size_t package_sz = 0, version_sz = 0; size_t package_sz = 0, version_sz = 0;
char *start = buf; char *start = buf;
char *ptr = buf; char *ptr = buf;
char *vstart = NULL; char *vstart = NULL;
char *package = NULL, *version = NULL; char *package = NULL, *version = NULL;
char *cnameptr = cmpname;
memset(cmpname, '\0', sizeof cmpname);
strlcpy(buf, depends, sizeof buf); strlcpy(buf, depends, sizeof buf);
strlcat(buf, " ", sizeof buf); strlcat(buf, " ", sizeof buf);
@ -181,46 +185,20 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
case BEFORE_OPERATOR: case BEFORE_OPERATOR:
if (PKG_OPERATOR_CHAR(*ptr)) if (PKG_OPERATOR_CHAR(*ptr))
{ {
switch(*ptr)
{
case '=':
compare = PKG_EQUAL;
break;
case '>':
compare = PKG_GREATER_THAN;
break;
case '<':
compare = PKG_LESS_THAN;
break;
case '!':
compare = PKG_NOT_EQUAL;
break;
default:
break;
}
state = INSIDE_OPERATOR; state = INSIDE_OPERATOR;
*cnameptr++ = *ptr;
} }
break; break;
case INSIDE_OPERATOR: case INSIDE_OPERATOR:
if (!PKG_OPERATOR_CHAR(*ptr)) if (!PKG_OPERATOR_CHAR(*ptr))
{
state = AFTER_OPERATOR; state = AFTER_OPERATOR;
else if (*ptr == '=') compare = pkg_comparator_lookup_by_name(cmpname);
{
switch(compare)
{
case PKG_LESS_THAN:
compare = PKG_LESS_THAN_EQUAL;
break;
case PKG_GREATER_THAN:
compare = PKG_GREATER_THAN_EQUAL;
break;
default:
break;
}
} }
else
*cnameptr++ = *ptr;
break; break;