ctx: Track the token kind of each argument

3 files changed, 22 insertions, 0 deletions

diff --git a/src/ctx.h b/src/ctx.h
index be6e2af..908338f 100644
--- a/src/ctx.h
+++ b/src/ctx.h
@@ -29,6 +29,8 @@ struct bfs_ctx {
 	size_t argc;
 	/** The unparsed command line arguments. */
 	char **argv;
+	/** The argument token kinds. */
+	enum bfs_kind *kinds;
 
 	/** The root paths. */
 	const char **paths;
diff --git a/src/expr.h b/src/expr.h
index 871b120..c116778 100644
--- a/src/expr.h
+++ b/src/expr.h
@@ -19,6 +19,9 @@
  * Argument/token/expression kinds.
  */
 enum bfs_kind {
+	/** A regular argument. */
+	BFS_ARG,
+
 	/** A flag (-H, -L, etc.). */
 	BFS_FLAG,
 
diff --git a/src/parse.c b/src/parse.c
index a19e689..58a900f 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -396,6 +396,8 @@ static struct bfs_expr *parse_expr(struct bfs_parser *parser);
  * Advance by a single token.
  */
 static char **parser_advance(struct bfs_parser *parser, enum bfs_kind kind, size_t argc) {
+	struct bfs_ctx *ctx = parser->ctx;
+
 	if (kind != BFS_FLAG && kind != BFS_PATH) {
 		parser->expr_started = true;
 	}
@@ -404,6 +406,9 @@ static char **parser_advance(struct bfs_parser *parser, enum bfs_kind kind, size
 		parser->last_arg = parser->argv;
 	}
 
+	size_t i = parser->argv - ctx->argv;
+	ctx->kinds[i] = kind;
+
 	char **argv = parser->argv;
 	parser->argv += argc;
 	return argv;
@@ -1329,11 +1334,17 @@ static struct bfs_expr *parse_exit(struct bfs_parser *parser, int arg1, int arg2
  * Parse -f PATH.
  */
 static struct bfs_expr *parse_f(struct bfs_parser *parser, int arg1, int arg2) {
+	struct bfs_ctx *ctx = parser->ctx;
+
 	struct bfs_expr *expr = parse_unary_flag(parser);
 	if (!expr) {
 		return NULL;
 	}
 
+	// Mark the path as a path, not a regular argument
+	size_t i = expr->argv - ctx->argv;
+	ctx->kinds[i + 1] = BFS_PATH;
+
 	if (parse_root(parser, expr->argv[1]) != 0) {
 		return NULL;
 	}
@@ -3815,6 +3826,12 @@ struct bfs_ctx *bfs_parse_cmdline(int argc, char *argv[]) {
 		goto fail;
 	}
 
+	ctx->kinds = ZALLOC_ARRAY(enum bfs_kind, argc);
+	if (!ctx->kinds) {
+		perror("zalloc()");
+		goto fail;
+	}
+
 	enum use_color use_color = COLOR_AUTO;
 	const char *no_color = getenv("NO_COLOR");
 	if (no_color && *no_color) {