feat: backport flex noline fix

When using the --noline flag or the %option noline, flex was failing to
suppress the %top line directives.

There was an if-guard missing in the code that adds the line directives
to the top_buf. I've fixed it in [flex PR #704].

This commit adds patching capabilities to ease maintaining fixes /
backports like the noline fix.

[flex PR #704]: westes/flex#704

Author: jjmaestro

flex/internal/BUILD

@@ -2,7 +2,9 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 filegroup(
     name = "bzl_srcs",
-    srcs = glob(["*.bzl"]),
+    srcs = glob(["*.bzl"]) + [
+        "//flex/internal/patches:bzl_srcs",
+    ],
     visibility = ["//:__subpackages__"],
 )
 

flex/internal/patches/0001-fix-noline-for-top-directives.patch

@@ -0,0 +1,44 @@
+From 4f81a7293993211ae31970c5a349565dcd1faf21 Mon Sep 17 00:00:00 2001
+From: Javier Maestro <jjmaestro@ieee.org>
+Date: Fri, 16 May 2025 13:47:11 -0400
+Subject: [PATCH] backport: noline for %top directives
+
+See https://github.com/westes/flex/pull/704
+---
+ src/scan.c | 4 +++-
+ src/scan.l | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletion(-)
+
+diff --git a/src/scan.c b/src/scan.c
+index 66db864..5e750fb 100644
+--- a/src/scan.c
++++ b/src/scan.c
+@@ -2326,7 +2326,9 @@
+ {
+                 brace_start_line = linenum;
+                 ++linenum;
+-                buf_linedir( &top_buf, infilename?infilename:"<stdin>", linenum);
++                // backporting https://github.com/westes/flex/pull/704/
++                if (gen_line_dirs)
++                  buf_linedir( &top_buf, infilename?infilename:"<stdin>", linenum);
+                 brace_depth = 1;
+                 yy_push_state(CODEBLOCK_MATCH_BRACE);
+             }
+diff --git a/src/scan.l b/src/scan.l
+index 66db864..5e750fb 100644
+--- a/src/scan.l
++++ b/src/scan.l
+@@ -175,7 +175,9 @@ M4QEND      "]""]"
+     ^"%top"[[:blank:]]*"{"[[:blank:]]*{NL}    {
+                 brace_start_line = linenum;
+                 ++linenum;
+-                buf_linedir( &top_buf, infilename?infilename:"<stdin>", linenum);
++                // backporting https://github.com/westes/flex/pull/704/
++                if (gen_line_dirs)
++                  buf_linedir( &top_buf, infilename?infilename:"<stdin>", linenum);
+                 brace_depth = 1;
+                 yy_push_state(CODEBLOCK_MATCH_BRACE);
+             }
+-- 
+2.39.5 (Apple Git-154)
+

flex/internal/patches/BUILD

@@ -0,0 +1,11 @@
+filegroup(
+    name = "bzl_srcs",
+    srcs = glob(["*.bzl"]),
+    visibility = ["//:__subpackages__"],
+)
+
+filegroup(
+    name = "patches",
+    srcs = glob(["*.patch"]),
+    visibility = ["//:__subpackages__"],
+)

flex/internal/patches/patches.bzl

@@ -0,0 +1,8 @@
+"""Flex patches"""
+
+PATCHES = {
+    "2.6.4": [
+        # backporting https://github.com/westes/flex/pull/704
+        Label(":0001-fix-noline-for-top-directives.patch"),
+    ],
+}

flex/rules/flex_repository.bzl

@@ -17,6 +17,7 @@
 """Definition of the `flex_repository` repository rule."""
 
 load("//flex/internal:versions.bzl", "VERSION_URLS")
+load("//flex/internal/patches:patches.bzl", "PATCHES")
 
 _FLEX_BUILD = """
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
@@ -117,6 +118,12 @@ def _hardcode_int_max_log10(ctx, version):
         "(size_t) (1 + ceil (log10 (abs (lineno))))": INT_FORMAT_CAPACITY,
     }, executable = False)
 
+def _apply_patches(ctx, version):
+    patches = PATCHES.get(version, [])
+
+    for patch in patches:
+        ctx.patch(patch, strip = 1)
+
 def _flex_repository(ctx):
     version = ctx.attr.version
     source = VERSION_URLS[version]
@@ -134,6 +141,7 @@ def _flex_repository(ctx):
         }, executable = False)
 
     _hardcode_int_max_log10(ctx, version)
+    _apply_patches(ctx, version)
 
     ctx.file("WORKSPACE", "workspace(name = {name})\n".format(
         name = repr(ctx.name),

tests/BUILD

@@ -93,3 +93,20 @@ alias(
     actual = "@rules_flex_testutil//:all_versions",
     tags = ["manual"],
 )
+
+genrule(
+    name = "genrule_noline_top_c",
+    srcs = ["top_c.l"],
+    outs = ["top_c.c"],
+    cmd = "M4=$(M4) $(FLEX) --noline --outfile=$@ $(location top_c.l)",
+    toolchains = [
+        "//flex:current_flex_toolchain",
+        "@rules_m4//m4:current_m4_toolchain",
+    ],
+)
+
+sh_test(
+    name = "flex_noline_test",
+    srcs = ["flex_noline_test.sh"],
+    data = [":genrule_noline_top_c"],
+)

tests/flex_noline_test.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+grep -E '#line [0-9]+' "$RUNFILES_DIR/$TEST_WORKSPACE/tests/top_c.c" || exit 0
+exit 1

tests/top_c.l

@@ -0,0 +1,14 @@
+%top{
+#include <stdio.h>
+}
+
+%%
+
+[0-9]+   { printf("NUMBER: %s\n", yytext); }
+
+%%
+
+int main(void) {
+    yylex();
+    return 0;
+}