mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 19:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax: refactor syn_combine_list()

Browse Source 
Add const on parameters and variables.
Update declarations to avoid typecasts.
Use `sizeof(*ptr)` for malloc() to reduce effect of type changes.
ie. short to int16_t

Update syn_compare_stub() variable declarations for consistency.
This commit is contained in:
Jan Edmund Lazo
2018-07-28 02:23:14 -04:00
parent 6646502bbb
commit c18a1b9034
1 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/nvim/syntax.c
View File

@@ -4695,30 +4695,25 @@ syn_cmd_region(
} }
} }
/* // A simple syntax group ID comparison function suitable for use in qsort()
* A simple syntax group ID comparison function suitable for use in qsort() static int syn_compare_stub(const void *const v1, const void *const v2)
*/
static int syn_compare_stub(const void *v1, const void *v2)
{ {
const short *s1 = v1; const int16_t *const s1 = v1;
const short *s2 = v2; const int16_t *const s2 = v2;
return *s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0; return *s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0;
} }
/* // Combines lists of syntax clusters.
* Combines lists of syntax clusters. // *clstr1 and *clstr2 must both be allocated memory; they will be consumed.
* *clstr1 and *clstr2 must both be allocated memory; they will be consumed. static void syn_combine_list(int16_t **const clstr1, int16_t **const clstr2,
*/ const int list_op)
static void syn_combine_list(short **clstr1, short **clstr2, int list_op)
{ {
int count1 = 0; size_t count1 = 0;
int count2 = 0; size_t count2 = 0;
short *g1; const int16_t *g1;
short *g2; const int16_t *g2;
short *clstr = NULL; int16_t *clstr = NULL;
int count;
int round;
/* /*
* Handle degenerate cases. * Handle degenerate cases.
@@ -4735,27 +4730,25 @@ static void syn_combine_list(short **clstr1, short **clstr2, int list_op)
return; return;
} }
for (g1 = *clstr1; *g1; g1++) for (g1 = *clstr1; *g1; g1++) {
++count1; count1++;
for (g2 = *clstr2; *g2; g2++) }
++count2; for (g2 = *clstr2; *g2; g2++) {
count2++;
}
/* // For speed purposes, sort both lists.
* For speed purposes, sort both lists. qsort(*clstr1, count1, sizeof(**clstr1), syn_compare_stub);
*/ qsort(*clstr2, count2, sizeof(**clstr2), syn_compare_stub);
qsort(*clstr1, (size_t)count1, sizeof(short), syn_compare_stub);
qsort(*clstr2, (size_t)count2, sizeof(short), syn_compare_stub);
/* // We proceed in two passes; in round 1, we count the elements to place
* We proceed in two passes; in round 1, we count the elements to place // in the new list, and in round 2, we allocate and populate the new
* in the new list, and in round 2, we allocate and populate the new // list. For speed, we use a mergesort-like method, adding the smaller
* list. For speed, we use a mergesort-like method, adding the smaller // of the current elements in each list to the new list.
* of the current elements in each list to the new list. for (int round = 1; round <= 2; round++) {
*/
for (round = 1; round <= 2; round++) {
g1 = *clstr1; g1 = *clstr1;
g2 = *clstr2; g2 = *clstr2;
count = 0; int count = 0;
/* /*
* First, loop through the lists until one of them is empty. * First, loop through the lists until one of them is empty.
@@ -4807,7 +4800,7 @@ static void syn_combine_list(short **clstr1, short **clstr2, int list_op)
clstr = NULL; clstr = NULL;
break; break;
} }
clstr = xmalloc((count + 1) * sizeof(short)); clstr = xmalloc((count + 1) * sizeof(*clstr));
clstr[count] = 0; clstr[count] = 0;
} }
} }