..

Author: wolfv

src/conda.c

@@ -18,7 +18,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <regex.h>
-#include <ctype.h>
 
 #include "pool.h"
 #include "repo.h"
@@ -225,7 +224,6 @@ pool_evrcmp_conda_int(const char *evr1, const char *evr1e, const char *evr2, con
 int
 pool_evrcmp_conda(const Pool *pool, const char *evr1, const char *evr2, int mode)
 {
-  // printf("EVR CMP conda: %s, %s", evr1, evr2);
   if (evr1 == evr2)
     return 0;
   return pool_evrcmp_conda_int(evr1, evr1 + strlen(evr1), evr2, evr2 + strlen(evr2), 0);
@@ -680,242 +678,3 @@ pool_conda_matchspec(Pool *pool, const char *name)
   return pool_rel2id(pool, nameid, evrid, REL_CONDA, 1);
 }
 
-int find_lower_upper_bound(const char* c, 
-    char* lower, int* lowerflag, char* upper, int* upperflag)
-{
-  lower[0] = '\0';
-  upper[0] = '\0';
-  *lowerflag = 0;
-  *upperflag = 0;
-
-  if (!c)
-    {
-      // Infinity bound => lower[0] == '\0' && flag == REL_GT | REL_EQ
-      // return infinity lower & upper
-      *lowerflag = REL_GT | REL_EQ;
-      *upperflag = REL_GT | REL_EQ;
-      return 1;
-    }
-
-  int len = strlen(c);
-  const char* lowerbegin = NULL;
-  const char* lowerend;
-  const char* upperbegin = NULL;
-  const char* upperend;
-  const char* p;
-  const char** toend = NULL;
-  int has_star = 0;
-
-  for (int i = 0; i < len; ++i)
-    {
-      if (c[i] == ' ') break;
-      if (c[i] == '>')
-       {
-          *lowerflag = REL_GT;
-          ++i;
-          if (len > i && c[i] == '=')
-            {
-              *lowerflag |= REL_EQ;
-              ++i;
-            }
-          p = lowerbegin = &c[i];
-          toend = &lowerend;
-        }
-      else if (c[i] == '<')
-        {
-          *upperflag = REL_LT;
-          ++i;
-          if (len > i && c[i] == '=')
-            {
-              *upperflag |= REL_EQ;
-              ++i;
-            }
-          p = upperbegin = &c[i];
-          toend = &upperend;
-        }
-      else if (c[i] == '=')
-        {
-          ++i;
-          if (c[i] == '=')
-            {
-              ++i;
-              *lowerflag = REL_EQ;
-              *upperflag = REL_EQ;
-            }
-          else
-            {
-              *lowerflag = REL_EQ | REL_LT | REL_GT;
-              *upperflag = REL_EQ | REL_LT | REL_GT;
-              has_star = 1;
-            }
-          p = lowerbegin = &c[i];
-          toend = &lowerend;
-        }
-      else if (c[i] == ',' || c[i] == '|')
-        {
-          // ignore
-        }
-      else
-        {
-	  *lowerflag = REL_EQ;
-          *upperflag = REL_EQ;
-          p = lowerbegin = &c[i];
-          toend = &lowerend;
-        }
-      if (toend)
-        {
-          while (*p && *p != ',' && *p != '|' && *p != ' ')
-            ++p, ++i;
-          *toend = p;
-          toend = NULL;
-          if (*p == ' ') break;
-        }
-  }
-
-  if (!upperbegin)
-    {
-      if (*(lowerend - 1) == '*' || has_star)
-        {
-          *upperflag = REL_GT | REL_LT | REL_EQ;
-          *lowerflag = REL_GT | REL_LT | REL_EQ;
-          const char* p = lowerend - 1;
-          while (p > lowerbegin && (*p == '*' || *p == '.')) p--;
-          lowerend = p + 1;
-        }
-      upperbegin = lowerbegin;
-      upperend   = lowerend;
-    }
-
-  if (lowerbegin != NULL)
-    strncat(lower, lowerbegin, lowerend - lowerbegin);
-
-  if (upperbegin != NULL && upperbegin != upper)
-    strncat(upper, upperbegin, upperend - upperbegin);
-
-  return 1;
-}
-
-void normalize_bound(int* flags, char* bound)
-{
-  if ((*flags & (REL_GT | REL_EQ)) == (REL_GT | REL_EQ)) return;
-  if (*flags & REL_GT)
-  {
-    size_t len = strlen(bound);
-    if (len == 0) return;
-
-    char snum[100] = "\0";
-    char sbef[100] = "\0", saft[100] = "\0";
-
-    const char* end = &bound[len - 1];
-    const char* start;
-
-    for (;end >= bound; --end) {
-      if (*end == '.') {
-        end++;
-        break;
-      }
-    }
-
-    start = end;
-
-    while ((*end != '\0') && isdigit(*end))
-      ++end;
-
-    memcpy(sbef, bound, start - bound);
-    sbef[start - bound ] = '\0';
-    memcpy(saft, end, &bound[len] - end);
-    strncpy(snum, start, end - start);
-
-    size_t num;
-    if (1 == sscanf(snum, "%zu", &num))
-    {
-      sprintf(bound, "%s%zu%s", sbef, num + 1, saft);
-    }
-    else
-    {
-      return;
-    }
-  }
-}
-
-// given a list of bounds, selects the highest lowest 
-// for a given solvable, e.g.
-// - python =3.4
-// - python >=3.3
-// -- will return reldep for `python =3.4` etc.
-Reldep* select_best_bound(Pool* pool, Queue* q, Id name)
-{
-  Reldep* res = NULL;
-  for (int i = 0; i < q->count; ++i)
-  {
-    Id x1 = q->elements[i];
-    Reldep *rd1 = GETRELDEP(pool, x1);
-    if (rd1->name == name)
-    {
-      if (res)
-      {
-        // check if this has a higher lower bound than rd1
-        int cmp = conda_compare_bounds(pool_id2str(pool, res->evr),
-                                       pool_id2str(pool, rd1->evr));
-        if (cmp > 0) res = rd1;
-      }
-      else
-        res = rd1;
-    }
-  }
-  return res;
-}
-
-int conda_compare_bounds(const char* b1, const char* b2)
-{
-  if (!b1 || !b2)
-  {
-    if (!b1 && !b2) return  0;
-    if (b1 && !b2)  return  1;
-    if (!b1 && b2)  return -1;
-  }
-
-  // TODO handle infty bounds
-  int lf1, uf1, lf2, uf2;
-  char l1[100] = "", u1[100] = "";
-  char l2[100] = "", u2[100] = "";
-  find_lower_upper_bound(b1, l1, &lf1, u1, &uf1);
-  find_lower_upper_bound(b2, l2, &lf2, u2, &uf2);
-
-  // if lower bound different, prefer package with higher lower bound
-  // if upper bound different, prefer package with higher upper bound
-
-  // edge cases `=3.7, >=3.7 --> lower bound equal, upper bound different
-  // edge cases `==3.7, =3.7 --> lower bound equal, upper bound different
-
-  // printf("compare: %s vs %s", l1, l2);
-
-  // both lower pin with * at end
-  if (lf1 == lf2)
-  {
-    printf("compare: %s vs %s\n", l1, l2);
-    int l_evr_cmp = pool_evrcmp_conda(NULL, l1, l2, 0);
-    if (l_evr_cmp != 0)
-    {
-      return -l_evr_cmp;
-    }
-  }
-  else
-  {
-    normalize_bound(&lf1, l1);
-    normalize_bound(&lf2, l2);
-
-    int l_evr_cmp = pool_evrcmp_conda(NULL, l1, l2, 0);
-    // TODO
-    // need some logic here to normalize the bounds 
-    // depending on the comparison function
-    return -l_evr_cmp;
-  }
-
-  int u_evr_cmp = pool_evrcmp_conda(NULL, u1, u2, 0);
-  if (u_evr_cmp != 0)
-  {
-      return u_evr_cmp;
-  }
-  return u_evr_cmp;
-}

src/conda.h

@@ -13,16 +13,10 @@
 #ifndef LIBSOLV_CONDA_H
 #define LIBSOLV_CONDA_H
 
-#include "queue.h"
-#include "pool.h"
-
 int pool_evrcmp_conda(const Pool *pool, const char *evr1, const char *evr2, int mode);
 int solvable_conda_matchversion(Solvable *s, const char *version);
 Id pool_addrelproviders_conda(Pool *pool, Id name, Id evr, Queue *plist);
 Id pool_conda_matchspec(Pool *pool, const char *name);
-int conda_compare_bounds(const char* b1, const char* b2);
-void normalize_bound(int* f, char* b);
-Reldep* select_best_bound(Pool* pool, Queue* q, Id name);
 
 #endif /* LIBSOLV_CONDA_H */