Merge remote-tracking branch 'origin/topic/robin/gh-1871-max-size'

* origin/topic/robin/gh-1871-max-size:
  Fix `&max-size` on unit containing a `switch`.

CHANGES

@@ -1,3 +1,10 @@
+1.12.0-dev.140 | 2024-10-15 16:21:58 +0200
+
+  * GH-1871: Fix `&max-size` on unit containing a `switch`. (Robin Sommer, Corelight)
+
+    We would advance our input too early, letting the subsequent
+    `&max-size` check fail.
+
 1.12.0-dev.138 | 2024-10-14 16:16:08 +0200
 
   * GH-1868: Associate source code locations with current fiber instead of current thread. (Robin Sommer, Corelight)

VERSION

@@ -1 +1 @@
-1.12.0-dev.138
+1.12.0-dev.140

spicy/toolchain/src/compiler/codegen/parser-builder.cc

@@ -715,13 +715,8 @@ struct ProductionVisitor : public production::Visitor {
             stop = pb->newContainerItem(*meta.container(), destination(), elem, ! meta.container()->isTransient());
         }
 
-        else if ( ! meta.isFieldProduction() ) {
-            // Need to move position ahead.
-            if ( state().ncur )
-                builder()->addAssign(state().cur, state().ncur);
-
+        else if ( ! meta.isFieldProduction() )
             popDestination();
-        }
 
         else if ( field->parseType()->type()->isA<hilti::type::Void>() )
             popDestination();

tests/Baseline/spicy.types.unit.max-size-with-switch-fail/output

@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+[error] terminating with uncaught exception of type spicy::rt::ParseError: parsing not done within &max-size bytes (<...>/max-size-with-switch-fail.spicy:12:3-12:13)

tests/spicy/types/unit/max-size-with-switch-fail.spicy

@@ -0,0 +1,12 @@
+# @TEST-EXEC-FAIL: printf 12345 | spicy-driver -d %INPUT >output 2>&1
+# @TEST-EXEC: btest-diff output
+#
+# @TEST-DOC: Switch clause with a &max-size attribute exceeded by our input
+
+module foo;
+
+public type X = unit {
+    switch (0) {
+        * -> : bytes &eod;
+    };
+} &max-size=3;

tests/spicy/types/unit/max-size-with-switch.spicy

@@ -0,0 +1,11 @@
+# @TEST-EXEC: echo -n | spicy-driver -d %INPUT
+#
+# @TEST-DOC: Switch clause with a &max-size attribute never reached; regression test for #1871
+
+module foo;
+
+public type X = unit {
+    switch (0) {
+        * -> : void;
+    };
+} &max-size=4711; # Should never fail as unit consumes zero bytes.