aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-07-31 19:41:22 +0300
committerArnold D. Robbins <arnold@skeeve.com>2014-07-31 19:41:22 +0300
commit59c75072583f4460c5eca6e0aae70f36dbaecd62 (patch)
treec396622abfdbea11b34d57eeed1f3cc63e091e7c
parentc93614354db29e990db243a36c8030ad1c9ca1b7 (diff)
downloadegawk-59c75072583f4460c5eca6e0aae70f36dbaecd62.tar.gz
egawk-59c75072583f4460c5eca6e0aae70f36dbaecd62.tar.bz2
egawk-59c75072583f4460c5eca6e0aae70f36dbaecd62.zip
Sync dfa with GNU grep.
-rw-r--r--ChangeLog4
-rw-r--r--dfa.c16
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index fd761407..3cb27948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-31 Arnold D. Robbins <arnold@skeeve.com>
+
+ * dfa.c: Sync with GNU grep. Mainly white space differences.
+
2014-07-25 Arnold D. Robbins <arnold@skeeve.com>
* main.c (main): Add a warning message if -M is used and gawk was
diff --git a/dfa.c b/dfa.c
index e2a83d43..1a153785 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1204,7 +1204,8 @@ parse_bracket_exp (void)
if (wc != WEOF && wc2 != WEOF)
{
work_mbc->ranges
- = maybe_realloc (work_mbc->ranges, work_mbc->nranges + 2,
+ = maybe_realloc (work_mbc->ranges,
+ work_mbc->nranges + 2,
&ranges_al, sizeof *work_mbc->ranges);
work_mbc->ranges[work_mbc->nranges].beg
= case_fold ? towlower (wc) : wc;
@@ -1213,7 +1214,8 @@ parse_bracket_exp (void)
if (case_fold && (iswalpha (wc) || iswalpha (wc2)))
{
- work_mbc->ranges[work_mbc->nranges].beg = towupper (wc);
+ work_mbc->ranges[work_mbc->nranges].beg
+ = towupper (wc);
work_mbc->ranges[work_mbc->nranges++].end
= towupper (wc2);
}
@@ -3783,13 +3785,13 @@ dfafree (struct dfa *d)
CAT (p->is==ZERO)? (q->is==ZERO)? (p->is!=ZERO && p->in plus
p->left : q->right : q->is!=ZERO) ? q->in plus
- p->is##q->left p->right##q->is p->is##q->is : p->right##q->left
+ p->is##q->left p->right##q->is p->is##q->is : p->right##q->left
ZERO
- OR longest common longest common (do p->is and substrings common to
- leading trailing q->is have same p->in and q->in
- (sub)sequence (sub)sequence length and
- of p->left of p->right content) ?
+ OR longest common longest common (do p->is and substrings common
+ leading trailing to q->is have same p->in and
+ (sub)sequence (sub)sequence q->in length and content) ?
+ of p->left of p->right
and q->left and q->right p->is : NULL
If there's anything else we recognize in the tree, all four sequences get set