guaranty-order-for-numeric-keys.patch

   1 From: Bert Wesarg <bert.wesarg@googlemail.com>
   2 Subject: [PATCH] guaranty order for numeric array keys
   3
   4 Currently ther is no order guaranty for array keys in the for loops, this is
   5 for numeric keys a little amberressing.
   6
   7 Use a new compare routine that takes care of numeric keys. This works also
   8 for multi-dimensional keys with sub dimensional numeric keys.
   9
  10 Therefore, this do the right thing:
  11
  12   arr[10] = "ten"
  13   arr[ 2] = "two"
  14   arr[ 1] = "one"
  15
  16   for (k in arr) {
  17       t_print(k "\n")
  18   }
  19
  20 And this too:
  21
  22   arr[10,10] = "ten,ten"
  23   arr[10, 2] = "ten,two"
  24   arr[10, 1] = "ten,one"
  25   arr[ 2,10] = "two,ten"
  26   arr[ 2, 2] = "two,two"
  27   arr[ 2, 1] = "two,one"
  28   arr[ 1,10] = "one,ten"
  29   arr[ 1, 2] = "one,two"
  30   arr[ 1, 1] = "one,one"
  31
  32   for (k in arr) {
  33       t_print(k "\n")
  34   }
  35
  36 And this too:
  37
  38   arr["c",10] = "c,ten"
  39   arr["c", 2] = "c,two"
  40   arr["c", 1] = "c,one"
  41   arr["b",10] = "b,ten"
  42   arr["b", 2] = "b,two"
  43   arr["b", 1] = "b,one"
  44   arr["a",10] = "a,ten"
  45   arr["a", 2] = "a,two"
  46   arr["a", 1] = "a,one"
  47
  48   for (k in arr) {
  49       t_print(k "\n")
  50   }
  51
  52 There is one semantic change with this:
  53
  54   arr[1] = "one"
  55
  56 would be overridden by this:
  57
  58   arr["01"] = "zeroone"
  59
  60 ---
  61
  62  source/interpret.c |   84 +++++++++++++++++++++++++++++++++++++++++++++++++++--
  63  source/interpret.h |    1
  64  2 files changed, 82 insertions(+), 3 deletions(-)
  65
  66 diff --quilt old/source/interpret.c new/source/interpret.c
  67 --- old/source/interpret.c
  68 +++ new/source/interpret.c
  69 @@ -2368,10 +2368,84 @@ static int arrayEntryCopyToNode(rbTreeNo
  70
  71  /*
  72  ** compare two array nodes returning an integer value similar to strcmp()
  73 +**
  74 +** take care of numeric keys and sort them right, also with multi dimensions
  75  */
  76  static int arrayEntryCompare(rbTreeNode *left, rbTreeNode *right)
  77  {
  78 -    return(strcmp(((SparseArrayEntry *)left)->key, ((SparseArrayEntry *)right)->key));
  79 +    const char *keya = ((SparseArrayEntry *)left)->key;
  80 +    const char *keya_end = keya + strlen(keya);
  81 +    const char *keyb = ((SparseArrayEntry *)right)->key;
  82 +    const char *keyb_end = keyb + strlen(keyb);
  83 +    size_t seplen = strlen(ARRAY_DIM_SEP);
  84 +    int cmp;
  85 +
  86 +    while (1) {
  87 +        int numa;
  88 +        int numb;
  89 +        long dima_len;
  90 +        long dimb_len;
  91 +        const char *dima_end = strstr(keya, ARRAY_DIM_SEP);
  92 +        const char *dimb_end = strstr(keyb, ARRAY_DIM_SEP);
  93 +        char *numa_end;
  94 +        char *numb_end;
  95 +
  96 +        if (!dima_end) {
  97 +            dima_end = keya_end;
  98 +        }
  99 +        dima_len = dima_end - keya;
 100 +
 101 +        if (!dimb_end) {
 102 +            dimb_end = keyb_end;
 103 +        }
 104 +        dimb_len = dimb_end - keyb;
 105 +
 106 +        /*
 107 +        ** if both StringToNum end at ARRAY_DIM_SEP, we have
 108 +        ** successfully parsded two numbers
 109 +        */
 110 +        if (StringToNumEnd(keya, dima_end, &numa)
 111 +                && StringToNumEnd(keyb, dimb_end, &numb)) {
 112 +            /* successfully parsed numbers
 113 +            ** even empty parts
 114 +            */
 115 +
 116 +            /* compare the numbers */
 117 +            cmp = (numa > numb) - (numa < numb);
 118 +            if (cmp != 0) {
 119 +                return cmp;
 120 +            }
 121 +
 122 +        } else {
 123 +
 124 +            /* if the length differ, just compare the remainder */
 125 +            if (dima_len != dimb_len) {
 126 +                return strcmp(keya, keyb);
 127 +            }
 128 +
 129 +            /* compare this dimension */
 130 +            cmp = strncmp(keya, keyb, dima_len);
 131 +            if (cmp != 0) {
 132 +                    return cmp;
 133 +            }
 134 +        }
 135 +
 136 +        /* eat this dimension */
 137 +        keya = dima_end;
 138 +        keyb = dimb_end;
 139 +
 140 +        /*
 141 +        ** break condition:
 142 +        ** at least one key is fully eaten, compare the remainder
 143 +        */
 144 +        if (dima_end == keya_end || dimb_end == keyb_end) {
 145 +            return strcmp(keya, keyb);
 146 +        }
 147 +
 148 +        /* both dim ends point to a ARRAY_DIM_SEP => skip */
 149 +        keya += seplen;
 150 +        keyb += seplen;
 151 +    }
 152  }
 153
 154  /*
 155 @@ -2910,7 +2984,7 @@ static int execError(const char *s1, con
 156      return STAT_ERROR;
 157  }
 158
 159 -int StringToNum(const char *string, int *number)
 160 +int StringToNumEnd(const char *string, const char *end, int *number)
 161  {
 162      const char *c = string;
 163
 164 @@ -2926,7 +3000,7 @@ int StringToNum(const char *string, int
 165      while (*c == ' ' || *c == '\t') {
 166          ++c;
 167      }
 168 -    if (*c) {
 169 +    if (end ? end == c : *c) {
 170          /* if everything went as expected, we should be at end, but we're not */
 171          return False;
 172      }
 173 @@ -2939,6 +3013,10 @@ int StringToNum(const char *string, int
 174      return True;
 175  }
 176
 177 +int StringToNum(const char *string, int *number)
 178 +{
 179 +    return StringToNumEnd(string, NULL, number);
 180 +}
 181
 182  static const char *tagToStr(enum typeTags tag)
 183  {
 184 diff --quilt old/source/interpret.h new/source/interpret.h
 185 --- old/source/interpret.h
 186 +++ new/source/interpret.h
 187 @@ -185,5 +185,6 @@ WindowInfo *MacroFocusWindow(void);
 188  void SetMacroFocusWindow(WindowInfo *window);
 189  /* function used for implicit conversion from string to number */
 190  int StringToNum(const char *string, int *number);
 191 +int StringToNumEnd(const char *string, const char *end, int *number);
 192
 193  #endif /* NEDIT_INTERPRET_H_INCLUDED */