Merge pull request #463 from katef/kate/is-literal-non-pcre

Break a dependency on group #0 for re_is_literal()

include/fsm/bool.h

@@ -44,7 +44,7 @@ fsm_union(struct fsm *a, struct fsm *b,
  * starting states and (if used) capture bases.
  *
  * bases[] is expected to have the same count as fsms[], and
- * will be initialized by the function.
+ * will be initialized by the function. May be NULL.
  *
  * On success, returns the unioned fsm and updates bases[].
  * On failure, returns NULL; all fsms are freed. */

src/libfsm/union.c

@@ -101,7 +101,9 @@ fsm_union_array(size_t fsm_count,
 	struct fsm *res = fsms[0];
 
 	fsms[0] = NULL;
-	memset(bases, 0x00, fsm_count * sizeof(bases[0]));
+	if (bases != NULL) {
+		memset(bases, 0x00, fsm_count * sizeof(bases[0]));
+	}
 
 	for (i = 1; i < fsm_count; i++) {
 		struct fsm_combine_info ci;
@@ -117,9 +119,14 @@ fsm_union_array(size_t fsm_count,
 			return NULL;
 		}
 
+		res = combined;
+
+		if (bases == NULL) {
+			continue;
+		}
+
 		bases[i].state = ci.base_b;
 		bases[i].capture = ci.capture_base_b;
-		res = combined;
 
 		/* If the first argument didn't get its states put first
 		 * in the union, then shift the bases for everything
@@ -134,9 +141,11 @@ fsm_union_array(size_t fsm_count,
 	}
 
 #if LOG_UNION_ARRAY
-	for (i = 0; i < fsm_count; i++) {
-		fprintf(stderr, "union_array: bases %u: %zu, %zu\n",
-		    i, bases[i].state, bases[i].capture);
+	if (bases != NULL) {
+		for (i = 0; i < fsm_count; i++) {
+			fprintf(stderr, "union_array: bases %u: %zu, %zu\n",
+				i, bases[i].state, bases[i].capture);
+		}
 	}
 #endif
 

src/libre/dialect/glob/parser.sid

@@ -15,7 +15,7 @@
 	ast_count;
 	ast_class_id;
 	!endpoint;
-	!group_id;
+	group_id;
 
 %terminals%
 
@@ -84,7 +84,7 @@
 	!<count-one>:         () -> (:ast_count);
 	!<count-range>: (:unsigned, :pos, :unsigned, :pos) -> (:ast_count);
 
-	!<make-group-id>:      () -> (:group_id);
+	<make-group-id>:       () -> (:group_id);
 	!<make-literal-cbrak>: () -> (:char);
 	!<make-literal-cr>:    () -> (:char);
 	!<make-literal-nl>:    () -> (:char);
@@ -97,7 +97,7 @@
 	<ast-make-concat>:        ()                       -> (:ast_expr);
 	!<ast-make-alt>:          ()                       -> (:ast_expr);
 	<ast-make-piece>:         (:ast_expr, :ast_count)  -> (:ast_expr);
-	!<ast-make-group>:        (:ast_expr, :group_id)   -> (:ast_expr);
+	<ast-make-group>:         (:ast_expr, :group_id)   -> (:ast_expr);
 	!<ast-get-re-flags>:      ()                       -> (:re_flags);
 	!<ast-set-re-flags>:      (:re_flags)              -> ();
 	!<ast-mask-re-flags>:     (:re_flags, :re_flags)   -> ();
@@ -165,12 +165,14 @@
 	};
 
 	re_glob: () -> (node :ast_expr) = {
+		id = <make-group-id>;
 		{
-			node = <ast-make-concat>;
-			list-of-atoms(node);
+			e = <ast-make-concat>;
+			list-of-atoms(e);
 		||
-			node = <ast-make-empty>;
+			e = <ast-make-empty>;
 		};
+		node = <ast-make-group>(e, id);
 
 		{
 			EOF;

src/libre/dialect/like/parser.sid

@@ -15,7 +15,7 @@
 	ast_count;
 	ast_class_id;
 	!endpoint;
-	!group_id;
+	group_id;
 
 %terminals%
 
@@ -84,7 +84,7 @@
 	!<count-one>:         () -> (:ast_count);
 	!<count-range>: (:unsigned, :pos, :unsigned, :pos) -> (:ast_count);
 
-	!<make-group-id>:      () -> (:group_id);
+	<make-group-id>:       () -> (:group_id);
 	!<make-literal-cbrak>: () -> (:char);
 	!<make-literal-cr>:    () -> (:char);
 	!<make-literal-nl>:    () -> (:char);
@@ -97,7 +97,7 @@
 	<ast-make-concat>:        ()                       -> (:ast_expr);
 	!<ast-make-alt>:          ()                       -> (:ast_expr);
 	<ast-make-piece>:         (:ast_expr, :ast_count)  -> (:ast_expr);
-	!<ast-make-group>:        (:ast_expr, :group_id)   -> (:ast_expr);
+	<ast-make-group>:         (:ast_expr, :group_id)   -> (:ast_expr);
 	!<ast-get-re-flags>:      ()                       -> (:re_flags);
 	!<ast-set-re-flags>:      (:re_flags)              -> ();
 	!<ast-mask-re-flags>:     (:re_flags, :re_flags)   -> ();
@@ -165,12 +165,14 @@
 	};
 
 	re_like: () -> (node :ast_expr) = {
+		id = <make-group-id>;
 		{
-			node = <ast-make-concat>;
-			list-of-atoms(node);
+			e = <ast-make-concat>;
+			list-of-atoms(e);
 		||
-			node = <ast-make-empty>;
+			e = <ast-make-empty>;
 		};
+		node = <ast-make-group>(e, id);
 
 		{
 			EOF;