Refactoring: No need for <mark-expr>.

This also removes struct ast_pos, with no remaining uses.

src/libre/ast.h

@@ -7,18 +7,6 @@
 #ifndef RE_AST_H
 #define RE_AST_H
 
-/*
- * This is a duplicate of struct lx_pos, but since we're linking to
- * code with several distinct lexers, there isn't a clear lexer.h
- * to include here. The parser sees both definitions, and will
- * build a `struct ast_pos` in the appropriate places.
- */
-struct ast_pos {
-	unsigned byte;
-	unsigned line;
-	unsigned col;
-};
-
 enum ast_expr_type {
 	/* Reserve one value (0) indicating a freed expression. This value is
 	 * intentionally unnamed: code that switches on n->type should be able

src/libre/dialect/glob/parser.sid

@@ -128,7 +128,6 @@
 	!<mark-group>: (:pos, :pos) -> ();
 	!<mark-range>: (:pos, :pos) -> ();
 	!<mark-count>: (:pos, :pos) -> ();
-	!<mark-expr>: (:ast_expr, :pos, :pos) -> ();
 
 	<class-any>:  () -> (:ast_class_id);
 	!<class-bsr>: () -> (:ast_class_id);

src/libre/dialect/like/parser.sid

@@ -128,7 +128,6 @@
 	!<mark-group>: (:pos, :pos) -> ();
 	!<mark-range>: (:pos, :pos) -> ();
 	!<mark-count>: (:pos, :pos) -> ();
-	!<mark-expr>: (:ast_expr, :pos, :pos) -> ();
 
 	<class-any>:  () -> (:ast_class_id);
 	!<class-bsr>: () -> (:ast_class_id);

src/libre/dialect/literal/parser.sid

@@ -128,7 +128,6 @@
 	!<mark-group>: (:pos, :pos) -> ();
 	!<mark-range>: (:pos, :pos) -> ();
 	!<mark-count>: (:pos, :pos) -> ();
-	!<mark-expr>: (:ast_expr, :pos, :pos) -> ();
 
 	!<class-any>: () -> (:ast_class_id);
 	!<class-bsr>: () -> (:ast_class_id);

src/libre/dialect/native/parser.sid

@@ -134,7 +134,6 @@
 	<mark-group>: (:pos, :pos) -> ();
 	<mark-range>: (:pos, :pos) -> ();
 	<mark-count>: (:pos, :pos) -> ();
-	<mark-expr>: (:ast_expr, :pos, :pos) -> ();
 
 	<class-any>:  () -> (:ast_class_id);
 	!<class-bsr>: () -> (:ast_class_id);
@@ -352,8 +351,6 @@
 				<err-expected-closegroup>;
 				end = start; /* appease sid */
 			};
-
-			<mark-expr>(tmp, start, end);
 		};
 
 		piece: () -> (node :ast_expr) [

src/libre/dialect/pcre/parser.sid

@@ -140,7 +140,6 @@
 	<mark-group>: (:pos, :pos) -> ();
 	<mark-range>: (:pos, :pos) -> ();
 	<mark-count>: (:pos, :pos) -> ();
-	<mark-expr>: (:ast_expr, :pos, :pos) -> ();
 
 	<class-any>: () -> (:ast_class_id);
 	<class-bsr>: () -> (:ast_class_id);
@@ -380,17 +379,13 @@
 				<err-expected-closegroup>;
 				end = start; /* appease sid */
 			};
-
-			<mark-expr>(tmp, start, end);
 		};
 
 		type: () -> (node :ast_expr) = {
 			(class, start, end) = class-named;
 
 			node = <ast-make-alt>;
 			<ast-add-alt>(node, class);
-
-			<mark-expr>(node, start, end);
 		};
 
 		flags: () -> (node :ast_expr) [

src/libre/dialect/sql/parser.sid

@@ -139,7 +139,6 @@
 	<mark-group>: (:pos, :pos) -> ();
 	<mark-range>: (:pos, :pos) -> ();
 	<mark-count>: (:pos, :pos) -> ();
-	<mark-expr>: (:ast_expr, :pos, :pos) -> ();
 
 	<class-any>:  () -> (:ast_class_id);
 	!<class-bsr>: () -> (:ast_class_id);
@@ -253,9 +252,7 @@
 
 			{
 				(!, close_start, close_end) = CLOSEGROUP;
-				<mark-group>(open_start, open_end);
-
-				<mark-expr>(tmp, open_start, close_end);
+				<mark-group>(open_start, close_end);
 
 				node = class;
 			||
@@ -287,11 +284,8 @@
 
 				{
 					(!, close_start, close_end) = CLOSEGROUP;
-					<mark-group>(close_start, close_end);
-
 					/* TODO: would prefer to demark class and mask separately */
-					<mark-expr>(tmp, open_start, close_end);
-					<mark-expr>(mask_tmp, open_start, close_end);
+					<mark-group>(open_start, close_end);
 				##
 					<err-expected-closegroup>;
 				};

src/libre/parser.act

@@ -799,16 +799,6 @@
 		mark(&act_state->countend,   &@end);
 	@};
 
-	<mark-expr>: (node :ast_expr, start :pos, end :pos) -> () = @{
-		(void) @start;
-		(void) @end;
-
-/* TODO: reinstate this, applies to an expr node in general
-		@node->u.class.start = ast_start;
-		@node->u.class.end   = ast_end;
-*/
-	@};
-
 	<class-any>: () -> (c :ast_class_id) = @{
 		/* TODO: or the unicode equivalent */
 		@c = (*flags & RE_SINGLE) ? &class_any : &class_notnl;