Sync dfa.c with GNU grep.

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ea33c2d..6f24933e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 29 12:29:56 2011  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep, mainly typos in comments.
+
 Fri Apr 29 12:13:32 2011  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* io.c (inetfile): Change ifdef to ifndef for have getaddrinfo.
diff --git a/dfa.c b/dfa.c
index 953774b9..4e02dbb1 100644
--- a/dfa.c
+++ b/dfa.c
@@ -129,7 +129,7 @@ typedef int charclass[CHARCLASS_INTS];
 
    Word-constituent characters are those that satisfy isalnum().
 
-   The macro SUCCEEDS_IN_CONTEXT determines whether a a given constraint
+   The macro SUCCEEDS_IN_CONTEXT determines whether a given constraint
    succeeds in a particular context.  Prevn is true if the previous character
    was a newline, currn is true if the lookahead character is a newline.
    Prevl and currl similarly depend upon whether the previous and current
@@ -177,7 +177,7 @@ typedef enum
                                    the empty string. */
 
   BACKREF,			/* BACKREF is generated by \<digit>; it
-                                   it not completely handled.  If the scanner
+                                   is not completely handled.  If the scanner
                                    detects a transition on backref, it returns
                                    a kind of "semi-success" indicating that
                                    the match will have to be verified with
@@ -2560,7 +2560,7 @@ dfastate (int s, struct dfa *d, int trans[])
              by accepting accepts 1st byte of <mb A>, and state[i+1]
              accepts 2nd byte of <mb A>, if state[i+1] encounter the
              codepoint of <sb a>, it must not be <sb a> but 2nd byte of
-             <mb A>, so we can not add state[0].  */
+             <mb A>, so we cannot add state[0].  */
 
           next_isnt_1st_byte = 0;
           for (j = 0; j < follows.nelem; ++j)
@@ -3014,7 +3014,7 @@ check_matching_with_multibyte_ops (struct dfa *d, int s, int idx)
           rarray[i] = match_mb_charset(d, s, pos, idx);
           break;
         default:
-          break; /* can not happen.  */
+          break; /* cannot happen.  */
         }
     }
   return rarray;