[Bugfix] Allow spaces in prefixes in R[] directives

Sirraide · Nov 13, 2023 · a536462 · a536462
1 parent ba71a59
commit a536462
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
-project(fchk VERSION 3.0.0 LANGUAGES CXX)
+project(fchk VERSION 3.0.1 LANGUAGES CXX)
 
 ## ============================================================================
 ##  Global CMake Variables.

diff --git a/src/core.cc b/src/core.cc
@@ -1061,21 +1061,14 @@ void Context::CollectDirectives(PrefixState& state) {
     auto ReadDirectiveArg = [&] { return chfile.at("\n") ? "" : Trim(chfile.skip_to_ws().skip_ws().read_to("\n")); };
 
     /// Find all directives in the file.
-    for (;;) {
-        /// Read directive.
-        auto dir = Trim(
-            chfile
-                .skip_to(state.prefix)
-                .skip_to_ws()
-                .skip_ws()
-                .read_to_any(" \t\v\f\r\n", true)
-        );
-        if (dir.empty()) break;
+    while (not chfile.empty()) {
+        chfile.skip_to(state.prefix).skip(state.prefix.size()).skip_ws();
 
         /// Handle run directives.
-        if (dir.starts_with(detail::RunWithPrefixDirectiveNameStart) and dir.ends_with(']')) {
-            auto prefix = dir.substr(detail::RunWithPrefixDirectiveNameStart.size());
-            prefix.remove_suffix(1);
+        if (chfile.at(detail::RunWithPrefixDirectiveNameStart)) {
+            auto prefix = Trim(chfile.read_to_any("]\r\n", true));
+            if (not chfile.at("]")) continue;
+            prefix.remove_prefix(detail::RunWithPrefixDirectiveNameStart.size());
 
             /// If there currently is no state for this prefix, create it.
             PrefixState* new_state;
@@ -1096,6 +1089,10 @@ void Context::CollectDirectives(PrefixState& state) {
             continue;
         }
 
+        /// Read directive.
+        auto dir = Trim(chfile.read_to_any(" \t\v\f\r\n", true));
+        if (dir.empty()) continue;
+
         /// Check if this really is a directive.
         auto it = detail::NameDirectiveMap.find(dir);
         if (it == detail::NameDirectiveMap.end()) continue;

diff --git a/test/basic.txt b/test/basic.txt
@@ -245,6 +245,6 @@ Y
 ## parameter that the `fchk` prefix is set to when executing that program.
 ##
 ##
-## R[??] echo foo ; echo bar baz
-?? * foo
-?? + bar baz
+## R[? ?] echo foo ; echo bar baz
+? ? * foo
+? ? + bar baz