Merge branch 'develop-v4-lts' into develop

mlaroche · mlaroche · commit d2d82f7268ff · 2025-11-06T11:48:45.000+01:00
diff --git a/vertigo-easyforms/src/main/java/io/vertigo/easyforms/runner/rule/EasyFormsRule.java b/vertigo-easyforms/src/main/java/io/vertigo/easyforms/runner/rule/EasyFormsRule.java
@@ -45,7 +45,7 @@ public String getExpression() {
 	@Override
 	public PegResult<PegSolver<String, Object, Boolean>> parse(final String text, final int start) throws PegNoMatchFoundException {
 		final var result = MAIN_RULE.parse(text, start);
-		return new PegResult<>(result.index(), f -> result.value().apply(f2 -> f2.apply(f)));
+		return new PegResult<>(result.index(), PegSolver.flattenSolvers(result.value()));
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public String getExpression() {`
`45`	`45`	`@Override`
`46`	`46`	`public PegResult<PegSolver<String, Object, Boolean>> parse(final String text, final int start) throws PegNoMatchFoundException {`
`47`	`47`	`final var result = MAIN_RULE.parse(text, start);`
`48`		`- return new PegResult<>(result.index(), f -> result.value().apply(f2 -> f2.apply(f)));`
	`48`	`+ return new PegResult<>(result.index(), PegSolver.flattenSolvers(result.value()));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`}`