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.

1 files changed, 7 insertions, 1 deletions

diff --git a/scan.l b/scan.l
index 5af40a7..e06279f 100644
--- a/scan.l
+++ b/scan.l
@@ -621,7 +621,12 @@ M4QEND      "]]"
 			/* Check to see if we've already encountered this
 			 * ccl.
 			 */
-			if ( (cclval = ccllookup( (Char *) nmstr )) != 0 )
+			if (0 /* <--- This "0" effectively disables the reuse of a
+                   * character class (purely based on its source text).
+                   * The reason it was disabled is so yacc/bison can parse
+                   * ccl operations, such as ccl difference and union.
+                   */
+                &&  (cclval = ccllookup( (Char *) nmstr )) != 0 )
 				{
 				if ( input() != ']' )
 					synerr( _( "bad character class" ) );
@@ -647,6 +652,7 @@ M4QEND      "]]"
 				}
 			}
     "{-}"       return CCL_OP_DIFF;
+    "{+}"       return CCL_OP_UNION;
 
 
     /* Check for :space: at the end of the rule so we don't