Rewrite (?:|xyz) and (?:xyz|) to (?:xyz)?.

katef · Sep 21, 2020 · 35cbb57 · 35cbb57
1 parent c36e173
commit 35cbb57
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/src/libre/ast_rewrite.c b/src/libre/ast_rewrite.c
@@ -317,6 +317,30 @@ rewrite_alt(struct ast_expr *n, enum re_flags flags)
 		return 1;
 	}
 
+	if (n->u.alt.count == 2) {
+		struct ast_expr *child = NULL;
+
+		if (n->u.alt.n[0]->type == AST_EXPR_EMPTY) {
+			ast_expr_free(n->u.alt.n[0]);
+			child = n->u.alt.n[1];
+		} else if (n->u.alt.n[1]->type == AST_EXPR_EMPTY) {
+			ast_expr_free(n->u.alt.n[1]);
+			child = n->u.alt.n[0];
+		}
+
+		if (child != NULL) {
+			free(n->u.alt.n);
+
+			/* we repurpose the same node */
+			n->type = AST_EXPR_REPEAT;
+			n->u.repeat.e = child;
+			n->u.repeat.min = 0;
+			n->u.repeat.max = 1;
+
+			return rewrite(n, flags);
+		}
+	}
+
 	return 1;
 
 empty: