[#142] Ensure a non-target doesn't escape the scope (#143)

Author: bahmanm

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           pushd /tmp
-          wget 'https://ftpmirror.gnu.org/make/make-4.4.1.tar.gz'
+          wget 'https://mirrors.kernel.org/gnu/make/make-4.4.1.tar.gz'
           tar xzf make-4.4.1.tar.gz
           cd make-4.4.1
           ./configure --prefix=/usr/local

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up GNU Make
         run: |
           pushd /tmp
-          wget 'https://ftpmirror.gnu.org/make/make-4.4.1.tar.gz'
+          wget 'https://mirrors.kernel.org/gnu/make/make-4.4.1.tar.gz'
           tar xzf make-4.4.1.tar.gz
           cd make-4.4.1
           ./configure --prefix=/usr/local

README.md

@@ -142,7 +142,7 @@ make -v
 If your operating system provides an older Make version, upgrading is straightforward:
 
 ```bash
-wget https://ftpmirror.gnu.org/make/make-4.4.1.tar.gz
+wget https://mirrors.kernel.org/gnu/make/make-4.4.1.tar.gz
 tar xzf make-4.4.1.tar.gz
 cd make-4.4.1
 ./configure --prefix=/usr/local

pkg/debbuild-env.Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:26.04
 VOLUME /project
 
-ADD https://ftpmirror.gnu.org/make/make-4.4.1.tar.gz /tmp/
+ADD https://mirrors.kernel.org/gnu/make/make-4.4.1.tar.gz /tmp/
 RUN apt-get update \
     && apt-get install -y gcc perl make
 

src/bmakelib.mk

@@ -113,7 +113,7 @@ behaviours and hard to find bugs.$(bmakelib.newline)$(bmakelib.newline)\
 simple as running $(bmakelib.newline)$(bmakelib.newline)\
 \
 \
-$(bmakelib.octospace)wget 'https://ftpmirror.gnu.org/make/make-4.4.1.tar.gz' $(bmakelib.backslash)$(bmakelib.newline) \
+$(bmakelib.octospace)wget 'https://mirrors.kernel.org/gnu/make/make-4.4.1.tar.gz' $(bmakelib.backslash)$(bmakelib.newline) \
 $(bmakelib.octospace)&& tar xzf make-4.4.1.tar.gz                          $(bmakelib.backslash)$(bmakelib.newline) \
 $(bmakelib.octospace)&& cd make-4.4.1                                      $(bmakelib.backslash)$(bmakelib.newline) \
 $(bmakelib.octospace)&& ./configure --prefix=/usr/local                    $(bmakelib.backslash)$(bmakelib.newline) \

src/help.pl

@@ -324,7 +324,7 @@ sub parse_targets_section {
             get_file_lines($target_state{file});
         } elsif ($line =~ /^#\s+(?:Builtin rule|recipe to execute \(built-in\))/) {
             $target_state{builtin} = 1;
-        } elsif ($line =~ /^([a-zA-Z0-9_.-]+)\s*:(?!=)/) {
+        } elsif ($line =~ /^([a-zA-Z0-9_().-]+)\s*:(?!=)/) {
             my $next_target = $1;
             process_target(
                 \%target_state,
@@ -348,7 +348,8 @@ sub parse_targets_section {
                 $targets_by_scope_ref,
                 $show_bmakelib,
             );
-        } elsif ($line =~ /^# (?:VPATH Utilities|files hash-table-stats)/) {
+            $pending_not_target = 0;
+        } elsif ($line =~ /^# (?:VPATH Utilities|files hash-table[ -]stats)/) {
             process_target(
                 \%target_state,
                 $active_scopes_ref,

tests/test_help

@@ -382,6 +382,46 @@ EOF
     || return 1
 }
 
+####################################################################################################
+# Issue #142: Non-targets with special characters (e.g. error-if-blank parentheses) do not suppress subsequent targets.
+####################################################################################################
+
+function when_target_prerequisite_has_special_characters {
+  local test_case_name=${FUNCNAME[0]}
+  local actual_value_filename=${test_case_name}.actual.log
+  bmakelib.test.cat <<'EOF' > Makefile
+SHELL := /usr/bin/env bash
+include $(bmakelib.ROOT)/bmakelib.mk
+
+MY_VAR ?= test-val
+
+libscid.configure : bmakelib.error-if-blank( MY_VAR ) ## Configure libscid build
+	@echo "configuring"
+
+libscid.build : ## Build libscid
+	@echo "building"
+EOF
+
+  make bmakelib.conf.help.scope=local bmakelib.conf.help.variables=no bmakelib.conf.help.tips=no help > $actual_value_filename 2>&1
+
+  local expexted_pattern_filename=${test_case_name}.expected.pattern
+  bmakelib.test.cat <<'EOF' > $expexted_pattern_filename
+make.+Entering.+
+={80}
+  LOCAL: defined inside the source tree
+={80}
+
+  TARGETS
+    libscid\.build\s+Build libscid
+    libscid\.configure\s+Configure libscid build
+
+make.+Leaving.+
+EOF
+
+  bmakelib.test.assert_matches $test_case_name $actual_value_filename $expexted_pattern_filename \
+    || return 1
+}
+
 ####################################################################################################
 
 bmakelib.test.run_test_case happy_path_default_help
@@ -392,4 +432,6 @@ bmakelib.test.run_test_case when_tips_is_no
 bmakelib.test.run_test_case when_convenience_target_is_no
 bmakelib.test.run_test_case docblock_and_inline_mixed_styles
 bmakelib.test.run_test_case when_show_bmakelib_is_yes
+bmakelib.test.run_test_case when_target_prerequisite_has_special_characters
+