+2018-12-15 Jim Meyering <meyering@fb.com>
+
+ dfa: avoid new warnings from gcc
+ These would prevent building with -Werror and a Dec snapshot of gcc.
+ * lib/dfa.c (dfaanalyze): Avoid shadowing warnings for "pos".
+ Rename each inner instance to "p".
+ (charclass_context): Remove unused static function.
+
2018-12-14 Paul Eggert <eggert@cs.ucla.edu>
mkdir-p: improve diagnostic for FUSE mounts
free (tmp.elems);
}
-/* Returns the set of contexts for which there is at least one
- character included in C. */
-
-static int
-charclass_context (struct dfa const *dfa, charclass const *c)
-{
- int context = 0;
-
- for (unsigned int j = 0; j < CHARCLASS_WORDS; ++j)
- {
- if (c->w[j] & dfa->syntax.newline.w[j])
- context |= CTX_NEWLINE;
- if (c->w[j] & dfa->syntax.letters.w[j])
- context |= CTX_LETTER;
- if (c->w[j] & ~(dfa->syntax.letters.w[j] | dfa->syntax.newline.w[j]))
- context |= CTX_NONE;
- }
-
- return context;
-}
-
/* Returns the contexts on which the position set S depends. Each context
in the set of returned contexts (let's call it SC) may have a different
follow set than other contexts in SC, and also different from the
{
tmp.elems = firstpos - stk[-1].nfirstpos;
tmp.nelem = stk[-1].nfirstpos;
- position *pos = lastpos - stk[-1].nlastpos;
+ position *p = lastpos - stk[-1].nlastpos;
for (size_t j = 0; j < stk[-1].nlastpos; j++)
{
- merge (&tmp, &d->follows[pos[j].index], &merged);
- copy (&merged, &d->follows[pos[j].index]);
+ merge (&tmp, &d->follows[p[j].index], &merged);
+ copy (&merged, &d->follows[p[j].index]);
}
}
FALLTHROUGH;
{
tmp.nelem = stk[-1].nfirstpos;
tmp.elems = firstpos - stk[-1].nfirstpos;
- position *pos = lastpos - stk[-1].nlastpos - stk[-2].nlastpos;
+ position *p = lastpos - stk[-1].nlastpos - stk[-2].nlastpos;
for (size_t j = 0; j < stk[-2].nlastpos; j++)
{
- merge (&tmp, &d->follows[pos[j].index], &merged);
- copy (&merged, &d->follows[pos[j].index]);
+ merge (&tmp, &d->follows[p[j].index], &merged);
+ copy (&merged, &d->follows[p[j].index]);
}
}
stk[-2].nlastpos += stk[-1].nlastpos;
else
{
- position *pos = lastpos - stk[-1].nlastpos - stk[-2].nlastpos;
+ position *p = lastpos - stk[-1].nlastpos - stk[-2].nlastpos;
for (size_t j = 0; j < stk[-1].nlastpos; j++)
- pos[j] = pos[j + stk[-2].nlastpos];
+ p[j] = p[j + stk[-2].nlastpos];
lastpos -= stk[-2].nlastpos;
stk[-2].nlastpos = stk[-1].nlastpos;
}