diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 17:04:32 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 17:11:27 -0800 |
commit | fff5850967ec10fa3e2e4a800031cb8e335e8fca (patch) | |
tree | 3ed87202785a090c47b7aec50b0ad4d1d1dd826f /src | |
parent | 8fcf61523644df42e1905c81bed26838e0b04f91 (diff) | |
download | grep-fff5850967ec10fa3e2e4a800031cb8e335e8fca.tar.gz |
maint: spelling fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/dfa.c | 16 | ||||
-rw-r--r-- | src/dfasearch.c | 2 | ||||
-rw-r--r-- | src/kwset.c | 14 | ||||
-rw-r--r-- | src/main.c | 2 |
4 files changed, 17 insertions, 17 deletions
@@ -206,7 +206,7 @@ enum the beginning or end of a word. */ QMARK, /* QMARK is an operator of one argument that - matches zero or one occurences of its + matches zero or one occurrences of its argument. */ STAR, /* STAR is an operator of one argument that @@ -346,7 +346,7 @@ struct dfa single-byte characters. if tokens[i] = MBCSET - ("the index of mbcsets correspnd to this operator" << 2) + 3 + ("the index of mbcsets corresponding to this operator" << 2) + 3 e.g. tokens @@ -751,7 +751,7 @@ static unsigned char *mblen_buf;/* Correspond to the input buffer in dfaexec(). byte of corresponding multibyte character in the input string. A element's value is 0 if corresponding character is a - single byte chracter. + single byte character. e.g. input : 'a', <mb(0)>, <mb(1)>, <mb(2)> mblen_buf : 0, 3, 2, 1 */ @@ -2972,11 +2972,11 @@ match_mb_charset (struct dfa *d, state_num s, position pos, size_t idx) char buffer[128]; wchar_t wcbuf[6]; - /* Pointer to the structure to which we are currently refering. */ + /* Pointer to the structure to which we are currently referring. */ struct mb_char_classes *work_mbc; int context; - wchar_t wc; /* Current refering character. */ + wchar_t wc; /* Current referring character. */ wc = inputwcs[idx]; @@ -2996,7 +2996,7 @@ match_mb_charset (struct dfa *d, state_num s, position pos, size_t idx) if (!SUCCEEDS_IN_CONTEXT(pos.constraint, d->states[s].context, context)) return 0; - /* Assign the current refering operator to work_mbc. */ + /* Assign the current referring operator to work_mbc. */ work_mbc = &(d->mbcsets[(d->multibyte_prop[pos.index]) >> 2]); match = !work_mbc->invert; match_len = (mblen_buf[idx] == 0)? 1 : mblen_buf[idx]; @@ -3135,7 +3135,7 @@ transit_state_consume_1char (struct dfa *d, state_num s, /* Copy the positions contained by `s1' to the set `pps'. */ copy(&(d->states[s1].elems), pps); - /* Check (inputed)match_lens, and initialize if it is NULL. */ + /* Check (input) match_lens, and initialize if it is NULL. */ if (match_lens == NULL && d->states[s].mbps.nelem != 0) work_mbls = check_matching_with_multibyte_ops(d, s, *pp - buf_begin); else @@ -3978,7 +3978,7 @@ dfamust (struct dfa *d) rmp = --mp; lmp = --mp; /* In. Everything in left, plus everything in - right, plus catenation of + right, plus concatenation of left's right and right's left. */ lmp->in = addlists(lmp->in, rmp->in); if (lmp->in == NULL) diff --git a/src/dfasearch.c b/src/dfasearch.c index ffb8bb12..bd09aa67 100644 --- a/src/dfasearch.c +++ b/src/dfasearch.c @@ -332,7 +332,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size, } /* If -w, check if the match aligns with word boundaries. We do this iteratively because: - (a) the line may contain more than one occurence of the + (a) the line may contain more than one occurrence of the pattern, and (b) Several alternatives in the pattern might be valid at a given point, and we may need to consider a shorter one to diff --git a/src/kwset.c b/src/kwset.c index 54963719..cd409539 100644 --- a/src/kwset.c +++ b/src/kwset.c @@ -21,7 +21,7 @@ The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* The algorithm implemented by these routines bears a startling resemblence +/* The algorithm implemented by these routines bears a startling resemblance to one discovered by Beate Commentz-Walter, although it is not identical. See "A String Matching Algorithm Fast on the Average," Technical Report, IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900 @@ -69,7 +69,7 @@ struct trie struct trie *fail; /* Aho-Corasick failure function. */ int depth; /* Depth of this node from the root. */ int shift; /* Shift function for search failures. */ - int maxshift; /* Max shift of self and descendents. */ + int maxshift; /* Max shift of self and descendants. */ }; /* Structure returned opaquely to the caller, containing everything. */ @@ -314,7 +314,7 @@ treefails (struct tree const *tree, struct trie const *fail, treefails(tree->rlink, fail, recourse); /* Find, in the chain of fails going back to the root, the first - node that has a descendent on the current label. */ + node that has a descendant on the current label. */ while (fail) { link = fail->links; @@ -432,16 +432,16 @@ kwsprep (kwset_t kws) computing the delta table, failure function, and shift function. */ for (curr = last = kwset->trie; curr; curr = curr->next) { - /* Enqueue the immediate descendents in the level order queue. */ + /* Enqueue the immediate descendants in the level order queue. */ enqueue(curr->links, &last); curr->shift = kwset->mind; curr->maxshift = kwset->mind; - /* Update the delta table for the descendents of this node. */ + /* Update the delta table for the descendants of this node. */ treedelta(curr->links, curr->depth, delta); - /* Compute the failure function for the decendents of this node. */ + /* Compute the failure function for the descendants of this node. */ treefails(curr->links, curr->fail, kwset->trie); /* Update the shifts at each node in the current node's chain @@ -456,7 +456,7 @@ kwsprep (kwset_t kws) fail->shift = curr->depth - fail->depth; /* If the current node is accepting then the shift at the - fail and its descendents should be no larger than the + fail and its descendants should be no larger than the difference of their depths. */ if (curr->accepting && fail->maxshift > curr->depth - fail->depth) fail->maxshift = curr->depth - fail->depth; @@ -1789,7 +1789,7 @@ main (int argc, char **argv) /* The value -1 means to use DEFAULT_CONTEXT. */ out_after = out_before = -1; - /* Default before/after context: chaged by -C/-NUM options */ + /* Default before/after context: changed by -C/-NUM options */ default_context = 0; /* Changed by -o option */ only_matching = 0; |