summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authorjohn43 <john43>2006-03-28 20:47:11 +0000
committerjohn43 <john43>2006-03-28 20:47:11 +0000
commit04ec779628543ba35217765915abc230a8b16dea (patch)
tree41f29f6711125efacab4fd2b7f5d26390d63de13 /parse.y
parent217afee2abde49a63e140979700dc805b4e57303 (diff)
downloadflex-04ec779628543ba35217765915abc230a8b16dea.tar.gz
Added ccl union operator.
Added test in test suite for ccl union operator. Documented ccl union operator. Removed crufty ccl cache to prevent parser problems.
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index e66deb8..251cc72 100644
--- a/parse.y
+++ b/parse.y
@@ -10,7 +10,7 @@
%token CCE_NEG_ALNUM CCE_NEG_ALPHA CCE_NEG_BLANK CCE_NEG_CNTRL CCE_NEG_DIGIT CCE_NEG_GRAPH
%token CCE_NEG_LOWER CCE_NEG_PRINT CCE_NEG_PUNCT CCE_NEG_SPACE CCE_NEG_UPPER CCE_NEG_XDIGIT
-%left CCL_OP_DIFF
+%left CCL_OP_DIFF CCL_OP_UNION
/*
*POSIX and AT&T lex place the
@@ -760,7 +760,6 @@ singleton : singleton '*'
| fullccl
{
- if ( ! cclsorted )
/* Sort characters for fast searching. We
* use a shell sort since this list could
* be large.
@@ -810,7 +809,8 @@ singleton : singleton '*'
}
;
fullccl:
- fullccl CCL_OP_DIFF braceccl { $$ = ccl_set_diff ($1, $3); }
+ fullccl CCL_OP_DIFF braceccl { $$ = ccl_set_diff ($1, $3); }
+ | fullccl CCL_OP_UNION braceccl { $$ = ccl_set_union ($1, $3); }
| braceccl
;